dankgrinder 5.10.0 → 5.11.0

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.10.0",
+  "version": "5.11.0",
   "description": "Dank Memer automation engine — grind coins while you sleep",
   "bin": {
     "dankgrinder": "bin/dankgrinder.js"