Refactor message handling in generate_response_and_reply to improve f…

…ollow-up processing and queue management
Najmul190 · Feb 24, 2025 · b6cf392 · b6cf392
1 parent f77c29e
commit b6cf392
Showing 1 changed file with 30 additions and 20 deletions.
diff --git a/main.py b/main.py
@@ -305,30 +305,39 @@ async def generate_response_and_reply(message, prompt, history, image_url=None):
                     channel_id = message.channel.id
                     batch_start_time = time.time()
 
-                    while time.time() - batch_start_time <= bot.batch_wait_time:
-                        try:
+                    try:
 
-                            def check(m):
-                                return (
-                                    m.author.id == message.author.id
-                                    and m.channel.id == message.channel.id
+                        def check(m):
+                            return (
+                                m.author.id == message.author.id
+                                and m.channel.id == message.channel.id
+                                and not m.content.startswith(PREFIX)
+                            )
+
+                        while time.time() - batch_start_time <= bot.batch_wait_time:
+                            try:
+                                follow_up = await bot.wait_for(
+                                    "message",
+                                    timeout=bot.batch_wait_time
+                                    - (time.time() - batch_start_time),
+                                    check=check,
                                 )
 
-                            follow_up = await bot.wait_for(
-                                "message",
-                                timeout=bot.batch_wait_time
-                                - (time.time() - batch_start_time),
-                                check=check,
-                            )
+                                if follow_up.content.startswith(PREFIX):
+                                    await bot.process_commands(follow_up)
+                                    continue
 
-                            if channel_id not in bot.message_queues:
-                                bot.message_queues[channel_id] = deque()
-                                bot.processing_locks[channel_id] = Lock()
+                                if channel_id not in bot.message_queues:
+                                    bot.message_queues[channel_id] = deque()
+                                    bot.processing_locks[channel_id] = Lock()
 
-                            bot.message_queues[channel_id].append(follow_up)
+                                bot.message_queues[channel_id].append(follow_up)
 
-                        except asyncio.TimeoutError:
-                            break
+                            except asyncio.TimeoutError:
+                                break
+
+                    except asyncio.TimeoutError:
+                        break
 
                     if (
                         bot.message_queues[channel_id]
@@ -448,9 +457,10 @@ async def process_message_queue(channel_id):
                     await asyncio.sleep(bot.batch_wait_time)
 
                     while bot.message_queues[channel_id]:
+                        next_message = bot.message_queues[channel_id][0]
                         if (
-                            bot.message_queues[channel_id][0].author.id
-                            == message.author.id
+                            next_message.author.id == message.author.id
+                            and not next_message.content.startswith(PREFIX)
                         ):
                             next_message = bot.message_queues[channel_id].popleft()
                             if next_message.content not in [