fix(cooldown): use latest timestamp in case of duplicate

Fixes #3209
sogebot · Feb 7, 2020 · 3cdf672 · 3cdf672
1 parent 59b0edc
commit 3cdf672
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/src/bot/systems/cooldown.ts b/src/bot/systems/cooldown.ts
@@ -194,7 +194,14 @@ class Cooldown extends System {
         continue;
       }
 
-      viewer = cooldown.viewers?.find(o => o.userId === Number(opts.sender.userId));
+      for (const item of cooldown.viewers?.filter(o => o.userId === Number(opts.sender.userId)) ?? []) {
+        if (!viewer || viewer.timestamp < item.timestamp) {
+          viewer = {...item};
+        } else {
+          // remove duplicate
+          cooldown.viewers = cooldown.viewers?.filter(o => o.id !== item.id);
+        }
+      }
       debug('cooldown.db', viewer ?? `${opts.sender.username}#${opts.sender.userId} not found in cooldown list`);
       if (cooldown.type === 'global') {
         timestamp = cooldown.timestamp ?? 0;
@@ -210,7 +217,7 @@ class Cooldown extends System {
         } else {
           debug('cooldown.check', `${opts.sender.username}#${opts.sender.userId} added to cooldown list.`);
           cooldown.viewers?.push({
-            ...cooldown.viewers.find(o => o.userId === Number(opts.sender.userId)),
+            ...viewer,
             userId: Number(opts.sender.userId),
             lastTimestamp: timestamp,
             timestamp: now,