dankgrinder 4.9.7 → 4.9.9

package/lib/commands/utils.js

@@ -395,7 +395,13 @@ function _extractCV2Buttons(components) {
 function isCV2(msg) {
   if (!msg) return false;
   if ((msg.flags?.bitfield & CV2_FLAG) !== 0) return true;
-  return msg.components?.length > 0 && msg.components.every(c => !c);
+  const components = Array.isArray(msg.components) ? msg.components : [];
+  if (components.length === 0) return false;
+  // Some gateways send placeholder/null components for CV2 while content is empty.
+  if (components.every(c => !c)) return true;
+  const hasText = (msg.content && msg.content.length > 0) || (msg.embeds && msg.embeds.length > 0);
+  if (!hasText) return true;
+  return components.some(c => c && (c.type || c.components || c.content || c.customId || c.label));
 }
 
 async function ensureCV2(msg, force = false) {

package/lib/grinder.js

@@ -573,7 +573,11 @@ class AccountWorker {
       function handler(msg) {
         if (msg.author.id === DANK_MEMER_ID && msg.channel.id === self.channel.id) {
           // If message has no content and no embeds, Dank Memer may populate via edit
-          const hasContent = (msg.content && msg.content.length > 0) || (msg.embeds && msg.embeds.length > 0) || (msg.components && msg.components.length > 0);
+          const hasComponentPayload = Array.isArray(msg.components)
+            && msg.components.some(c => c && (c.components || c.content || c.type || c.label || c.customId));
+          const hasContent = (msg.content && msg.content.length > 0)
+            || (msg.embeds && msg.embeds.length > 0)
+            || hasComponentPayload;
           if (!hasContent) {
             // Wait for the edit with actual content (up to 3s)
             const editTimer = setTimeout(() => { cleanup(); resolve(msg); }, 3000);
@@ -843,17 +847,22 @@ class AccountWorker {
 
     const readBalanceText = async (msg, forceCV2 = false) => {
       if (!msg) return '';
-      if (isCV2(msg)) await ensureCV2(msg, forceCV2);
+      const needsCv2 = forceCV2
+        || isCV2(msg)
+        || (Array.isArray(msg.components) && msg.components.length > 0
+          && (!msg.content || msg.content.length === 0)
+          && (!msg.embeds || msg.embeds.length === 0));
+      if (needsCv2) await ensureCV2(msg, forceCV2);
       return stripAnsi(getFullText(msg)).replace(/\s+/g, ' ').trim();
     };
 
     const findRecentBalanceMessage = async () => {
       if (!this.channel?.messages?.fetch) return null;
-      for (let attempt = 0; attempt < 4; attempt++) {
+      for (let attempt = 0; attempt < 6; attempt++) {
         try {
-          const recent = await this.channel.messages.fetch({ limit: 8 });
+          const recent = await this.channel.messages.fetch({ limit: 12 });
           const candidates = [...recent.values()].filter((m) =>
-            m?.author?.id === DANK_MEMER_ID && (m.createdTimestamp || 0) >= sentAt - 2500
+            m?.author?.id === DANK_MEMER_ID && (m.createdTimestamp || 0) >= sentAt - 10000
           );
           for (const m of candidates) {
             const t = await readBalanceText(m, true);
@@ -865,13 +874,17 @@ class AccountWorker {
       return null;
     };
 
-    await this.channel.send(`${prefix} bal`);
-    let response = await this.waitForDankMemer(10000);
+    if (this.account.use_slash && this.channel?.sendSlash) {
+      await this.channel.sendSlash(DANK_MEMER_ID, 'balance').catch(() => this.channel.send('/balance'));
+    } else {
+      await this.channel.send(`${prefix} bal`);
+    }
+    let response = await this.waitForDankMemer(12000);
 
-    // Fallback for slash setup: sometimes "/ bal" misses and only "/balance" works.
+    // Fallback for slash setup: try legacy prefix if no slash response.
     if (!response && this.account.use_slash) {
-      await this.channel.send('/balance');
-      response = await this.waitForDankMemer(10000);
+      await this.channel.send('pls bal');
+      response = await this.waitForDankMemer(12000);
     }
 
     if (response) {
@@ -888,7 +901,7 @@ class AccountWorker {
 
       // If we received a stale/irrelevant update, fetch same message fresh.
       if ((!text || !looksLikeBalance(text)) && response.id && this.channel?.messages?.fetch) {
-        const fetched = await this.channel.messages.fetch(response.id).catch(() => null);
+        const fetched = await Promise.resolve(this.channel.messages.fetch(response.id)).catch(() => null);
         if (fetched) {
           const fetchedText = await readBalanceText(fetched, true);
           if (fetchedText) {

package/package.json

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