enable reels, undo expansion for tw/ig/tiktok

fixed #61

Author: pugson

actions/expand-link.ts

@@ -13,6 +13,8 @@ import {
 import { trackEvent } from "../helpers/analytics";
 import { notifyAdmin } from "../helpers/notifier";
 import { getOGMetadata } from "../helpers/og-metadata";
+import { saveToCache, deleteFromCache } from "../helpers/cache";
+import { getButtonState } from "../helpers/button-states";
 
 type UserInfoType = {
   username: string | undefined;
@@ -177,127 +179,130 @@ export async function expandLink(
         );
       }
     } else {
-      botReply = await ctx.api.sendMessage(
-        chatId,
-        await expandedMessageTemplate(
-          ctx,
-          userInfo.username,
-          userInfo.userId,
-          userInfo.firstName,
-          userInfo.lastName,
-          messageText,
-          linkWithNoTrackers
-        ),
-        {
-          ...replyOptions,
-          // Use HTML parse mode if the user does not have a username,
-          // otherwise the bot will not be able to mention the user.
-          parse_mode: "HTML",
-          reply_markup: {
-            inline_keyboard: [
-              [
-                {
-                  text: "❌ Delete — 15s",
-                  callback_data: `destruct:${userInfo.userId}:${expansionType}`,
-                },
-                ...(linkWithNoTrackers.includes("fxtwitter")
-                  ? [
-                      {
-                        text: "🔗 Open on Twitter",
-                        url: link?.replace("fxtwitter", "twitter"),
-                      },
-                    ]
-                  : []),
-              ],
-            ],
-          },
-        }
+      // For all other platforms
+      const template = await expandedMessageTemplate(
+        ctx,
+        userInfo.username,
+        userInfo.userId,
+        userInfo.firstName,
+        userInfo.lastName,
+        messageText,
+        linkWithNoTrackers
       );
-    }
 
-    if (topicId) {
-      trackEvent(`expand.${expansionType}.inside-topic`);
-    }
+      // Add buttons based on platform
+      let platform: "twitter" | "instagram" | "tiktok" | null = null;
+      if (isInstagram(link)) platform = "instagram";
+      else if (isTikTok(link)) platform = "tiktok";
+      else if (isTweet(link)) platform = "twitter";
 
-    // Countdown the destruct timer under message
-    if (botReply) {
-      async function editDestructTimer(time: number) {
-        try {
-          await ctx.api
-            .editMessageReplyMarkup(botReply.chat.id, botReply.message_id, {
-              reply_markup: {
-                inline_keyboard: [
-                  [
-                    {
-                      text: `❌ Delete — ${time}s`,
-                      callback_data: `destruct:${userInfo.userId}:${expansionType}`,
-                    },
-                    ...(linkWithNoTrackers.includes("fxtwitter")
-                      ? [
-                          {
-                            text: "🔗 Open on Twitter",
-                            url: link?.replace("fxtwitter", "twitter"),
-                          },
-                        ]
-                      : []),
-                  ],
-                ],
-              },
-            })
-            .catch(() => {
-              console.error(
-                "[Error] [expand-link.ts:113] Could not edit destruct timer. Message was probably deleted."
-              );
-              return;
-            });
-        } catch (error) {
-          // console.error("[Error] Could not edit destruct timer. Message was probably deleted.");
-          // @ts-ignore
-          // console.error(error.message);
-          return;
-        }
-      }
+      const replyMarkup = platform
+        ? {
+            inline_keyboard: getButtonState(platform, 15, userInfo.userId || ctx.from?.id || 0, link).buttons,
+          }
+        : undefined;
 
-      // edit timer to 10s
-      setTimeout(async () => {
-        editDestructTimer(10);
-      }, 5000);
+      try {
+        botReply = await ctx.api.sendMessage(chatId, template, {
+          parse_mode: "HTML",
+          ...replyOptions,
+          ...(replyMarkup ? { reply_markup: replyMarkup } : {}),
+        });
 
-      // edit timer to 5s
-      setTimeout(async () => {
-        editDestructTimer(5);
-      }, 10000);
+        // For supported platforms, start the button progression
+        if (platform && botReply) {
+          const identifier = `${chatId}:${botReply.message_id}`;
+          await saveToCache(identifier, ctx);
 
-      // clear buttons after 15s
-      setTimeout(async () => {
-        try {
-          await ctx.api
-            .editMessageReplyMarkup(botReply.chat.id, botReply.message_id, {
-              reply_markup: {
-                inline_keyboard: [
-                  [
-                    ...(linkWithNoTrackers.includes("fxtwitter")
-                      ? [
-                          {
-                            text: "🔗 Open on Twitter",
-                            url: link?.replace("fxtwitter", "twitter"),
-                          },
-                        ]
-                      : []),
-                  ],
-                ],
-              },
-            })
-            .catch(() => {
-              console.error(
-                "[Error] [expand-link.ts:144] Could not clear destruct timer. Message was probably deleted."
-              );
-            });
-        } catch (error) {
-          // console.error("[Error] Could not clear destruct timer. Message was probably deleted.");
-          return;
+          // Keep track of timeouts so we can clear them if needed
+          const timeouts: NodeJS.Timeout[] = [];
+
+          // Start the button progression
+          const updateButtons = async (timeRemaining: number) => {
+            try {
+              const state = getButtonState(platform!, timeRemaining, userInfo.userId || ctx.from?.id || 0, link);
+              await ctx.api.editMessageReplyMarkup(chatId, botReply!.message_id, {
+                reply_markup: { inline_keyboard: state.buttons },
+              });
+
+              // Schedule next update if there is one
+              if (state.nextTimeout !== null) {
+                const timeout = setTimeout(() => {
+                  try {
+                    updateButtons(state.nextTimeout!).catch(() => {
+                      // Clear all timeouts if we can't update buttons
+                      timeouts.forEach((t) => clearTimeout(t));
+                    });
+                  } catch (error) {
+                    // Clear all timeouts if we can't update buttons
+                    timeouts.forEach((t) => clearTimeout(t));
+                  }
+                }, 5000);
+                timeouts.push(timeout);
+              }
+            } catch (error) {
+              // Message not found errors are expected if message was deleted
+              if (error instanceof Error && error.message.includes("message to edit not found")) {
+                console.warn("[Warning] Message has probably been already deleted.");
+                // Clear all timeouts since we can't update this message anymore
+                timeouts.forEach((t) => clearTimeout(t));
+              } else {
+                console.error("[Error] Failed to update buttons:", error);
+              }
+            }
+          };
+
+          // Start the progression
+          try {
+            const initialTimeout = setTimeout(() => {
+              updateButtons(10).catch(() => {
+                // Clear all timeouts if initial update fails
+                timeouts.forEach((t) => clearTimeout(t));
+              });
+            }, 5000);
+            timeouts.push(initialTimeout);
+
+            // Remove from cache and set final state after 35 seconds
+            const finalTimeout = setTimeout(() => {
+              try {
+                deleteFromCache(identifier);
+                // Set final state with just the open button
+                const finalState = getButtonState(platform!, null, userInfo.userId || ctx.from?.id || 0, link);
+                ctx.api
+                  .editMessageReplyMarkup(chatId, botReply!.message_id, {
+                    reply_markup: { inline_keyboard: finalState.buttons },
+                  })
+                  .catch((error) => {
+                    if (error.message.includes("message to edit not found")) {
+                      console.warn("[Warning] Message has probably been already deleted.");
+                    } else {
+                      console.error("[Error] Failed to set final button state:", error);
+                    }
+                  });
+              } catch (error) {
+                // Message not found errors are expected if message was deleted
+                if (error instanceof Error && error.message.includes("message to edit not found")) {
+                  console.warn("[Warning] Message has probably been already deleted.");
+                } else {
+                  console.error("[Error] Failed to set final button state:", error);
+                }
+              }
+            }, 35000);
+            timeouts.push(finalTimeout);
+          } catch (error) {
+            console.error("[Error] Failed to start button progression:", error);
+            // Clear any timeouts that might have been set
+            timeouts.forEach((t) => clearTimeout(t));
+          }
         }
-      }, 15000);
+      } catch (error) {
+        console.error("[Error] Could not reply with an expanded link.", error);
+        throw error;
+      }
+    }
+
+    if (topicId) {
+      trackEvent(`expand.${expansionType}.inside-topic`);
     }
   } catch (error) {
     console.error("[Error: expand-link.ts] Could not reply with an expanded link.");

callbacks/destruct-expanded-link.ts

@@ -1,9 +1,10 @@
 import { Context } from "grammy";
 import { deleteMessage } from "../actions/delete-message";
 import { trackEvent } from "../helpers/analytics";
+import { getButtonState } from "../helpers/button-states";
 
 /**
- * Handle responses to expanded link’s "❌ Delete" button
+ * Handle responses to expanded link's "❌ Delete" button
  * @param ctx Telegram context
  */
 export async function handleExpandedLinkDestruction(ctx: Context) {
@@ -18,7 +19,7 @@ export async function handleExpandedLinkDestruction(ctx: Context) {
   if (data.includes("destruct:")) {
     const destructData = data.split(":");
     const originalAuthorId = Number(destructData[1]);
-    const expansionType = destructData[2];
+    const timeRemaining = Number(destructData[2]);
     const answerGiverId = answer?.from?.id;
 
     if (answerGiverId !== originalAuthorId) {
@@ -32,7 +33,7 @@ export async function handleExpandedLinkDestruction(ctx: Context) {
           return;
         });
 
-      trackEvent(`destruct.${expansionType}.not-author-alert`);
+      trackEvent(`destruct.${timeRemaining}.not-author-alert`);
       return;
     }
 
@@ -41,7 +42,7 @@ export async function handleExpandedLinkDestruction(ctx: Context) {
       console.error(`[Error] Cannot answer callback query.`);
       return;
     });
-    trackEvent(`destruct.${expansionType}.author`);
+    trackEvent(`destruct.${timeRemaining}.author`);
     return;
   }
 }

callbacks/index.ts

@@ -2,11 +2,12 @@ import { Context } from "grammy";
 import { bot } from "..";
 import { getMemberCount } from "../actions/get-member-count";
 import { handleManualExpand } from "./manual-expand";
+import { handleExpandedLinkDestruction } from "./destruct-expanded-link";
 import { handleAutoexpandSettings } from "./settings-autoexpand";
+import { handleLockSettings } from "./settings-lock";
 import { handleChangelogSettings } from "./settings-changelog";
 import { handlePermissionsSettings } from "./settings-permissions";
-import { handleLockSettings } from "./settings-lock";
-import { handleExpandedLinkDestruction } from "./destruct-expanded-link";
+import { handleUndo } from "./undo";
 import { isBanned } from "../helpers/banned";
 
 // Multiple bot.on("callback_query") functions cannot run in parallel.
@@ -15,18 +16,50 @@ import { isBanned } from "../helpers/banned";
 // that are specific to the callback_query data to keep it more clean.
 bot.on("callback_query", async (ctx: Context) => {
   const chatId = ctx.update?.callback_query?.message?.chat.id;
+  const data = ctx.update?.callback_query?.data;
 
-  if (!chatId) return;
+  if (!chatId || !data) return;
   if (isBanned(chatId)) return;
 
-  // Handle specific callbacks / button presses
-  handleManualExpand(ctx);
-  handleExpandedLinkDestruction(ctx);
-  handleAutoexpandSettings(ctx);
-  handleChangelogSettings(ctx);
-  handlePermissionsSettings(ctx);
-  handleLockSettings(ctx);
-
   // Save chat member count to database
   getMemberCount(chatId);
+
+  // Handle expand callbacks
+  if (data.includes("expand:")) {
+    await handleManualExpand(ctx);
+    return;
+  }
+
+  // Handle destruct callbacks
+  if (data.includes("destruct:")) {
+    await handleExpandedLinkDestruction(ctx);
+    return;
+  }
+
+  // Handle undo callbacks
+  if (data === "undo") {
+    await handleUndo(ctx);
+    return;
+  }
+
+  // Handle settings callbacks
+  if (data.includes("settings:autoexpand")) {
+    await handleAutoexpandSettings(ctx);
+    return;
+  }
+
+  if (data.includes("settings:lock")) {
+    await handleLockSettings(ctx);
+    return;
+  }
+
+  if (data.includes("settings:changelog")) {
+    await handleChangelogSettings(ctx);
+    return;
+  }
+
+  if (data.includes("settings:permissions")) {
+    await handlePermissionsSettings(ctx);
+    return;
+  }
 });