dankgrinder 5.9.0 → 5.11.0

package/lib/commands/dig.js

@@ -42,7 +42,7 @@ async function runDig({ channel, waitForDankMemer, client }) {
   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)
+    || /(?: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

package/lib/commands/hunt.js

@@ -42,7 +42,7 @@ async function runHunt({ channel, waitForDankMemer, client }) {
   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)
+    || /(?: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

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

@@ -529,10 +529,16 @@ 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';

package/lib/commands/work.js

@@ -18,6 +18,7 @@
 const {
   LOG, c, getFullText, parseCoins, getAllButtons, safeClickButton,
   logMsg, isHoldTight, getHoldTightReason, sleep, humanDelay,
+  isCV2, ensureCV2, stripAnsi,
 } = require('./utils');
 
 const RE_MEMORY_BACKTICK_CHUNK = /`([^`]+)`/g;
@@ -26,6 +27,24 @@ const RE_WORK_COOLDOWN_TS = /<t:(\d+):R>/;
 const RE_WORK_COOLDOWN_MINUTES = /(\d+)\s*minute/i;
 const RE_WORK_COOLDOWN_HOURS = /(\d+)\s*hour/i;
 
+function normalizeLower(text) {
+  return String(text || '')
+    .normalize('NFKC')
+    .replace(/[’‘`´]/g, "'")
+    .replace(/\bdon'?t\b/gi, "don't")
+    .toLowerCase();
+}
+
+function isNoJobText(text) {
+  const t = normalizeLower(stripAnsi(text)).replace(/\s+/g, ' ').trim();
+  return t.includes("don't currently have a job")
+    || t.includes("don't have a job")
+    || t.includes('no job to work at')
+    || t.includes('you need a job')
+    || t.includes('/work list')
+    || (t.includes('work list') && t.includes('available jobs'));
+}
+
 // Job progression list (order matters — first is easiest to get)
 const JOBS = Object.freeze([
   'babysitter', 'dog walker', 'fast food worker', 'youtuber',
@@ -114,14 +133,15 @@ async function resignFromJob({ channel, waitForDankMemer }) {
 async function autoApplyForJob({ channel, waitForDankMemer }) {
   LOG.info('[work] No job! Applying for Babysitter...');
   await channel.send('pls work apply babysitter');
-  const response = await waitForDankMemer(8000);
+  const response = await waitForDankMemer(10000);
   if (!response) {
     LOG.warn('[work] No response to apply');
     return { applied: false };
   }
+  if (isCV2(response)) await ensureCV2(response);
   logMsg(response, 'work-apply');
   const text = getFullText(response);
-  const tl = text.toLowerCase();
+  const tl = normalizeLower(stripAnsi(text)).replace(/\s+/g, ' ').trim();
   if (tl.includes('congratulations') || tl.includes('now working')) {
     LOG.success('[work] Applied for Babysitter!');
     return { applied: true };
@@ -301,6 +321,8 @@ async function runWorkShift({ channel, waitForDankMemer }) {
     return { result: `hold tight (${reason || 'unknown'})`, coins: 0, holdTightReason: reason };
   }
 
+  if (isCV2(current)) await ensureCV2(current);
+
   logMsg(current, 'work');
   let text = getFullText(current);
 
@@ -314,11 +336,10 @@ async function runWorkShift({ channel, waitForDankMemer }) {
     return { result: `work cooldown (${Math.ceil(cooldownSec / 60)}m)`, coins: 0, nextCooldownSec: cooldownSec };
   }
 
-  const textLower = text.toLowerCase();
+  const textLower = normalizeLower(stripAnsi(text)).replace(/\s+/g, ' ').trim();
 
   // ── No job? Auto-apply ─────────────────────────────────────
-  if (textLower.includes("don't currently have a job") || textLower.includes('don\'t have a job') ||
-      textLower.includes('you need a job') || textLower.includes('work list')) {
+  if (isNoJobText(textLower)) {
     const applyResult = await autoApplyForJob({ channel, waitForDankMemer });
     if (!applyResult.applied) {
       return { result: 'no job (apply failed)', coins: 0, nextCooldownSec: applyResult.cooldownSec || 600 };
@@ -331,6 +352,7 @@ async function runWorkShift({ channel, waitForDankMemer }) {
     await channel.send('pls work shift');
     current = await waitForDankMemer(10000);
     if (!current) return { result: 'no response after apply', coins: 0 };
+    if (isCV2(current)) await ensureCV2(current);
     logMsg(current, 'work-after-apply');
     text = getFullText(current);
   }

package/package.json

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