better logic

Author: DAzVise

cogs/modmail.py

@@ -900,7 +900,7 @@ async def contact(
             await ctx.channel.send(embed=embed)
 
         else:
-            thread = self.bot.threads.create(user, creator=ctx.author, category=category)
+            thread = await self.bot.threads.create(user, creator=ctx.author, category=category)
             if self.bot.config["dm_disabled"] >= 1:
                 logger.info("Contacting user %s when Modmail DM is disabled.", user)
 

core/thread.py

@@ -97,7 +97,7 @@ async def setup(self, *, creator=None, category=None):
                 overwrites=overwrites,
                 reason="Creating a thread channel.",
             )
-        except discord.HTTPException as e:  # Failed to create due to 50 channel limit.
+        except discord.HTTPException as e:  # Failed to create due to missing perms.
             logger.critical("An error occurred while creating a thread.", exc_info=True)
             self.manager.cache.pop(self.id)
 
@@ -860,18 +860,17 @@ async def create(
 
         # Schedule thread setup for later
         cat = self.bot.main_category
-        if len(cat.channels) == 50:
+        if category is None and len(cat.channels) == 50:
             fallback_id = self.bot.config["fallback_category_id"]
-            fallback = discord.utils.get(cat.guild.categories, id=int(fallback_id))
-            if fallback and len(fallback.channels) != 50:
-                self.bot.loop.create_task(thread.setup(creator=creator, category=fallback))
-                return thread
-
-            fallback = await cat.clone(name="Fallback Modmail")
-            self.bot.config.set("fallback_category_id", fallback.id)
-            await self.bot.config.update()
-            self.bot.loop.create_task(thread.setup(creator=creator, category=fallback))
-            return thread
+            if fallback_id:
+                fallback = discord.utils.get(cat.guild.categories, id=int(fallback_id))
+                if fallback and len(fallback.channels) != 50:
+                    category = fallback
+
+            if not category:
+                category = await cat.clone(name="Fallback Modmail")
+                self.bot.config.set("fallback_category_id", category.id)
+                await self.bot.config.update()
 
         self.bot.loop.create_task(thread.setup(creator=creator, category=category))
         return thread