dankgrinder 6.16.0 → 6.19.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/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/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 ─────────────────────────────────────

package/lib/grinder.js

@@ -1507,210 +1507,116 @@ class AccountWorker {
       if (!t) return false;
       const lower = t.toLowerCase();
       return lower.includes('balance') || lower.includes('balances') || lower.includes('global rank')
-        || lower.includes('wallet') || /<a?:coin:\d+>/.test(t) || /<a?:bank:\d+>/.test(t);
-    };
-
-    const readBalanceText = async (msg, forceCV2 = false) => {
-      if (!msg) return '';
-      const needsCv2 = forceCV2
-        || isCV2(msg)
-        || (Array.isArray(msg.components) && msg.components.length > 0
-          && (!msg.content || msg.content.length === 0)
-          && (!msg.embeds || msg.embeds.length === 0));
-      if (needsCv2) await ensureCV2(msg, forceCV2);
-      return stripAnsi(getFullText(msg)).replace(/\s+/g, ' ').trim();
-    };
-
-    const findRecentBalanceMessage = async () => {
-      if (!this.channel?.messages?.fetch) return null;
-      for (let attempt = 0; attempt < 6; attempt++) {
-        try {
-          const recent = await this.channel.messages.fetch({ limit: 12 });
-          const candidates = [...recent.values()].filter((m) =>
-            m?.author?.id === DANK_MEMER_ID && (m.createdTimestamp || 0) >= sentAt - 10000
-          );
-          for (const m of candidates) {
-            const t = await readBalanceText(m, true);
-            if (looksLikeBalance(t)) return m;
-          }
-        } catch {}
-        await new Promise((r) => setTimeout(r, 700));
-      }
-      return null;
+        || lower.includes('wallet') || /<a?:coin:\d+>/i.test(t) || /<a?:bank:\d+>/i.test(t);
     };
 
+    // Fast path: send command, wait 3s, read from rawLogger
     if (this.account.use_slash && this.channel?.sendSlash) {
       await this.channel.sendSlash(DANK_MEMER_ID, 'balance').catch(() => this.channel.send('/balance'));
     } else {
       await this.channel.send(`${prefix} bal`);
     }
-    let response = await this.waitForDankMemer(12000);
+    await new Promise(r => setTimeout(r, 3000));
 
-    // Fallback for slash setup: try legacy prefix if no slash response.
-    if (!response && this.account.use_slash) {
-      await this.channel.send('pls bal');
-      response = await this.waitForDankMemer(12000);
+    // Try rawLogger first — it captures CV2 text from gateway instantly
+    let text = '';
+    const rawData = rawLogger.getLastRaw(this.channel?.id);
+    if (rawData && rawData.cv2Text && looksLikeBalance(rawData.cv2Text)) {
+      text = rawData.cv2Text;
+    } else if (rawData && rawData.allText && looksLikeBalance(rawData.allText)) {
+      text = rawData.allText;
     }
 
-    if (response) {
-      let text = await readBalanceText(response);
-
-      // Dank Memer sometimes sends empty first payload then edits in the full card.
-      if ((!text || !looksLikeBalance(text)) && response.id) {
-        const edited = await this.waitForMessageUpdate(response.id, 8000);
-        if (edited) {
-          text = await readBalanceText(edited, true);
-          response = edited;
-        }
+    // If rawLogger didn't capture it, fall back to waitForDankMemer
+    if (!text || !looksLikeBalance(text)) {
+      let response = await this.waitForDankMemer(8000);
+      if (!response && this.account.use_slash) {
+        await this.channel.send('pls bal');
+        response = await this.waitForDankMemer(8000);
       }
-
-      // If we received a stale/irrelevant update, fetch same message fresh.
-      if ((!text || !looksLikeBalance(text)) && response.id && this.channel?.messages?.fetch) {
-        const fetched = await Promise.resolve(this.channel.messages.fetch(response.id)).catch(() => null);
-        if (fetched) {
-          const fetchedText = await readBalanceText(fetched, true);
-          if (fetchedText) {
-            text = fetchedText;
-            response = fetched;
-          }
-        }
+      if (response) {
+        if (isCV2(response)) await ensureCV2(response);
+        text = stripAnsi(getFullText(response)).replace(/\s+/g, ' ').trim();
       }
-
-      // Fallback: scan latest Dank messages right after command send.
-      if (!text || !looksLikeBalance(text)) {
-        const recentBalance = await findRecentBalanceMessage();
-        if (recentBalance) {
-          text = await readBalanceText(recentBalance, true);
-          response = recentBalance;
-        }
-      }
-
-      // Last resort: wait for CV2 content propagation then re-fetch
-      if ((!text || !looksLikeBalance(text)) && response.id && this.channel?.messages?.fetch) {
-        await new Promise(r => setTimeout(r, 3000));
-        try {
-          const fresh = await this.channel.messages.fetch(response.id);
-          if (fresh) {
-            const freshText = await readBalanceText(fresh, true);
-            if (freshText && looksLikeBalance(freshText)) {
-              text = freshText;
-              response = fresh;
-            }
-          }
-        } catch {}
-      }
-
-      // Absolute last: re-scan channel messages after the extra wait
+      // One more rawLogger check after the wait
       if (!text || !looksLikeBalance(text)) {
-        const recentBalance2 = await findRecentBalanceMessage();
-        if (recentBalance2) {
-          text = await readBalanceText(recentBalance2, true);
-          response = recentBalance2;
-        }
-      }
-
-      // Raw logger fallback — CV2 text is captured directly from gateway
-      if (!text || !looksLikeBalance(text)) {
-        const rawData = rawLogger.getLastRaw(this.channel?.id);
-        if (rawData && rawData.cv2Text) {
-          const rawText = rawData.cv2Text;
-          if (looksLikeBalance(rawText)) {
-            text = rawText;
-            this.log('debug', 'Balance: using rawLogger CV2 text fallback');
-          }
-        }
-        // Also try from Redis raw message
-        if ((!text || !looksLikeBalance(text)) && response?.id) {
-          try {
-            const rawMsg = await rawLogger.getMsg(response.id);
-            if (rawMsg?.allText && looksLikeBalance(rawMsg.allText)) {
-              text = rawMsg.allText;
-              this.log('debug', 'Balance: using rawLogger Redis fallback');
-            }
-          } catch {}
-        }
-      }
-
-      if (!text) {
-        this.log('warn', 'Balance response was empty after waiting for update');
-        return;
-      }
-
-      if (!looksLikeBalance(text)) {
-        this.log('warn', `Balance response did not look like balance card: "${text.substring(0, 140)}"`);
-        return;
+        const raw2 = rawLogger.getLastRaw(this.channel?.id);
+        if (raw2?.cv2Text && looksLikeBalance(raw2.cv2Text)) text = raw2.cv2Text;
+        else if (raw2?.allText && looksLikeBalance(raw2.allText)) text = raw2.allText;
       }
+    }
 
-      let wallet = 0;
-      let bank = 0;
-      let matched = '';
+    if (!text || !looksLikeBalance(text)) {
+      this.log('warn', 'Balance: no data after all attempts');
+      return;
+    }
 
-    // CV2 format: <:Coin:ID> 3,272,896 and <:Bank:ID> 275,000 / 275,000
+    // Parse wallet and bank
+    let wallet = 0, bank = 0, matched = '';
     const coinMatch = text.match(/<a?:Coin:\d+>\s*([\d,]+)/i);
     const bankEmojiMatch = text.match(/<a?:Bank:\d+>\s*([\d,]+)/i);
     const bankSlashMatch = text.match(/(?:<a?:Bank:\d+>\s*)?([\d,]+)\s*\/\s*[\d,]+/i);
 
-      // Legacy embed format: Wallet: ⏣ 1,234,567
-      const walletMatch = text.match(/wallet[:\s]*\*{0,2}\s*[⏣💰]?\s*\*{0,2}\s*([\d,]+)/i);
-      const bankTextMatch = text.match(/bank[:\s]*\*{0,2}\s*[⏣💰]?\s*\*{0,2}\s*([\d,]+)/i);
+    // Legacy embed format: Wallet: ⏣ 1,234,567
+    const walletMatch = text.match(/wallet[:\s]*\*{0,2}\s*[⏣💰]?\s*\*{0,2}\s*([\d,]+)/i);
+    const bankTextMatch = text.match(/bank[:\s]*\*{0,2}\s*[⏣💰]?\s*\*{0,2}\s*([\d,]+)/i);
 
-      // Fallback: any numbers near ⏣ or just plain numbers in CV2 text
-      const allNums = [...text.matchAll(/(?:⏣\s*)?(\d[\d,]*\d)/g)].map(m => parseInt(m[1].replace(/,/g, ''), 10)).filter(n => n > 0);
+    // Fallback: any numbers near ⏣ or just plain numbers in CV2 text
+    const allNums = [...text.matchAll(/(?:⏣\s*)?(\d[\d,]*\d)/g)].map(m => parseInt(m[1].replace(/,/g, ''), 10)).filter(n => n > 0);
 
-      if (coinMatch) {
-        wallet = parseInt(coinMatch[1].replace(/,/g, ''), 10);
-        matched = 'cv2-emoji';
-      } else if (walletMatch) {
-        wallet = parseInt(walletMatch[1].replace(/,/g, ''), 10);
-        matched = 'legacy-wallet';
-      } else if (allNums.length > 0) {
-        wallet = Math.max(...allNums);
-        matched = 'fallback-nums';
-      }
+    if (coinMatch) {
+      wallet = parseInt(coinMatch[1].replace(/,/g, ''), 10);
+      matched = 'cv2-emoji';
+    } else if (walletMatch) {
+      wallet = parseInt(walletMatch[1].replace(/,/g, ''), 10);
+      matched = 'legacy-wallet';
+    } else if (allNums.length > 0) {
+      wallet = Math.max(...allNums);
+      matched = 'fallback-nums';
+    }
 
-      if (bankEmojiMatch) {
-        bank = parseInt(bankEmojiMatch[1].replace(/,/g, ''), 10);
-        matched += matched ? '+bank-emoji' : 'bank-emoji';
-      } else if (bankTextMatch) {
-        bank = parseInt(bankTextMatch[1].replace(/,/g, ''), 10);
-        matched += matched ? '+bank-text' : 'bank-text';
-      } else if (bankSlashMatch) {
-        bank = parseInt(bankSlashMatch[1].replace(/,/g, ''), 10);
-        matched += matched ? '+bank-slash' : 'bank-slash';
-      }
+    if (bankEmojiMatch) {
+      bank = parseInt(bankEmojiMatch[1].replace(/,/g, ''), 10);
+      matched += matched ? '+bank-emoji' : 'bank-emoji';
+    } else if (bankTextMatch) {
+      bank = parseInt(bankTextMatch[1].replace(/,/g, ''), 10);
+      matched += matched ? '+bank-text' : 'bank-text';
+    } else if (bankSlashMatch) {
+      bank = parseInt(bankSlashMatch[1].replace(/,/g, ''), 10);
+      matched += matched ? '+bank-slash' : 'bank-slash';
+    }
 
-      if (wallet === 0 && bank === 0) {
-        this.log('warn', `Balance parse returned 0 — raw text: "${text.substring(0, 200)}"`);
-        // Don't overwrite a known-good balance with 0
-        if (this.stats.balance > 0 || this.stats.bankBalance > 0) return;
-      }
+    if (wallet === 0 && bank === 0) {
+      this.log('warn', `Balance parse returned 0 — raw text: "${text.substring(0, 200)}"`);
+      // Don't overwrite a known-good balance with 0
+      if (this.stats.balance > 0 || this.stats.bankBalance > 0) return;
+    }
 
     this.stats.balance = wallet;
     this.stats.bankBalance = bank;
     this.log('bal', `Wallet: ${c.bold}${c.green}⏣ ${wallet.toLocaleString()}${c.reset}  Bank: ${c.bold}${c.cyan}⏣ ${bank.toLocaleString()}${c.reset}  Total: ${c.bold}⏣ ${(wallet + bank).toLocaleString()}${c.reset}  ${c.dim}(${matched || 'none'})${c.reset}`);
 
-      // Store in Redis for persistence
-      if (redis) {
-        try {
-          await redis.set(`dkg:bal:${this.account.id}`, JSON.stringify({ wallet, bank, ts: Date.now() }));
-        } catch {}
-      }
-
-      // Always report to dashboard API
+    // Store in Redis for persistence
+    if (redis) {
       try {
-        await fetch(`${API_URL}/api/grinder/status`, {
-          method: 'POST',
-          headers: { Authorization: `Bearer ${API_KEY}`, 'Content-Type': 'application/json' },
-          body: JSON.stringify({
-            account_id: this.account.id,
-            balance: wallet,
-            bank_balance: bank,
-            total_balance: wallet + bank,
-            lifesavers: this._lifesavers ?? null,
-          }),
-        });
-      } catch { /* silent */ }
+        await redis.set(`dkg:bal:${this.account.id}`, JSON.stringify({ wallet, bank, ts: Date.now() }));
+      } catch {}
     }
+
+    // Always report to dashboard API
+    try {
+      await fetch(`${API_URL}/api/grinder/status`, {
+        method: 'POST',
+        headers: { Authorization: `Bearer ${API_KEY}`, 'Content-Type': 'application/json' },
+        body: JSON.stringify({
+          account_id: this.account.id,
+          balance: wallet,
+          bank_balance: bank,
+          total_balance: wallet + bank,
+          lifesavers: this._lifesavers ?? null,
+        }),
+      });
+    } catch { /* silent */ }
   }
 
   // ── Check DM History for deaths/level-ups ──────────────────
@@ -1805,20 +1711,68 @@ class AccountWorker {
     if (shutdownCalled || !this.running) return;
     this.stats.commands++;
 
+    // ── Monthly: only run if balance ≥ 18M (advancements requirement) ──
+    if (cmdName === 'monthly') {
+      const totalBal = (this.stats.balance || 0) + (this.stats.bankBalance || 0);
+      if (totalBal < 18_000_000) {
+        this.log('warn', `[monthly] SKIPPED — balance ${(totalBal / 1e6).toFixed(1)}M < 18M`);
+        await this.setCooldown(cmdName, 86400);
+        return;
+      }
+      // Check if disabled (not premium / no advancement)
+      if (redis) {
+        try {
+          const disabled = await redis.get(`dkg:disabled:${this.account.id}:monthly`);
+          if (disabled) {
+            this.log('warn', `[monthly] SKIPPED — disabled (needs advancement purchase)`);
+            return;
+          }
+        } catch {}
+      }
+    }
+
+    // ── Daily/Monthly: check if already claimed today (avoid wasting a command) ──
+    if (cmdName === 'daily' || cmdName === 'monthly') {
+      if (redis) {
+        try {
+          const done = await redis.get(`dkg:done:${this.account.id}:${cmdName}`);
+          if (done) {
+            const ttl = await redis.ttl(`dkg:done:${this.account.id}:${cmdName}`);
+            this.log('info', `[${cmdName}] already claimed — ${Math.ceil(ttl / 60)}min left`);
+            await this.setCooldown(cmdName, Math.max(60, ttl));
+            return;
+          }
+        } catch {}
+      }
+    }
+
+    // ── Deposit: max once per hour, only when enabled ──
+    if (cmdName === 'dep max') {
+      if (this._lastDepositAt && Date.now() - this._lastDepositAt < 3600_000) {
+        return; // silently skip — too soon
+      }
+    }
+
     // ── Lifesaver protection: skip crime/search if 0 lifesavers ──
     if (cmdName === 'crime' || cmdName === 'search') {
+      // Fast path: check in-memory lifesaver count (set from inv + DM check)
+      if (this._lifesavers === 0) {
+        this.log('warn', `[${cmdName}] SKIPPED — 0 lifesavers (in-memory)`);
+        await this.setCooldown(cmdName, 3600);
+        return;
+      }
       const noLifesaver = await rawLogger.hasNoLifesaverAlert(this.channel?.id);
       if (noLifesaver) {
         this.log('warn', `[${cmdName}] SKIPPED — no lifesavers! (death detected in DMs)`);
-        await this.setCooldown(cmdName, 3600); // block for 1 hour
+        await this.setCooldown(cmdName, 3600);
         return;
       }
-      // Also check Redis key for lifesaver count
       if (redis) {
         try {
           const lsCount = await redis.get(`dkg:lifesavers:${this.account.id}`);
           if (lsCount === '0') {
-            this.log('warn', `[${cmdName}] SKIPPED — 0 lifesavers cached`);
+            this._lifesavers = 0;
+            this.log('warn', `[${cmdName}] SKIPPED — 0 lifesavers (Redis)`);
             await this.setCooldown(cmdName, 3600);
             return;
           }
@@ -1885,7 +1839,7 @@ class AccountWorker {
       // PostMemes / command-specific cooldown from response
       if (resultLower.includes('cannot post another meme') || resultLower.includes('dead meme')) {
         const minMatch = result.match(/(\d+)\s*minute/i);
-        const cdSec = minMatch ? parseInt(minMatch[1]) * 60 : 120;
+        const cdSec = minMatch ? parseInt(minMatch[1]) * 60 + 30 : 150; // dead meme = N min + 30s buffer
         this.log('warn', `${cmdName} on cooldown: ${cdSec}s`);
         await this.setCooldown(cmdName, cdSec);
         return;
@@ -1965,11 +1919,13 @@ class AccountWorker {
         return;
       }
 
-      // Premium-only command detection — disable for 24h
+      // Premium-only command detection — disable permanently
       if (resultLower.includes('only available on premium') || resultLower.includes('premium') ||
-          resultLower.includes('buy the ability to use this command')) {
-        this.log('warn', `${cmdName} requires premium — skipping for 24h`);
-        await this.setCooldown(cmdName, 86400);
+          resultLower.includes('buy the ability to use this command') ||
+          resultLower.includes('advancements upgrades')) {
+        this.log('warn', `${cmdName} requires premium/advancement — DISABLED`);
+        await this.setCooldown(cmdName, 2592000); // 30 days
+        if (redis) try { await redis.set(`dkg:disabled:${this.account.id}:${cmdName}`, '1', 'EX', 2592000); } catch {}
         return;
       }
 
@@ -2076,9 +2032,12 @@ class AccountWorker {
         }
       }
 
-      // Smart auto-deposit: when wallet exceeds threshold, deposit to protect from robbery
-      if (earned > 0 && this.stats.balance > this._autoDepositThreshold) {
+      // Smart auto-deposit: max once per hour, only if deposit is enabled
+      const depositEnabled = this.account.cmd_deposit !== false;
+      const depositCooldownOk = !this._lastDepositAt || Date.now() - this._lastDepositAt >= 3600_000;
+      if (depositEnabled && depositCooldownOk && earned > 0 && this.stats.balance > this._autoDepositThreshold) {
         this.log('info', `Wallet ⏣ ${this.stats.balance.toLocaleString()} exceeds threshold — auto-depositing`);
+        this._lastDepositAt = Date.now();
         try {
           await this.channel.send('pls dep max');
           await this.waitForDankMemer(6000);
@@ -2172,10 +2131,10 @@ class AccountWorker {
   { key: 'cmd_work',      cmd: 'work shift',  cdKey: 'cd_work',      defaultCd: 1800,   priority: 3 },
     // Time-gated (run ASAP when available)
     { key: 'cmd_daily',     cmd: 'daily',       cdKey: 'cd_daily',     defaultCd: 86400,  priority: 10 },
-    { key: 'cmd_weekly',    cmd: 'weekly',       cdKey: 'cd_weekly',    defaultCd: 604800, priority: 10 },
+    // weekly removed — premium only, not available for free users
     { key: 'cmd_monthly',   cmd: 'monthly',     cdKey: 'cd_monthly',   defaultCd: 2592000,priority: 10 },
     // Financial safety
-    { key: 'cmd_deposit',   cmd: 'dep max',     cdKey: 'cd_deposit',   defaultCd: 120,    priority: 8 },
+    { key: 'cmd_deposit',   cmd: 'dep max',     cdKey: 'cd_deposit',   defaultCd: 3600,   priority: 8 },
     { key: 'cmd_drops',     cmd: 'drops',       cdKey: 'cd_drops',     defaultCd: 86400,  priority: 2 },
     // Alert is NOT scheduled — it's reactive (listener-based, see grindLoop)
   ].map(Object.freeze);
@@ -3171,16 +3130,16 @@ async function start(apiKey, apiUrl) {
   let balDone = 0;
   const balProgressInterval = setInterval(() => {
     const spin = BRAILLE_SPIN[Math.floor(Date.now() / 80) % BRAILLE_SPIN.length];
-    process.stdout.write(`\r  ${rgb(34, 211, 238)}${spin}${c.reset}  ${c.dim}Balance...${c.reset}  ${c.bold}${rgb(52, 211, 153)}${balDone}${c.reset}${c.dim}/${c.reset}${c.white}${total}${c.reset}  `);
+    process.stdout.write(`\r  ${rgb(34, 211, 238)}${spin}${c.reset}  ${c.dim}Balance...${c.reset}  ${c.bold}${rgb(52, 211, 153)}${balDone}${c.reset}${c.dim}/${c.reset}${c.white}${activeWorkers.length}${c.reset}  `);
   }, 80);
 
-  // Run sequentially — parallel causes CV2 text to be empty (raw logger timing)
-  for (const w of activeWorkers) {
+  // Run in parallel
+  await Promise.all(activeWorkers.map(async w => {
     try {
       await w.checkBalance();
+      balDone++;
     } catch {}
-    balDone++;
-  }
+  }));
 
   clearInterval(balProgressInterval);
   process.stdout.write(`\r${c.clearLine}`);
@@ -3213,6 +3172,9 @@ async function start(apiKey, apiUrl) {
       if (dm.deaths > 0) dmDeaths += dm.deaths;
       if (dm.levelUps > 0) dmLevelUps += dm.levelUps;
       if (dm.lifesavers === 0) dmNoLs.push(w.username);
+      // Store level and lifesaver for dashboard
+      if (dm.currentLevel > 0) w._level = dm.currentLevel;
+      if (dm.lifesavers >= 0) w._lifesavers = dm.lifesavers;
       const parts = [];
       if (dm.currentLevel > 0) parts.push(`Lv${dm.currentLevel}`);
       if (dm.deaths > 0) parts.push(`${rgb(239, 68, 68)}${dm.deaths} deaths${c.reset}`);
@@ -3227,6 +3189,15 @@ async function start(apiKey, apiUrl) {
   }
   if (dmNoLs.length > 0) {
     console.log(`  ${rgb(239, 68, 68)}⚠${c.reset}  ${c.bold}${c.red}DM confirms 0 lifesavers:${c.reset} ${dmNoLs.join(', ')}`);
+    // Set Redis keys to block crime/search
+    for (const w of activeWorkers) {
+      if (dmNoLs.includes(w.username) && redis) {
+        try {
+          await redis.set(`dkg:lifesavers:${w.account.id}`, '0', 'EX', 86400);
+          await redis.set(`raw:alert:no-lifesaver:${w.channel?.id}`, '1', 'EX', 86400);
+        } catch {}
+      }
+    }
   }
   console.log(`  ${rgb(52, 211, 153)}✓${c.reset}  ${c.bold}DM check${c.reset}  ${c.dim}${dmDeaths} deaths, ${dmLevelUps} level-ups found${c.reset}`);
   console.log('');

package/lib/rawLogger.js

@@ -152,6 +152,9 @@ function detectCommand(d) {
   if (cv2Text.includes('fishing') || cv2Text.includes('fisherfolk')) return 'fish';
   if (cv2Text.includes('deposit') || cv2Text.includes('bank account')) return 'deposit';
   if (cv2Text.includes('begging') || cv2Text.includes('imagine begging')) return 'beg';
+  if (cv2Text.includes('hunting') || cv2Text.includes('went hunting') || cv2Text.includes('hunting rifle')) return 'hunt';
+  if (cv2Text.includes('digging') || cv2Text.includes('found nothing while') || cv2Text.includes('you dig')) return 'dig';
+  if (cv2Text.includes('great work') || cv2Text.includes('for your shift') || cv2Text.includes('working as') || cv2Text.includes('work shift') || cv2Text.includes('what color was') || cv2Text.includes('remember words order') || cv2Text.includes('remember the colors') || cv2Text.includes('remember the emojis') || cv2Text.includes('what word was repeated') || cv2Text.includes('unscramble') || cv2Text.includes('remember the number') || cv2Text.includes('click the buttons in correct order') || cv2Text.includes('babysitter') || cv2Text.includes('click the matching')) return 'work';
   if (cv2Text.includes('weekly')) return 'weekly';
   if (cv2Text.includes('daily')) return 'daily';
   if (cv2Text.includes('inventory')) return 'inventory';
@@ -174,11 +177,13 @@ function detectCommand(d) {
   if (embedText.includes('you searched') || embedText.includes('searched the')) return 'search';
   if (embedText.includes('you committed') || embedText.includes('went outside')) return 'crime';
   // Hunt / dig
-  if (embedText.includes('hunting') || embedText.includes('came back with') || embedText.includes('hunting rifle') || embedText.includes('dragon\'s fireball') || embedText.includes('dodge the')) return 'hunt';
-  if (embedText.includes('you dig') || embedText.includes('found a') && embedText.includes('digging') || embedText.includes('shovel')) return 'dig';
-  // Work
-  if (embedText.includes('work') && (embedText.includes('shift') || embedText.includes('mini-game') || embedText.includes('color') || embedText.includes('what color'))) return 'work';
+  if (embedText.includes('hunting') || embedText.includes('came back with') || embedText.includes('hunting rifle') || embedText.includes('dragon\'s fireball') || embedText.includes('dodge the') || embedText.includes('went hunting') || embedText.includes('hunt') && (embedText.includes('caught') || embedText.includes('brought back') || embedText.includes('attacked') || embedText.includes('nothing') || embedText.includes('laughed') || embedText.includes('escaped') || embedText.includes('fell asleep'))) return 'hunt';
+  if (embedText.includes('digging') || embedText.includes('you dig') || embedText.includes('found a') && embedText.includes('dig') || embedText.includes('shovel') || embedText.includes('found nothing while') || embedText.includes('you found') && !embedText.includes('search')) return 'dig';
+  // Work — match both minigame prompt AND completion
+  if (embedText.includes('work') && (embedText.includes('shift') || embedText.includes('mini-game') || embedText.includes('color') || embedText.includes('what color') || embedText.includes('babysitter') || embedText.includes('great work') || embedText.includes('for your shift'))) return 'work';
   if (embedText.includes('you were given') && embedText.includes('shift')) return 'work';
+  if (embedText.includes('working as') || embedText.includes('for your shift')) return 'work';
+  if (embedText.includes('remember words order') || embedText.includes('remember the colors') || embedText.includes('remember the emojis') || embedText.includes('what word was repeated') || embedText.includes('unscramble the word') || embedText.includes('remember the number') || embedText.includes('click the buttons in correct order') || embedText.includes('click the matching')) return 'work';
   // Postmemes
   if (embedText.includes('pick a meme') || embedText.includes('meme posting')) return 'postmemes';
   // Stream

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dankgrinder",
-  "version": "6.16.0",
+  "version": "6.19.0",
   "description": "Dank Memer automation engine — grind coins while you sleep",
   "bin": {
     "dankgrinder": "bin/dankgrinder.js"