feat: optional delete subscribes on send err

fengkx · Oct 4, 2019 · b26f7d9 · b26f7d9
1 parent a6048f5
commit b26f7d9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/config/index.js b/config/index.js
@@ -20,5 +20,6 @@ module.exports = {
         process.env.RSSBOT_UA ||
         `Mozilla/5.0  NodeRSSBot v${version}(https://github.com/fengkx/NodeRSSBot)`,
     not_send: process.env.NOT_SEND || false, // just for debug use
-    concurrency: process.env.RSSBOT_CONCURRENCY || 200
+    concurrency: process.env.RSSBOT_CONCURRENCY || 200,
+    delete_on_err_send: process.env.DELETE_ON_ERR_SEND || true // block and chat not found
 };
diff --git a/utils/send.js b/utils/send.js
@@ -1,6 +1,7 @@
 const SUBSCRIBES = require('../proxies/subscribes');
 const logger = require('./logger');
 const sanitize = require('./sanitize');
+const config = require('../config');
 
 module.exports = async (bot, toSend, feed) => {
     const subscribers = await SUBSCRIBES.getSubscribersByFeedId(feed.feed_id);
@@ -36,11 +37,14 @@ module.exports = async (bot, toSend, feed) => {
                     disable_web_page_preview: true
                 });
             } catch (e) {
+                // bot was blocked or chat is deleted
                 logger.error(e.description);
-                const re = new RegExp('chat not found');
-                if (re.test(e.description)) {
+                const re = new RegExp(
+                    'chat not found|bot was blocked by the user'
+                );
+                if (config.delete_on_err_send && re.test(e.description)) {
                     logger.error(`delete all subscribes for user ${userId}`);
-                    // SUBSCRIBES.deleteSubscribersByUserId(userId);
+                    SUBSCRIBES.deleteSubscribersByUserId(userId);
                 }
             }
         });