Merge branch 'instagram' into stories

dist/koishi.js

@@ -90,7 +90,7 @@ class default_1 {
         this.sendToUser = (userID, message) => new Promise((resolve, reject) => {
             this.enqueue('private', userID, () => this.bot.sendPrivateMessage(userID, message).then(resolve).catch(reject));
         });
-        this.sendTo = (subscriber, messageChain) => Promise.all((splitted => [splitted.message, ...splitted.attachments])(exports.Message.separateAttachment(messageChain)).map(msg => {
+        this.sendTo = (subscriber, messageChain, noErrors = false) => Promise.all((splitted => [splitted.message, ...splitted.attachments])(exports.Message.separateAttachment(messageChain)).map(msg => {
             switch (subscriber.chatType) {
                 case 'group':
                     return this.sendToGroup(subscriber.chatID.toString(), msg);
@@ -106,9 +106,9 @@ class default_1 {
             logger.info(`pushing data to ${JSON.stringify(subscriber.chatID)} was successful, response: ${response}`);
         })
             .catch(reason => {
-            reason = exports.Message.ellipseBase64(reason);
-            logger.error(`error pushing data to ${JSON.stringify(subscriber.chatID)}, reason: ${reason}`);
-            throw Error(reason);
+            logger.error(exports.Message.ellipseBase64(`error pushing data to ${JSON.stringify(subscriber.chatID)}, reason: ${reason}`));
+            if (!noErrors)
+                throw reason instanceof Error ? reason : Error(reason);
         });
         this.initBot = () => {
             this.app = new koishi_1.App({

dist/twitter.js

@@ -19,7 +19,6 @@ const util_1 = require("util");
 const instagram_private_api_1 = require("instagram-private-api");
 const socks_proxy_agent_1 = require("socks-proxy-agent");
 const loggers_1 = require("./loggers");
-const koishi_1 = require("./koishi");
 const utils_1 = require("./utils");
 const webshot_1 = require("./webshot");
 const parseLink = (link) => {
@@ -196,15 +195,14 @@ class default_1 {
         this.workOnMedia = (mediaItems, sendMedia) => this.webshot(mediaItems, sendMedia, this.webshotDelay);
         this.sendStories = (source, ...to) => (msg, text, author) => {
             to.forEach(subscriber => {
-                logger.info(`pushing data${source ? ` of ${koishi_1.Message.ellipseBase64(source)}` : ''} to ${JSON.stringify(subscriber)}`);
+                logger.info(`pushing data${source ? ` of ${source}` : ''} to ${JSON.stringify(subscriber)}`);
                 retryOnError(() => this.bot.sendTo(subscriber, msg), (_, count, terminate) => {
                     if (count <= maxTrials) {
                         logger.warn(`retry sending to ${subscriber.chatID} for the ${ordinal(count)} time...`);
                     }
                     else {
-                        logger.warn(`${count - 1} consecutive failures while sending` +
-                            'message chain, trying plain text instead...');
-                        terminate(this.bot.sendTo(subscriber, author + text));
+                        logger.warn(`${count - 1} consecutive failures while sending message chain, trying plain text instead...`);
+                        terminate(this.bot.sendTo(subscriber, author + text, true));
                     }
                 });
             });

src/koishi.ts

@@ -104,7 +104,7 @@ export default class {
     this.enqueue('private', userID, () => this.bot.sendPrivateMessage(userID, message).then(resolve).catch(reject));
   });
 
-  public sendTo = (subscriber: IChat, messageChain: string) => Promise.all(
+  public sendTo = (subscriber: IChat, messageChain: string, noErrors = false) => Promise.all(
     (splitted => [splitted.message, ...splitted.attachments])(
       Message.separateAttachment(messageChain)
     ).map(msg => {
@@ -122,9 +122,8 @@ export default class {
       logger.info(`pushing data to ${JSON.stringify(subscriber.chatID)} was successful, response: ${response}`);
     })
     .catch(reason => {
-      reason = Message.ellipseBase64(reason);
-      logger.error(`error pushing data to ${JSON.stringify(subscriber.chatID)}, reason: ${reason}`);
-      throw Error(reason);
+      logger.error(Message.ellipseBase64(`error pushing data to ${JSON.stringify(subscriber.chatID)}, reason: ${reason}`));
+      if (!noErrors) throw reason instanceof Error ? reason : Error(reason);
     });
 
   private initBot = () => {

src/twitter.ts

@@ -14,7 +14,7 @@ import { RequestError } from 'request-promise/errors';
 import { SocksProxyAgent } from 'socks-proxy-agent';
 
 import { getLogger } from './loggers';
-import QQBot, { Message } from './koishi';
+import QQBot from './koishi';
 import { BigNumOps } from './utils';
 import Webshot from './webshot';
 
@@ -312,16 +312,15 @@ export default class {
 
   private sendStories = (source?: string, ...to: IChat[]) => (msg: string, text: string, author: string) => {
     to.forEach(subscriber => {
-      logger.info(`pushing data${source ? ` of ${Message.ellipseBase64(source)}` : ''} to ${JSON.stringify(subscriber)}`);
+      logger.info(`pushing data${source ? ` of ${source}` : ''} to ${JSON.stringify(subscriber)}`);
       retryOnError(
         () => this.bot.sendTo(subscriber, msg),
         (_, count, terminate: (doNothing: Promise<void>) => void) => {
           if (count <= maxTrials) {
             logger.warn(`retry sending to ${subscriber.chatID} for the ${ordinal(count)} time...`);
           } else {
-            logger.warn(`${count - 1} consecutive failures while sending` +
-            'message chain, trying plain text instead...');
-            terminate(this.bot.sendTo(subscriber, author + text));
+            logger.warn(`${count - 1} consecutive failures while sending message chain, trying plain text instead...`);
+            terminate(this.bot.sendTo(subscriber, author + text, true));
           }
         });
     });