Merge branch 'master' into systemd

dist/webshot.js

@@ -356,7 +356,7 @@ class Webshot extends CallableInstance {
                                     .sort((var1, var2) => var2.bitrate - var1.bitrate)
                                     .map(variant => variant.url)[0]; // largest video
                             }
-                            const altMessage = mirai_1.Message.Plain(`[失败的${typeInZH[media.type].type}：${url}]`);
+                            const altMessage = mirai_1.Message.Plain(`\n[失败的${typeInZH[media.type].type}：${url}]`);
                             return this.fetchMedia(url)
                                 .then(base64url => uploader(mirai_1.Message.Image('', base64url, media.type === 'photo' ? url : `${url} as gif`), () => altMessage))
                                 .catch(error => {
@@ -375,9 +375,9 @@ class Webshot extends CallableInstance {
                     promise = promise.then(() => {
                         const urls = originTwi.entities.urls
                             .filter(urlObj => urlObj.indices[0] < originTwi.display_text_range[1])
-                            .map(urlObj => `\ud83d\udd17 ${urlObj.expanded_url}`);
+                            .map(urlObj => `\n\ud83d\udd17 ${urlObj.expanded_url}`);
                         if (urls.length) {
-                            messageChain.push(mirai_1.Message.Plain(urls.join('\n')));
+                            messageChain.push(mirai_1.Message.Plain(urls.join('')));
                         }
                     });
                 }
@@ -385,7 +385,7 @@ class Webshot extends CallableInstance {
             // refer to quoted tweet, if any
             if (originTwi.is_quote_status) {
                 promise = promise.then(() => {
-                    messageChain.push(mirai_1.Message.Plain(`回复此命令查看引用的推文：\n/twitter_view ${originTwi.quoted_status_permalink.expanded}`));
+                    messageChain.push(mirai_1.Message.Plain(`\n回复此命令查看引用的推文：\n/twitter_view ${originTwi.quoted_status_permalink.expanded}`));
                 });
             }
             promise.then(() => {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@CL-Jeremy/mirai-twitter-bot",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "description": "Mirai Twitter Bot",
   "main": "./dist/main.js",
   "bin": {

src/webshot.ts

@@ -370,7 +370,7 @@ extends CallableInstance<
                 .sort((var1, var2) => var2.bitrate - var1.bitrate)
                 .map(variant => variant.url)[0]; // largest video
             }
-            const altMessage = Message.Plain(`[失败的${typeInZH[media.type].type}：${url}]`);
+            const altMessage = Message.Plain(`\n[失败的${typeInZH[media.type].type}：${url}]`);
             return this.fetchMedia(url)
               .then(base64url =>
                 uploader(Message.Image('', base64url, media.type === 'photo' ? url : `${url} as gif`), () => altMessage)
@@ -391,9 +391,9 @@ extends CallableInstance<
           promise = promise.then(() => {
             const urls = originTwi.entities.urls
               .filter(urlObj => urlObj.indices[0] < originTwi.display_text_range[1])
-              .map(urlObj => `\ud83d\udd17 ${urlObj.expanded_url}`);
+              .map(urlObj => `\n\ud83d\udd17 ${urlObj.expanded_url}`);
             if (urls.length) {
-              messageChain.push(Message.Plain(urls.join('\n')));
+              messageChain.push(Message.Plain(urls.join('')));
             }
           });
         }
@@ -402,7 +402,7 @@ extends CallableInstance<
       if (originTwi.is_quote_status) {
         promise = promise.then(() => {
           messageChain.push(
-            Message.Plain(`回复此命令查看引用的推文：\n/twitter_view ${originTwi.quoted_status_permalink.expanded}`)
+            Message.Plain(`\n回复此命令查看引用的推文：\n/twitter_view ${originTwi.quoted_status_permalink.expanded}`)
           );
         });
       }