all

src/bots/utils/handlerUtils.ts

@@ -52,24 +52,25 @@ export const messageReplyHandler = (
  * @param replyFunction Function that returns the message and options to send after answering callback
  * @returns A function that handles the callback with proper error handling
  */
-export const callbackReplyHandler = (handler: Function) => async (ctx: BotContext) => {
+export const callbackReplyHandler = (
+  replyFunction: (ctx: BotContext) => Promise<{message: string, options?: any}> | {message: string, options?: any}
+) => async (ctx: BotContext) => {
   try {
-    // Await the handler. The handler is now responsible for sending/editing messages.
-    await handler(ctx);
-    // Always answer the callback query to remove the loading state on the button
+    // Answer the callback query first
     await ctx.answerCbQuery();
+    
+    
+    // Execute the reply function to get message content and options
+    const result = await Promise.resolve(replyFunction(ctx));
+    
+    // Send the reply with the message and any provided options
+    return await ctx.reply(result.message, result.options);
   } catch (error: any) {
+    // Log the error
     logger.error(`Error in callback reply handler: ${error.message}`);
-    // Check if the error is due to message not being modified
-    if (error.response && error.response.error_code === 400 && error.response.description.includes('message is not modified')) {
-      // If the message is not modified, just answer the callback query and do nothing else.
-      // This prevents sending an error message when the user clicks the same sort option twice.
-      await ctx.answerCbQuery();
-    } else {
-      // For other errors, reply with a generic error message
-      await ctx.reply('An unexpected error occurred. Please try again.');
-      await ctx.answerCbQuery(); // Also answer in this case
-    }
+    
+    // Send a generic error message to the user
+    return ctx.reply("⚠️ حدث خطأ أثناء معالجة طلبك. الرجاء المحاولة مرة أخرى.");
   }
 };