dankgrinder 4.9.5 → 4.9.8

package/lib/commands/inventory.js

@@ -194,15 +194,33 @@ async function runInventory({ channel, waitForDankMemer, client, accountId, redi
 
   while (page < total) {
     const buttons = getAllButtons(response);
-    const nextBtn = buttons.find(b => {
-      if (b.disabled) return false;
-      const id = (b.customId || '').toLowerCase();
-      const label = (b.label || '').toLowerCase();
-      const emoji = (b.emoji?.name || '').toLowerCase();
-      return id.includes('next') || id.includes('right') || label.includes('next')
-        || label === '▶' || label === '→' || emoji.includes('right') || emoji === '▶';
+    const enabled = buttons.filter(b => !b.disabled);
+    const expectedNextPage = page; // page is 1-based, paginator target indexes are usually 0-based
+
+    const parseTargetPage = (customId) => {
+      if (!customId) return null;
+      const m = String(customId).match(/:(\d+)(?:\.\d+)?$/);
+      return m ? parseInt(m[1], 10) : null;
+    };
+
+    let nextBtn = enabled.find((b) => {
+      const id = String(b.customId || '');
+      if (!/paginator-inventory-list/i.test(id)) return false;
+      if (!/setpage/i.test(id)) return false;
+      return parseTargetPage(id) === expectedNextPage;
     });
 
+    if (!nextBtn) {
+      nextBtn = enabled.find((b) => {
+        const id = (b.customId || '').toLowerCase();
+        const label = (b.label || '').toLowerCase();
+        const emoji = (b.emoji?.name || '').toLowerCase();
+        return (id.includes('paginator-inventory') && (id.includes('setpage') || id.includes('next')))
+          || label.includes('next') || label === '▶' || label === '→'
+          || emoji.includes('arrowright') || emoji.includes('doubleright') || emoji === '▶';
+      });
+    }
+
     if (!nextBtn) {
       LOG.debug(`[inv] No next button on page ${page}`);
       break;

package/lib/commands/trivia.js

@@ -131,10 +131,10 @@ async function runTrivia({ channel, waitForDankMemer, redis }) {
         return { result: `trivia → ${btn.label} → +⏣ ${coins.toLocaleString()}`, coins };
       }
       if (lower.includes('correct answer was') || lower.includes('nitwit') || lower.includes('wrong') || lower.includes('incorrect')) {
-        return { result: `trivia → ${btn.label} → ${c.red}wrong${c.reset}`, coins: 0 };
+        return { result: `trivia → ${btn.label} → wrong`, coins: 0 };
       }
       if (lower.includes('correct') || lower.includes('nice') || lower.includes('right')) {
-        return { result: `trivia → ${btn.label} → ${c.green}correct${c.reset}`, coins: 0 };
+        return { result: `trivia → ${btn.label} → correct`, coins: 0 };
       }
       return { result: `trivia → ${btn.label}`, coins: 0 };
     }

package/lib/grinder.js

@@ -300,10 +300,12 @@ async function fetchConfig(retries = 3, delayMs = 1500) {
 
 async function sendLog(accountName, command, response, status) {
   try {
+    const safeCommand = stripAnsi(String(command || '')).replace(/\s+/g, ' ').trim();
+    const safeResponse = stripAnsi(String(response || '')).replace(/\s+/g, ' ').trim();
     await fetch(`${API_URL}/api/grinder/log`, {
       method: 'POST',
       headers: { Authorization: `Bearer ${API_KEY}`, 'Content-Type': 'application/json' },
-      body: JSON.stringify({ account_name: accountName, command, response, status }),
+      body: JSON.stringify({ account_name: accountName, command: safeCommand, response: safeResponse, status }),
     });
   } catch { /* silent */ }
 }
@@ -321,10 +323,13 @@ async function reportEarnings(accountId, accountName, earned, spent, command) {
 
 async function reportCommandFeed(accountId, accountName, data) {
   try {
+    const normalized = { ...data };
+    if (typeof normalized.command === 'string') normalized.command = stripAnsi(normalized.command).replace(/\s+/g, ' ').trim();
+    if (typeof normalized.result === 'string') normalized.result = stripAnsi(normalized.result).replace(/\s+/g, ' ').trim();
     await fetch(`${API_URL}/api/grinder/command-feed`, {
       method: 'POST',
       headers: { Authorization: `Bearer ${API_KEY}`, 'Content-Type': 'application/json' },
-      body: JSON.stringify({ account_id: accountId, account_name: accountName, ...data }),
+      body: JSON.stringify({ account_id: accountId, account_name: accountName, ...normalized }),
     });
   } catch { /* silent */ }
 }
@@ -548,7 +553,7 @@ class AccountWorker {
   }
 
   setStatus(text) {
-    this.lastStatus = text;
+    this.lastStatus = stripAnsi(String(text || '')).replace(/\s+/g, ' ').trim();
     if (dashboardStarted) scheduleRender();
   }
 
@@ -827,6 +832,39 @@ class AccountWorker {
 
   async checkBalance() {
     const prefix = this.account.use_slash ? '/' : 'pls';
+    const sentAt = Date.now();
+
+    const looksLikeBalance = (t) => {
+      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 '';
+      if (isCV2(msg)) 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 < 4; attempt++) {
+        try {
+          const recent = await this.channel.messages.fetch({ limit: 8 });
+          const candidates = [...recent.values()].filter((m) =>
+            m?.author?.id === DANK_MEMER_ID && (m.createdTimestamp || 0) >= sentAt - 2500
+          );
+          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;
+    };
+
     await this.channel.send(`${prefix} bal`);
     let response = await this.waitForDankMemer(10000);
 
@@ -837,15 +875,35 @@ class AccountWorker {
     }
 
     if (response) {
-      if (isCV2(response)) await ensureCV2(response);
-      let text = stripAnsi(getFullText(response)).replace(/\s+/g, ' ').trim();
+      let text = await readBalanceText(response);
 
       // Dank Memer sometimes sends empty first payload then edits in the full card.
-      if (!text && response.id) {
+      if ((!text || !looksLikeBalance(text)) && response.id) {
         const edited = await this.waitForMessageUpdate(response.id, 5000);
         if (edited) {
-          if (isCV2(edited)) await ensureCV2(edited);
-          text = stripAnsi(getFullText(edited)).replace(/\s+/g, ' ').trim();
+          text = await readBalanceText(edited, true);
+          response = edited;
+        }
+      }
+
+      // 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;
+          }
+        }
+      }
+
+      // Final 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;
         }
       }
 
@@ -854,6 +912,11 @@ class AccountWorker {
         return;
       }
 
+      if (!looksLikeBalance(text)) {
+        this.log('warn', `Balance response did not look like balance card: "${text.substring(0, 140)}"`);
+        return;
+      }
+
       let wallet = 0;
       let bank = 0;
       let matched = '';
@@ -898,9 +961,9 @@ class AccountWorker {
         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}`);
+    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) {

package/package.json

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