fix: ignore following items when checking new item

fengkx · Nov 20, 2020 · a1d87f1 · a1d87f1
1 parent 4268b01
commit a1d87f1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 15 deletions.
diff --git a/source/utils/fetch.ts b/source/utils/fetch.ts
@@ -8,7 +8,7 @@ import logger, { logHttpError } from './logger';
 import { findFeed } from './feed';
 import { config } from '../config';
 import { Feed, FeedItem } from '../types/feed';
-import { Optional, Option, isNone, none, isSome, Some } from '../types/option';
+import { Optional, Option, isNone, none, isSome } from '../types/option';
 import { parseString } from '../parser/parse';
 import {
     getAllFeeds,
@@ -106,19 +106,14 @@ const queue = fastQueue(async (eachFeed: Feed, cb) => {
                     }
                 )
             );
-            const newItems = await Promise.all(
-                fetchedItems.value.map(
-                    async (item: FeedItem): Promise<Option<FeedItem>> => {
-                        const hash = await hashFeed(item);
-                        if (oldHashList.indexOf(hash) === -1)
-                            return Optional(item);
-                        else return none;
-                    }
-                )
-            );
-            sendItems = newItems
-                .filter(isSome)
-                .map((some: Some<FeedItem>) => some.value);
+            for (let i = 0; i < fetchedItems.value.length; i++) {
+                const item = fetchedItems.value[i];
+                if (!oldHashList.includes(newHashList[i])) {
+                    sendItems.push(item);
+                } else {
+                    break; // ignore the following items
+                }
+            }
             if (sendItems.length > 0) {
                 await updateHashList(eachFeed.feed_id, newHashList);
             }

diff --git a/source/utils/send.ts b/source/utils/send.ts
@@ -18,7 +18,7 @@ import { isNone } from '../types/option';
  */
 async function handlerSendError(e: any, userId: number): Promise<boolean> {
     // bot was blocked or chat is deleted
-    logger.error(e.description);
+    logger.error(e);
     const re = new RegExp(
         'chat not found|bot was blocked by the user|bot was kicked'
     );