dankgrinder 5.3.0 → 5.10.0

package/lib/commands/dig.js

@@ -5,6 +5,7 @@
 
 const {
   LOG, c, getFullText, parseCoins, logMsg, isHoldTight, getHoldTightReason, sleep, needsItem,
+  isCV2, ensureCV2, stripAnsi,
 } = require('./utils');
 const { buyItem } = require('./shop');
 
@@ -33,13 +34,19 @@ async function runDig({ channel, waitForDankMemer, client }) {
     return { result: `hold tight (${reason || 'unknown'})`, coins: 0, holdTightReason: reason };
   }
 
+  if (isCV2(response)) await ensureCV2(response);
   logMsg(response, 'dig');
   const text = getFullText(response);
-  const textLower = text.toLowerCase();
+  const cleanText = stripAnsi(text).replace(/\s+/g, ' ').trim();
+  const textLower = cleanText.toLowerCase();
+  const missing = needsItem(cleanText);
+
+  const shovelMissing = missing === 'shovel'
+    || /(?:don['’]?t have|do not have|need|needs|requires?|missing|must have|you need|lack)\s+(?:a\s+)?shovel/.test(textLower)
+    || (textLower.includes('following items') && textLower.includes('shovel'));
 
   // Check if we need a shovel
-  if (textLower.includes("don't have") && textLower.includes('shovel') ||
-      textLower.includes('need') && textLower.includes('shovel')) {
+  if (shovelMissing) {
     LOG.warn('[dig] No shovel! Attempting to buy...');
 
     const bought = await buyItem({
@@ -57,6 +64,7 @@ async function runDig({ channel, waitForDankMemer, client }) {
       await channel.send('pls dig');
       const r2 = await waitForDankMemer(10000);
       if (r2) {
+        if (isCV2(r2)) await ensureCV2(r2);
         logMsg(r2, 'dig-retry');
         const t2 = getFullText(r2);
         const coins = parseCoins(t2);
@@ -64,19 +72,19 @@ async function runDig({ channel, waitForDankMemer, client }) {
           LOG.coin(`[dig] ${c.green}+⏣ ${coins.toLocaleString()}${c.reset}`);
           return { result: `dig → +⏣ ${coins.toLocaleString()}`, coins };
         }
-        return { result: t2.substring(0, 60), coins: 0 };
+        return { result: stripAnsi(t2).replace(/\s+/g, ' ').trim().substring(0, 60), coins: 0 };
       }
     }
     return { result: 'need shovel (buy failed)', coins: 0 };
   }
 
-  const coins = parseCoins(text);
+  const coins = parseCoins(cleanText);
   if (coins > 0) {
     LOG.coin(`[dig] ${c.green}+⏣ ${coins.toLocaleString()}${c.reset}`);
     return { result: `dig → +⏣ ${coins.toLocaleString()}`, coins };
   }
 
-  return { result: text.substring(0, 60) || 'done', coins: 0 };
+  return { result: cleanText.substring(0, 60) || 'done', coins: 0 };
 }
 
 module.exports = { runDig };

package/lib/commands/hunt.js

@@ -5,6 +5,7 @@
 
 const {
   LOG, c, getFullText, parseCoins, logMsg, isHoldTight, getHoldTightReason, sleep, needsItem,
+  isCV2, ensureCV2, stripAnsi,
 } = require('./utils');
 const { buyItem } = require('./shop');
 
@@ -33,53 +34,59 @@ async function runHunt({ channel, waitForDankMemer, client }) {
     return { result: `hold tight (${reason || 'unknown'})`, coins: 0, needsRifle: false, holdTightReason: reason };
   }
 
+  if (isCV2(response)) await ensureCV2(response);
   logMsg(response, 'hunt');
   const text = getFullText(response);
-  const textLower = text.toLowerCase();
+  const cleanText = stripAnsi(text).replace(/\s+/g, ' ').trim();
+  const textLower = cleanText.toLowerCase();
+  const missing = needsItem(cleanText);
+
+  const rifleMissing = missing === 'hunting rifle'
+    || /(?:don['’]?t have|do not have|need|needs|requires?|missing|must have|you need|lack)\s+(?:a\s+)?(?:hunting\s+)?rifle/.test(textLower)
+    || ((textLower.includes('following items') || textLower.includes('missing items')) && textLower.includes('rifle'));
 
   // Check if we need a rifle
-  if (textLower.includes("don't have") || textLower.includes('need a') || textLower.includes('hunting rifle')) {
-    if (textLower.includes('rifle') || textLower.includes('hunt')) {
-      LOG.warn('[hunt] No rifle! Attempting to buy...');
+  if (rifleMissing) {
+    LOG.warn('[hunt] No rifle! Attempting to buy...');
 
-      const bought = await buyItem({
-        channel, waitForDankMemer, client,
-        itemName: 'Hunting Rifle',
-        quantity: 1,
-      });
+    const bought = await buyItem({
+      channel, waitForDankMemer, client,
+      itemName: 'Hunting Rifle',
+      quantity: 1,
+    });
 
-      if (bought) {
-        LOG.success('[hunt] Rifle purchased! Re-running hunt...');
-        // Drain stale shop messages
-        while (await waitForDankMemer(1500)) { /* drain */ }
-        await sleep(1000);
+    if (bought) {
+      LOG.success('[hunt] Rifle purchased! Re-running hunt...');
+      // Drain stale shop messages
+      while (await waitForDankMemer(1500)) { /* drain */ }
+      await sleep(1000);
 
-        await channel.send('pls hunt');
-        const r2 = await waitForDankMemer(10000);
-        if (r2) {
-          logMsg(r2, 'hunt-retry');
-          const t2 = getFullText(r2);
-          const coins = parseCoins(t2);
-          if (coins > 0) {
-            LOG.coin(`[hunt] ${c.green}+⏣ ${coins.toLocaleString()}${c.reset}`);
-            return { result: `hunt → +⏣ ${coins.toLocaleString()}`, coins, needsRifle: false };
-          }
-          return { result: t2.substring(0, 60), coins: 0, needsRifle: false };
+      await channel.send('pls hunt');
+      const r2 = await waitForDankMemer(10000);
+      if (r2) {
+        if (isCV2(r2)) await ensureCV2(r2);
+        logMsg(r2, 'hunt-retry');
+        const t2 = getFullText(r2);
+        const c2 = parseCoins(t2);
+        if (c2 > 0) {
+          LOG.coin(`[hunt] ${c.green}+⏣ ${c2.toLocaleString()}${c.reset}`);
+          return { result: `hunt → +⏣ ${c2.toLocaleString()}`, coins: c2, needsRifle: false };
         }
-        return { result: 'no response after rifle buy', coins: 0, needsRifle: false };
+        return { result: stripAnsi(t2).replace(/\s+/g, ' ').trim().substring(0, 60), coins: 0, needsRifle: false };
       }
-
-      return { result: 'need rifle (buy failed)', coins: 0, needsRifle: true };
+      return { result: 'no response after rifle buy', coins: 0, needsRifle: false };
     }
+
+    return { result: 'need rifle (buy failed)', coins: 0, needsRifle: true };
   }
 
-  const coins = parseCoins(text);
+  const coins = parseCoins(cleanText);
   if (coins > 0) {
     LOG.coin(`[hunt] ${c.green}+⏣ ${coins.toLocaleString()}${c.reset}`);
     return { result: `hunt → +⏣ ${coins.toLocaleString()}`, coins, needsRifle: false };
   }
 
-  return { result: text.substring(0, 60) || 'done', coins: 0, needsRifle: false };
+  return { result: cleanText.substring(0, 60) || 'done', coins: 0, needsRifle: false };
 }
 
 module.exports = { runHunt };

package/lib/commands/shop.js

@@ -16,7 +16,7 @@
 const {
   LOG, c, sleep, humanDelay, getFullText,
   getAllButtons, findSelectMenuOption,
-  logMsg, isHoldTight,
+  logMsg, isHoldTight, isCV2, ensureCV2,
 } = require('./utils');
 const { LRUCache, Trie } = require('../structures');
 
@@ -100,6 +100,8 @@ async function buyItem({ channel, waitForDankMemer, itemName, quantity = 1, clie
     return false;
   }
 
+  if (isCV2(response)) await ensureCV2(response);
+
   logMsg(response, 'shop');
 
   // Step 2: Switch shop tab if needed (e.g. Fishing Shop for fishing pole)
@@ -129,6 +131,7 @@ async function buyItem({ channel, waitForDankMemer, itemName, quantity = 1, clie
         );
         if (result) {
           response = result;
+          if (isCV2(response)) await ensureCV2(response);
           LOG.success(`Switched to ${targetTab}`);
         }
         await sleep(300);
@@ -141,9 +144,14 @@ async function buyItem({ channel, waitForDankMemer, itemName, quantity = 1, clie
 
   // Step 3: Find the Buy button for our item
   const allBtns = getAllButtons(response);
+  const normalizedSearch = String(searchTerm || '').toLowerCase().replace(/\s+/g, '');
+  const normalizedKey = String(key || '').toLowerCase().replace(/\s+/g, '');
   const buyBtn = allBtns.find(b => {
-    if (!b.label) return false;
-    return b.label.toLowerCase().includes(searchTerm);
+    const label = String(b.label || '').toLowerCase();
+    const id = String(b.customId || b.custom_id || '').toLowerCase().replace(/\s+/g, '');
+    return label.includes(searchTerm)
+      || (normalizedSearch && id.includes(normalizedSearch))
+      || (normalizedKey && id.includes(normalizedKey));
   });
 
   if (!buyBtn) {

package/lib/commands/utils.js

@@ -512,7 +512,7 @@ async function clickCV2Button(msg, customId) {
 // This is the same algorithm used by `fgrep` for multi-pattern search.
 const itemDetector = new AhoCorasick();
 const ITEM_PATTERN_MAP = [
-  { item: 'shovel',           patterns: ["don't have a shovel", 'need a shovel', 'you need a shovel'] },
+  { item: 'shovel',           patterns: ["don't have a shovel", "don't own a shovel", 'need a shovel', 'you need a shovel', 'requires a shovel', 'missing shovel'] },
   { item: 'fishing pole',     patterns: ["don't have a fishing", 'need a fishing', 'you need a fishing pole'] },
   { item: 'hunting rifle',    patterns: ["don't have a hunting rifle", 'need a hunting rifle', 'you need a rifle'] },
   { item: 'adventure ticket', patterns: ["don't have a ticket", "don't have an adventure", 'need a ticket', 'need an adventure ticket'] },
@@ -523,14 +523,26 @@ for (const { item, patterns } of ITEM_PATTERN_MAP) {
   for (const p of patterns) itemDetector.addPattern(p, item);
 }
 itemDetector.addPattern('need following items', '__multi__');
+itemDetector.addPattern('need the following items', '__multi__');
+itemDetector.addPattern('you need the following items', '__multi__');
 itemDetector.addPattern('missing items', '__multi__');
 itemDetector.build();
 
 function needsItem(text) {
-  const match = itemDetector.hasAny(text);
+  const normalized = String(text || '')
+    .toLowerCase()
+    .normalize('NFKC')
+    .replace(/[’‘`´]/g, "'")
+    .replace(/\bdon'?t\b/g, "don't");
+
+  const match = itemDetector.hasAny(normalized);
   if (!match) return null;
   if (match === '__multi__') {
-    const lower = text.toLowerCase();
+    const lower = normalized;
+    if (lower.includes('shovel')) return 'shovel';
+    if (lower.includes('fishing pole') || lower.includes('fishing')) return 'fishing pole';
+    if (lower.includes('hunting rifle') || lower.includes('rifle')) return 'hunting rifle';
+    if (lower.includes('adventure ticket') || lower.includes('ticket')) return 'adventure ticket';
     if (lower.includes('keyboard')) return 'keyboard';
     if (lower.includes('mouse')) return 'mouse';
     return null;

package/lib/grinder.js

@@ -2199,11 +2199,12 @@ class AccountWorker {
     return new Promise((resolve) => {
       this.client.on('ready', async () => {
         this.username = this.client.user.tag || this.username;
+        this.avatarUrl = this.client.user.displayAvatarURL?.({ format: 'png', dynamic: true, size: 128 }) || null;
         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, discord_username: this.username }),
+            body: JSON.stringify({ account_id: this.account.id, discord_username: this.username, avatar_url: this.avatarUrl }),
           });
         } catch { /* silent */ }
 

package/package.json

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