fix still working on unsubscribed feeds

dist/twitter.js

@@ -183,6 +183,18 @@ class default_1 {
     constructor(opt) {
         this.launch = () => {
             this.webshot = new webshot_1.default(this.wsUrl, this.mode, () => {
+                const subscribedIds = this.lock.feed.map(feed => this.lock.threads[feed].id.toString());
+                for (const id in this.cache) {
+                    if (this.cache[id].pullOrder !== 0 && !subscribedIds.includes(id)) {
+                        logger.warn(`disabling pull job of unsubscribed user @${this.cache[id].user.username}`);
+                        this.cache[id].pullOrder = 0;
+                    }
+                }
+                const userIdCache = this.pullOrders;
+                if (Object.values(userIdCache).length !== userIdCache.length) {
+                    this.pullOrders = utils_1.Arr.shuffle(userIdCache);
+                    fs.writeFileSync(path.resolve(this.cachefile), JSON.stringify(this.cache));
+                }
                 setTimeout(this.workForAll, this.workInterval * 1000 / this.lock.feed.length);
                 setTimeout(() => {
                     this.work();

dist/utils.js

@@ -5,7 +5,7 @@ const crypto = require("crypto");
 const chainPromises = (lazyPromises, reducer = (lp1, lp2) => (p) => lp1(p).then(lp2), initialValue) => lazyPromises.reduce(reducer, p => Promise.resolve(p))(initialValue);
 exports.chainPromises = chainPromises;
 const shuffleArray = (arr) => {
-    const res = arr.slice(0);
+    const res = arr.filter(e => e);
     for (let i = res.length - 1; i > 0; i--) {
         const j = crypto.randomInt(0, i + 1);
         [res[i], res[j]] = [res[j], res[i]];

src/twitter.ts

@@ -377,6 +377,18 @@ export default class {
       this.wsUrl,
       this.mode,
       () => {
+        const subscribedIds = this.lock.feed.map(feed => this.lock.threads[feed].id.toString());
+        for (const id in this.cache) {
+          if (this.cache[id].pullOrder !== 0 && !subscribedIds.includes(id)) {
+            logger.warn(`disabling pull job of unsubscribed user @${this.cache[id].user.username}`);
+            this.cache[id].pullOrder = 0;
+          }
+        }
+        const userIdCache = this.pullOrders;
+        if (Object.values(userIdCache).length !== userIdCache.length) {
+          this.pullOrders = Arr.shuffle(userIdCache);
+          fs.writeFileSync(path.resolve(this.cachefile), JSON.stringify(this.cache));
+        }
         setTimeout(this.workForAll, this.workInterval * 1000 / this.lock.feed.length);
         setTimeout(() => {
           this.work();

src/utils.ts

@@ -7,7 +7,7 @@ export const chainPromises = <T>(
 ) => lazyPromises.reduce(reducer, p => Promise.resolve(p))(initialValue);
 
 const shuffleArray = <T>(arr: T[]) => {
-  const res = arr.slice(0);
+  const res = arr.filter(e => e);
   for (let i = res.length - 1; i > 0; i--) {
     const j = crypto.randomInt(0, i + 1);
     [res[i], res[j]] = [res[j], res[i]];