Dont use queues

Author: kyb3r

core/decorators.py

@@ -3,15 +3,6 @@
 from discord import Embed, Color
 from discord.ext import commands
 
-def queued():
-    def decorator(coro):
-        @functools.wraps(coro)
-        async def wrapper(self, *args, **kwargs):
-            await self.wait_until_ready()
-            task = coro(self, *args, **kwargs)
-            self._message_queue.put_nowait(task)
-        return wrapper
-    return decorator
 
 async def ignore(coro):
     try:

core/thread.py

@@ -9,7 +9,7 @@
 
 from core.models import Bot, ThreadManagerABC, ThreadABC
 from core.utils import is_image_url, days, match_user_id, truncate
-from core.decorators import ignore, queued
+from core.decorators import ignore
 
 
 class Thread(ThreadABC):
@@ -32,9 +32,7 @@ def __init__(self, manager: 'ThreadManager',
             self._recipient = recipient
         self._channel = channel
         self._ready_event = asyncio.Event()
-        self._message_queue = asyncio.Queue()
         self._close_task = None
-        self.bot.loop.create_task(self.process_messages())
 
     def __repr__(self):
         return (f'Thread(recipient="{self.recipient or self.id}", '
@@ -75,12 +73,6 @@ def ready(self, flag):
         else:
             self._ready_event.clear()
 
-    async def process_messages(self):
-        """Guarantees order of thread messages sent"""
-        while True:
-            task = await self._message_queue.get()
-            await task 
-
     async def setup(self, *, creator=None, category=None):
         """Create the thread channel and other io related initilisation tasks"""
 
@@ -362,7 +354,6 @@ async def reply(self, message, anonymous=False):
 
         await asyncio.gather(*tasks)
 
-    @queued()
     async def send(self, message, destination=None,
                    from_mod=False, note=False, anonymous=False):
         if self.close_task is not None:
@@ -380,6 +371,9 @@ async def send(self, message, destination=None,
                 self.bot.api.append_log(message, self.channel.id)
             )
 
+        if not self.ready:
+            self.wait_until_ready()
+
         destination = destination or self.channel
 
         author = message.author
@@ -500,7 +494,9 @@ async def send(self, message, destination=None,
 
         await destination.send(mentions, embed=embed)
         if additional_images:
+            self.ready = True
             await asyncio.gather(*additional_images)
+            self.ready = False
 
         if delete_message:
             self.bot.loop.create_task(ignore(message.delete()))