dankgrinder 5.14.0 → 5.19.0

package/lib/commands/utils.js

@@ -249,6 +249,17 @@ function flattenComponents(components) {
           _accessoryOf: item,
         });
       }
+      if (acc.type === 3 || acc.type === 'SELECT_MENU' || acc.type === 'STRING_SELECT') {
+        flat.push({
+          type: 'STRING_SELECT',
+          customId: acc.custom_id || acc.customId,
+          options: acc.options || [],
+          disabled: acc.disabled || false,
+          placeholder: acc.placeholder,
+          data: acc,
+          _accessoryOf: item,
+        });
+      }
     }
   }
   return flat;
@@ -273,7 +284,7 @@ function findSelectMenuOption(msg, label) {
   const menus = getAllSelectMenus(msg);
   for (const comp of menus) {
     const opt = (comp.options || []).find(o => o.label?.toLowerCase().includes(label.toLowerCase()));
-    if (opt) return { menuCustomId: comp.customId, option: opt, component: comp };
+    if (opt) return { menuCustomId: comp.customId || comp.custom_id, option: opt, component: comp };
   }
   return null;
 }
@@ -300,7 +311,8 @@ async function safeClickButton(msg, button) {
   // CV2 fallback: send interaction via raw HTTP, then wait for the message
   // to update so we can return the updated message to the caller.
   if (id) {
-    await clickCV2Button(msg, id);
+    const interactionAck = await clickCV2Button(msg, id);
+    if (interactionAck) msg._lastInteractionAck = interactionAck;
     // Wait for Dank Memer to process the interaction and update the message
     const updatedMsg = await new Promise((resolve) => {
       const timeout = setTimeout(() => {
@@ -429,13 +441,15 @@ function isCV2(msg) {
 
 async function ensureCV2(msg, force = false) {
   if (!msg) return msg;
-  if (!force && msg._cv2) return msg;
+  const msgEditedTs = msg.editedTimestamp || msg.editedAt?.getTime?.() || null;
+  if (!force && msg._cv2 && msg._cv2EditedTs === msgEditedTs) return msg;
   if (!isCV2(msg)) return msg;
   try {
     if (force) {
       delete msg._cv2;
       delete msg._cv2text;
       delete msg._cv2buttons;
+      delete msg._cv2EditedTs;
       cv2Cache.delete(msg.id);
     }
     const token = msg.client?.token;
@@ -445,10 +459,17 @@ async function ensureCV2(msg, force = false) {
     // LRU cache hit — O(1) lookup avoids redundant HTTP fetches
     const cached = cv2Cache.get(msg.id);
     if (cached && !force) {
-      msg._cv2 = cached;
-      msg._cv2text = _extractCV2Text(cached).trim();
-      msg._cv2buttons = _extractCV2Buttons(cached);
-      return msg;
+      const cachedComponents = Array.isArray(cached) ? cached : cached.components;
+      const cachedEditedTs = Array.isArray(cached) ? null : (cached.editedTimestamp || null);
+
+      // If message has been edited since cache snapshot, ignore stale cache.
+      if (!msgEditedTs || cachedEditedTs === msgEditedTs) {
+        msg._cv2 = cachedComponents;
+        msg._cv2text = _extractCV2Text(cachedComponents).trim();
+        msg._cv2buttons = _extractCV2Buttons(cachedComponents);
+        msg._cv2EditedTs = cachedEditedTs;
+        return msg;
+      }
     }
 
     let raw = null;
@@ -470,10 +491,11 @@ async function ensureCV2(msg, force = false) {
     }
 
     if (raw?.components) {
-      cv2Cache.set(msg.id, raw.components);
+      cv2Cache.set(msg.id, { components: raw.components, editedTimestamp: msgEditedTs });
       msg._cv2 = raw.components;
       msg._cv2text = _extractCV2Text(raw.components).trim();
       msg._cv2buttons = _extractCV2Buttons(raw.components);
+      msg._cv2EditedTs = msgEditedTs;
     }
   } catch (e) { LOG.debug(`[cv2] fetch error: ${e.message}`); }
   return msg;
@@ -502,7 +524,73 @@ async function clickCV2Button(msg, customId) {
     Authorization: token, 'Content-Type': 'application/json',
   }, payload);
   if (resp.status >= 400) throw new Error(`CV2 click ${resp.status}: ${resp.body.substring(0, 200)}`);
-  return null;
+
+  let parsed = null;
+  try {
+    parsed = resp.body ? JSON.parse(resp.body) : null;
+  } catch {
+    parsed = null;
+  }
+
+  const data = parsed?.data || null;
+  if (!data && !parsed) return null;
+
+  return {
+    interactionStatus: resp.status,
+    interactionType: parsed?.type ?? null,
+    flags: data?.flags ?? parsed?.flags ?? 0,
+    content: data?.content ?? parsed?.content ?? '',
+    embeds: data?.embeds ?? parsed?.embeds ?? [],
+    components: data?.components ?? parsed?.components ?? [],
+    raw: parsed || resp.body,
+  };
+}
+
+async function clickCV2SelectMenu(msg, customId, values = []) {
+  const token = msg.client?.token;
+  const chId = msg.channelId || msg.channel?.id;
+  const gId = msg.guildId || msg.guild?.id;
+  if (!token) throw new Error('No token for CV2 select');
+  const sessionId = msg.client?.ws?.shards?.first?.()?.sessionId;
+  const nonce = `${BigInt(Date.now() - 1420070400000) << 22n}`;
+  const payloadObj = {
+    type: 3,
+    application_id: String(msg.applicationId || DANK_MEMER_ID),
+    nonce,
+    channel_id: String(chId),
+    message_id: String(msg.id),
+    data: {
+      component_type: 3,
+      custom_id: customId,
+      values: Array.isArray(values) ? values.map(v => String(v)) : [],
+    },
+  };
+  if (gId) payloadObj.guild_id = String(gId);
+  if (sessionId) payloadObj.session_id = sessionId;
+
+  const resp = await _httpPost('https://discord.com/api/v9/interactions', {
+    Authorization: token, 'Content-Type': 'application/json',
+  }, JSON.stringify(payloadObj));
+  if (resp.status >= 400) throw new Error(`CV2 select ${resp.status}: ${resp.body.substring(0, 200)}`);
+
+  let parsed = null;
+  try {
+    parsed = resp.body ? JSON.parse(resp.body) : null;
+  } catch {
+    parsed = null;
+  }
+
+  const data = parsed?.data || null;
+  if (!data && !parsed) return null;
+  return {
+    interactionStatus: resp.status,
+    interactionType: parsed?.type ?? null,
+    flags: data?.flags ?? parsed?.flags ?? 0,
+    content: data?.content ?? parsed?.content ?? '',
+    embeds: data?.embeds ?? parsed?.embeds ?? [],
+    components: data?.components ?? parsed?.components ?? [],
+    raw: parsed || resp.body,
+  };
 }
 
 // ── Item Detection (Aho-Corasick Automaton) ──────────────────
@@ -575,6 +663,7 @@ module.exports = {
   isCV2,
   ensureCV2,
   clickCV2Button,
+  clickCV2SelectMenu,
   // Shared structures and optimized constants
   strings,
   cv2Cache,

package/lib/grinder.js

@@ -1353,6 +1353,7 @@ class AccountWorker {
         case 'search':      cmdResult = await commands.runSearch(cmdOpts); break;
         case 'crime':       cmdResult = await commands.runCrime(cmdOpts); break;
         case 'hl':          cmdResult = await commands.runHighLow(cmdOpts); break;
+  case 'farm':        cmdResult = await commands.runFarm(cmdOpts); break;
         case 'pm':          cmdResult = await commands.runPostMemes(cmdOpts); break;
         case 'hunt':        cmdResult = await commands.runHunt(cmdOpts); break;
         case 'dig':         cmdResult = await commands.runDig(cmdOpts); break;

package/package.json

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