dankgrinder 6.17.0 → 6.21.0

package/lib/commands/adventure.js

@@ -64,7 +64,7 @@ async function clickAndRefetch(channel, msg, btn) {
     LOG.error(`[adventure] Click error: ${e.message}`);
     return null;
   }
-  await sleep(250);
+  await sleep(100);
   return await refetchMsg(channel, msg.id);
 }
 
@@ -174,7 +174,7 @@ async function playAdventureRounds(channel, msg) {
       const choice = pickSafeChoice(choices);
       if (choice) {
         LOG.info(`[adventure] → Choosing: "${choice.label}"`);
-        await sleep(100);
+        await sleep(50);
         const afterChoice = await clickAndRefetch(channel, current, choice);
         if (afterChoice) {
           current = afterChoice;
@@ -208,7 +208,7 @@ async function playAdventureRounds(channel, msg) {
     } else if (nextBtnNow && nextBtnNow.disabled) {
       // Next is disabled but no choices found — might be loading
       LOG.debug(`[adventure] Next disabled, no choices — waiting...`);
-      await sleep(300);
+      await sleep(150);
       const refreshed = await refetchMsg(channel, current.id);
       if (refreshed) {
         current = refreshed;
@@ -221,7 +221,7 @@ async function playAdventureRounds(channel, msg) {
       // No next button at all
       LOG.debug(`[adventure] No Next button — checking if done`);
       if (isAdventureDone(current)) break;
-      await sleep(500);
+      await sleep(200);
       const refreshed = await refetchMsg(channel, current.id);
       if (refreshed) {
         current = refreshed;
@@ -374,7 +374,7 @@ async function runAdventure({ channel, waitForDankMemer, client }) {
       } catch (e) {
         LOG.error(`[adventure] Select error: ${e.message}`);
       }
-      await sleep(300);
+      await sleep(150);
     }
   }
 

package/lib/commands/crime.js

@@ -16,11 +16,19 @@ const {
 const { Trie, VoseAlias, LRUCache } = require('../structures');
 
 const SAFE_CRIME_OPTIONS = Object.freeze([
-  'tax evasion', 'fraud', 'cybercrime', 'hacking', 'identity theft',
+  // 100% safe (from logs analysis)
+  'identity theft', 'fraud', 'littering',
+  // 67% safe
+  'dui',
+  // Other potentially safe options
+  'tax evasion', 'cybercrime', 'hacking',
   'money laundering', 'tax fraud', 'insurance fraud', 'scam',
 ]);
 
 const RISKY_CRIME_OPTIONS = Object.freeze([
+  // 0% safe (from logs)
+  'cyber bullying', 'trespassing', 'shoplifting',
+  // Known dangerous
   'murder', 'arson', 'assault', 'kidnap', 'terrorism',
 ]);
 

package/lib/commands/postmemes.js

@@ -63,7 +63,7 @@ async function runPostMemes({ channel, waitForDankMemer }) {
   if (initLower.includes('cannot post another meme') || initLower.includes('dead meme') ||
       initLower.includes('another meme for another')) {
     const minMatch = initText.match(RE_COOLDOWN_MIN);
-    const cdSec = minMatch ? parseInt(minMatch[1]) * 60 : 120;
+    const cdSec = minMatch ? parseInt(minMatch[1]) * 60 : 150;
     LOG.warn(`[pm] Cooldown: ${cdSec}s`);
     return { result: `pm cooldown ${cdSec}s`, coins: 0, nextCooldownSec: cdSec };
   }
@@ -110,7 +110,7 @@ async function runPostMemes({ channel, waitForDankMemer }) {
     try {
       await response.selectMenu(locRowIdx, [opt.value]);
     } catch (e) { LOG.error(`[pm] Platform select error: ${e.message}`); }
-    await sleep(300);
+    await sleep(100);
     const updated = await refetchMsg(channel, msgId);
     if (updated) { response = updated; logMsg(response, 'pm-after-platform'); }
   }
@@ -123,7 +123,7 @@ async function runPostMemes({ channel, waitForDankMemer }) {
     try {
       await response.selectMenu(kindRowIdx, [opt.value]);
     } catch (e) { LOG.error(`[pm] Kind select error: ${e.message}`); }
-    await sleep(300);
+    await sleep(100);
     const updated = await refetchMsg(channel, msgId);
     if (updated) { response = updated; logMsg(response, 'pm-after-kind'); }
   }
@@ -136,7 +136,7 @@ async function runPostMemes({ channel, waitForDankMemer }) {
     LOG.info(`[pm] Clicking "${postBtn.label}"...`);
     try {
       await safeClickButton(response, postBtn);
-      await sleep(300);
+      await sleep(100);
       const final = await refetchMsg(channel, msgId);
       if (final) {
         logMsg(final, 'pm-result');

package/lib/commands/search.js

@@ -16,9 +16,12 @@ const {
 const { VoseAlias, Trie, EMA, LRUCache } = require('../structures');
 
 const SAFE_SEARCH_LOCATIONS = Object.freeze([
+  // 100% safe (from logs analysis)
+  'shoe', 'washer', 'attic', 'pocket',
+  // Other safe locations
   'sofa', 'mailbox', 'dog', 'car', 'dresser', 'laundromat', 'bed',
-  'couch', 'pantry', 'fridge', 'kitchen', 'bathroom', 'attic',
-  'closet', 'shoe', 'vacuum', 'toilet', 'sink', 'shower',
+  'couch', 'pantry', 'fridge', 'kitchen', 'bathroom',
+  'closet', 'vacuum', 'toilet', 'sink', 'shower',
   'tree', 'grass', 'bushes', 'garden', 'park', 'backyard',
 ]);
 

package/lib/commands/stream.js

@@ -230,10 +230,10 @@ async function runStream({ channel, waitForDankMemer, client }) {
     for (const item of itemsToBuy) {
       const bought = await buyItem({ channel, waitForDankMemer, client, itemName: item, quantity: 1 });
       if (!bought) return { result: `need ${item} (buy failed)`, coins: 0, nextCooldownSec: 1800 };
-      await humanDelay(500, 1000);
+      await humanDelay(200, 400);
     }
 
-    await sleep(2000);
+    await sleep(800);
     await channel.send('pls stream');
     response = await waitForDankMemer(12000);
   if (!response) return { result: 'no response after buy', coins: 0, nextCooldownSec: 180 };
@@ -256,7 +256,7 @@ async function runStream({ channel, waitForDankMemer, client }) {
 
     const selected = await selectRandomStreamOption(response);
     if (selected) {
-      await humanDelay(150, 350);
+      await humanDelay(80, 180);
       const updatedAfterSelect = (await waitForDankMemer(5000)) || (await refetchMsg(channel, response.id));
       if (updatedAfterSelect) {
         response = updatedAfterSelect;
@@ -294,7 +294,7 @@ async function runStream({ channel, waitForDankMemer, client }) {
         }
       }
 
-      await sleep(300);
+      await sleep(150);
       const fresh = await refetchMsg(channel, response.id);
       if (fresh) {
         response = fresh;
@@ -305,7 +305,7 @@ async function runStream({ channel, waitForDankMemer, client }) {
     }
 
     LOG.info('[stream] Clicking "Go Live"');
-    await humanDelay(100, 250);
+    await humanDelay(50, 120);
     try {
       const before = response;
       const liveResult = await safeClickButton(response, goLiveBtn);
@@ -340,7 +340,7 @@ async function runStream({ channel, waitForDankMemer, client }) {
       );
       if (fallbackBtn) {
         LOG.info('[stream] Go Live transition not detected; trying setup fallback');
-        await humanDelay(80, 180);
+        await humanDelay(40, 100);
         try {
           const fallbackRes = await safeClickButton(response, fallbackBtn);
           const afterFallback = fallbackRes || (await waitForStreamTransition({
@@ -376,7 +376,7 @@ async function runStream({ channel, waitForDankMemer, client }) {
       const action = pickRandom(actions);
       const actionAt = new Date();
       LOG.info(`[stream] Live action: "${action.label}"`);
-      await humanDelay(120, 320);
+      await humanDelay(60, 150);
       try {
         const clicked = await safeClickButton(response, action);
         let updated = clicked || (await waitForDankMemer(6000)) || (await refetchMsg(channel, response.id));

package/lib/commands/utils.js

@@ -311,49 +311,66 @@ function findSelectMenuOption(msg, label) {
 // Safe button click — tries library methods first, falls back to raw HTTP for CV2.
 // When CV2 fallback is used, waits for the message to update so callers always
 // get the updated message back (instead of null, which broke multi-round games).
-async function safeClickButton(msg, button) {
+async function safeClickButton(msg, button, retries = 2) {
   // Skip LINK buttons (external URLs) — they have style=LINK/5 and no customId
   if (button.style === 'LINK' || button.style === 5 || (!button.customId && !button.custom_id && typeof button.click !== 'function')) {
     return null;
   }
-  if (typeof button.click === 'function') {
-    return button.click();
-  }
-  const id = button.customId || button.custom_id;
-  if (id && typeof msg.clickButton === 'function') {
+
+  for (let attempt = 0; attempt <= retries; attempt++) {
     try {
-      return await msg.clickButton(id);
-    } catch {
-      // Fall through to CV2 raw interaction fallback.
-    }
-  }
-  // CV2 fallback: send interaction via raw HTTP, then wait for the message
-  // to update so we can return the updated message to the caller.
-  if (id) {
-    const interactionAck = await clickCV2Button(msg, id);
-    if (interactionAck) msg._lastInteractionAck = interactionAck;
-    // Wait for Dank Memer to process the interaction and update the message
-    const updatedMsg = await new Promise((resolve) => {
-      const timeout = setTimeout(() => {
-        msg.client?.removeListener?.('messageUpdate', handler);
-        resolve(null);
-      }, 8000);
-      const handler = (_, newMsg) => {
-        if (newMsg.id === msg.id) {
-          clearTimeout(timeout);
-          msg.client?.removeListener?.('messageUpdate', handler);
-          resolve(newMsg);
+      if (typeof button.click === 'function') {
+        return await button.click();
+      }
+      const id = button.customId || button.custom_id;
+      if (id && typeof msg.clickButton === 'function') {
+        try {
+          return await msg.clickButton(id);
+        } catch {
+          // Fall through to CV2 raw interaction fallback.
         }
-      };
-      msg.client?.on?.('messageUpdate', handler);
-    });
-    if (updatedMsg) {
-      await ensureCV2(updatedMsg);
-      return updatedMsg;
+      }
+      // CV2 fallback: send interaction via raw HTTP, then wait for the message
+      // to update so we can return the updated message to the caller.
+      if (id) {
+        const interactionAck = await clickCV2Button(msg, id);
+        if (interactionAck) msg._lastInteractionAck = interactionAck;
+        // Wait for Dank Memer to process the interaction and update the message
+        const updatedMsg = await new Promise((resolve) => {
+          const timeout = setTimeout(() => {
+            msg.client?.removeListener?.('messageUpdate', handler);
+            resolve(null);
+          }, 6000);
+          const handler = (_, newMsg) => {
+            if (newMsg.id === msg.id) {
+              clearTimeout(timeout);
+              msg.client?.removeListener?.('messageUpdate', handler);
+              resolve(newMsg);
+            }
+          };
+          msg.client?.on?.('messageUpdate', handler);
+        });
+        if (updatedMsg) {
+          await ensureCV2(updatedMsg);
+          return updatedMsg;
+        }
+        // Retry if we got null
+        if (attempt < retries) {
+          await new Promise(r => setTimeout(r, 300 + attempt * 200));
+          continue;
+        }
+        return null;
+      }
+      throw new Error('No click method available on button');
+    } catch (err) {
+      if (attempt < retries) {
+        await new Promise(r => setTimeout(r, 300 + attempt * 200));
+        continue;
+      }
+      throw err;
     }
-    return null;
   }
-  throw new Error('No click method available on button');
+  return null;
 }
 
 // ── Hold Tight Detection ─────────────────────────────────────