dankgrinder 5.12.0 → 5.13.0

package/lib/commands/shop.js

@@ -16,7 +16,7 @@
 const {
   LOG, c, sleep, humanDelay, getFullText,
   getAllButtons, findSelectMenuOption,
-  logMsg, isHoldTight, isCV2, ensureCV2,
+  logMsg, isHoldTight, isCV2, ensureCV2, stripAnsi,
 } = require('./utils');
 const { LRUCache, Trie } = require('../structures');
 
@@ -61,6 +61,25 @@ for (const [item, searchTerm] of Object.entries(ITEM_SEARCH_TERM)) {
 // commands both detect "need shovel" within seconds of each other)
 const recentPurchases = new LRUCache(16);
 
+function isBuySuccessText(text) {
+  const lower = String(stripAnsi(text || '')).toLowerCase();
+  return lower.includes('success')
+    || lower.includes('successful purchase')
+    || lower.includes('bought')
+    || lower.includes('purchased')
+    || (lower.includes('you bought') && lower.includes('for'));
+}
+
+function isBuyFailText(text) {
+  const lower = String(stripAnsi(text || '')).toLowerCase();
+  return lower.includes('not enough')
+    || lower.includes("can't afford")
+    || lower.includes('insufficient')
+    || lower.includes('you need')
+    || lower.includes('missing item')
+    || lower.includes('missing items');
+}
+
 /**
  * Buy an item from the Dank Memer shop.
  *
@@ -171,14 +190,54 @@ async function buyItem({ channel, waitForDankMemer, itemName, quantity = 1, clie
   // Step 4: Click the Buy button → Modal with quantity input
   LOG.buy(`Clicking "${buyBtn.label}"...`);
   const btnId = buyBtn.customId || buyBtn.custom_id;
-  let modal;
+  let clickResult;
   try {
-    modal = await response.clickButton(btnId);
+    clickResult = await response.clickButton(btnId);
   } catch (e) {
     LOG.error(`[shop] Button click failed: ${e.message}`);
     return false;
   }
 
+  // Some shop buttons buy immediately (no quantity modal).
+  // If we received a message-like response, parse it directly.
+  if (clickResult && !clickResult.components?.[0]?.components?.[0]?.setValue) {
+    if (isCV2(clickResult)) await ensureCV2(clickResult);
+    const directText = getFullText(clickResult);
+    logMsg(clickResult, 'buy-direct-result');
+    if (isBuySuccessText(directText)) {
+      LOG.success(`${c.green}${c.bold}Purchased ${quantity}x ${itemName}!${c.reset}`);
+      recentPurchases.set(key, Date.now());
+      return true;
+    }
+    if (isBuyFailText(directText)) {
+      LOG.warn(`[shop] Direct buy failed for ${itemName}: ${directText.substring(0, 120)}`);
+      return false;
+    }
+
+    // Fallback: wait one follow-up message for purchase outcome text.
+    const follow = await waitForDankMemer(6000);
+    if (follow) {
+      if (isCV2(follow)) await ensureCV2(follow);
+      const fText = getFullText(follow);
+      logMsg(follow, 'buy-direct-followup');
+      if (isBuySuccessText(fText)) {
+        LOG.success(`${c.green}${c.bold}Purchased ${quantity}x ${itemName}!${c.reset}`);
+        recentPurchases.set(key, Date.now());
+        return true;
+      }
+      if (isBuyFailText(fText)) {
+        LOG.warn(`[shop] Buy failed for ${itemName}: ${fText.substring(0, 120)}`);
+        return false;
+      }
+    }
+
+    LOG.success(`Buy click sent for ${itemName} (no modal path)`);
+    recentPurchases.set(key, Date.now());
+    return true;
+  }
+
+  const modal = clickResult;
+
   if (!modal || !modal.components) {
     LOG.warn('[shop] No modal returned from button click');
     return false;
@@ -194,12 +253,12 @@ async function buyItem({ channel, waitForDankMemer, itemName, quantity = 1, clie
       const text = getFullText(result);
       logMsg(result, 'buy-result');
 
-      if (text.toLowerCase().includes('success') || text.toLowerCase().includes('bought') || text.toLowerCase().includes('purchased')) {
+      if (isBuySuccessText(text)) {
         LOG.success(`${c.green}${c.bold}Purchased ${quantity}x ${itemName}!${c.reset}`);
         recentPurchases.set(key, Date.now());
         return true;
       }
-      if (text.toLowerCase().includes('not enough') || text.toLowerCase().includes("can't afford") || text.toLowerCase().includes('insufficient')) {
+      if (isBuyFailText(text)) {
         LOG.warn(`Not enough coins to buy ${itemName}`);
         return false;
       }

package/lib/commands/stream.js

@@ -53,6 +53,14 @@ function isStreamManagerScreen(lowerText) {
     || lowerText.includes('go live');
 }
 
+function isActionResultText(lowerText) {
+  return lowerText.includes('you ran an ad')
+    || lowerText.includes('read chat')
+    || lowerText.includes('collect')
+    || lowerText.includes('donation')
+    || lowerText.includes('received');
+}
+
 async function selectRandomStreamOption(msg) {
   const menus = getAllSelectMenus(msg);
   if (menus.length === 0) return false;
@@ -195,13 +203,34 @@ async function runStream({ channel, waitForDankMemer, client }) {
       await humanDelay(120, 320);
       try {
         const clicked = await safeClickButton(response, action);
-        const updated = clicked || (await waitForDankMemer(6000)) || (await refetchMsg(channel, response.id));
+        let updated = clicked || (await waitForDankMemer(6000)) || (await refetchMsg(channel, response.id));
         if (updated) {
           response = updated;
           await hydrate(response);
           logMsg(response, 'stream-action');
           text = getFullText(response);
           lower = normalizeLower(stripAnsi(text));
+
+          // Action payouts may appear as a second follow-up message.
+          // Keep checking briefly so earnings are not missed.
+          let bestText = text;
+          let bestCoins = parseCoins(bestText);
+          for (let i = 0; i < 2; i++) {
+            const nextMsg = await waitForDankMemer(5000);
+            if (!nextMsg) break;
+            await hydrate(nextMsg);
+            logMsg(nextMsg, `stream-action-followup-${i}`);
+            const nextText = getFullText(nextMsg);
+            const nextLower = normalizeLower(stripAnsi(nextText));
+            const nextCoins = parseCoins(nextText);
+            if (nextCoins > bestCoins || (bestCoins === 0 && isActionResultText(nextLower))) {
+              bestText = nextText;
+              bestCoins = nextCoins;
+              response = nextMsg;
+            }
+          }
+          text = bestText;
+          lower = normalizeLower(stripAnsi(text));
         }
       } catch (e) {
         LOG.error(`[stream] Action click failed: ${e.message}`);

package/package.json

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