Formatting

Author: fourjr

bot.py

@@ -1264,9 +1264,7 @@ async def handle_reaction_events(self, payload):
             if not thread:
                 return
             try:
-                _, *linked_message = await thread.find_linked_messages(
-                    message.id, either_direction=True
-                )
+                _, *linked_message = await thread.find_linked_messages(message.id, either_direction=True)
             except ValueError as e:
                 logger.warning("Failed to find linked message for reactions: %s", e)
                 return
@@ -1287,10 +1285,7 @@ async def handle_reaction_events(self, payload):
     async def handle_react_to_contact(self, payload):
         react_message_id = tryint(self.config.get("react_to_contact_message"))
         react_message_emoji = self.config.get("react_to_contact_emoji")
-        if (
-            not all((react_message_id, react_message_emoji))
-            or payload.message_id != react_message_id
-        ):
+        if not all((react_message_id, react_message_emoji)) or payload.message_id != react_message_id:
             return
         if payload.emoji.is_unicode_emoji():
             emoji_fmt = payload.emoji.name
@@ -1314,7 +1309,8 @@ async def handle_react_to_contact(self, payload):
                 description=self.config["disabled_new_thread_response"],
             )
             embed.set_footer(
-                text=self.config["disabled_new_thread_footer"], icon_url=self.guild.icon_url,
+                text=self.config["disabled_new_thread_footer"],
+                icon_url=self.guild.icon_url,
             )
             logger.info(
                 "A new thread using react to contact was blocked from %s due to disabled Modmail.",
@@ -1327,7 +1323,8 @@ async def handle_react_to_contact(self, payload):
 
     async def on_raw_reaction_add(self, payload):
         await asyncio.gather(
-            self.handle_reaction_events(payload), self.handle_react_to_contact(payload),
+            self.handle_reaction_events(payload),
+            self.handle_react_to_contact(payload),
         )
 
     async def on_raw_reaction_remove(self, payload):

cogs/modmail.py

@@ -1067,7 +1067,10 @@ async def contact(
                 return await ctx.send(embed=embed)
 
             thread = await self.bot.threads.create(
-                recipient=user, creator=creator, category=category, manual_trigger=manual_trigger,
+                recipient=user,
+                creator=creator,
+                category=category,
+                manual_trigger=manual_trigger,
             )
             if thread.cancelled:
                 return

core/models.py

@@ -127,9 +127,7 @@ def format(self, record):
 
 def configure_logging(name, level=None):
     global ch_debug, log_level
-    ch_debug = RotatingFileHandler(
-        name, mode="a+", maxBytes=48000, backupCount=1, encoding="utf-8"
-    )
+    ch_debug = RotatingFileHandler(name, mode="a+", maxBytes=48000, backupCount=1, encoding="utf-8")
 
     formatter_debug = FileFormatter(
         "%(asctime)s %(name)s[%(lineno)d] - %(levelname)s: %(message)s",

core/thread.py

@@ -111,15 +111,11 @@ def cancelled(self, flag: bool):
                 i.cancel()
 
     @classmethod
-    async def from_channel(
-        cls, manager: "ThreadManager", channel: discord.TextChannel
-    ) -> "Thread":
+    async def from_channel(cls, manager: "ThreadManager", channel: discord.TextChannel) -> "Thread":
         recipient_id = match_user_id(
             channel.topic
         )  # there is a chance it grabs from another recipient's main thread
-        recipient = manager.bot.get_user(recipient_id) or await manager.bot.fetch_user(
-            recipient_id
-        )
+        recipient = manager.bot.get_user(recipient_id) or await manager.bot.fetch_user(recipient_id)
 
         other_recipients = match_other_recipients(channel.topic)
         for n, uid in enumerate(other_recipients):
@@ -761,7 +757,11 @@ async def reply(self, message: discord.Message, anonymous: bool = False, plain:
         for user in self.recipients:
             user_msg_tasks.append(
                 self.send(
-                    message, destination=user, from_mod=True, anonymous=anonymous, plain=plain,
+                    message,
+                    destination=user,
+                    from_mod=True,
+                    anonymous=anonymous,
+                    plain=plain,
                 )
             )
 
@@ -1071,19 +1071,15 @@ async def set_title(self, title: str) -> None:
         user_id = match_user_id(self.channel.topic)
         ids = ",".join(i.id for i in self._other_recipients)
 
-        await self.channel.edit(
-            topic=f"Title: {title}\nUser ID: {user_id}\nOther Recipients: {ids}"
-        )
+        await self.channel.edit(topic=f"Title: {title}\nUser ID: {user_id}\nOther Recipients: {ids}")
 
     async def add_user(self, user: typing.Union[discord.Member, discord.User]) -> None:
         title = match_title(self.channel.topic)
         user_id = match_user_id(self.channel.topic)
         self._other_recipients.append(user)
 
         ids = ",".join(str(i.id) for i in self._other_recipients)
-        await self.channel.edit(
-            topic=f"Title: {title}\nUser ID: {user_id}\nOther Recipients: {ids}"
-        )
+        await self.channel.edit(topic=f"Title: {title}\nUser ID: {user_id}\nOther Recipients: {ids}")
 
 
 class ThreadManager:
@@ -1139,9 +1135,7 @@ async def find(
                 if not thread.cancelled and (
                     not thread.channel or not self.bot.get_channel(thread.channel.id)
                 ):
-                    logger.warning(
-                        "Found existing thread for %s but the channel is invalid.", recipient_id
-                    )
+                    logger.warning("Found existing thread for %s but the channel is invalid.", recipient_id)
                     await thread.close(closer=self.bot.user, silent=True, delete_channel=False)
                     thread = None
         else:
@@ -1280,9 +1274,7 @@ async def create(
                 if str(r.emoji) == deny_emoji:
                     thread.cancelled = True
                     self.bot.loop.create_task(
-                        destination.send(
-                            embed=discord.Embed(title="Cancelled", color=self.bot.error_color)
-                        )
+                        destination.send(embed=discord.Embed(title="Cancelled", color=self.bot.error_color))
                     )
 
             async def remove_reactions():

core/utils.py

@@ -218,9 +218,7 @@ def cleanup_code(content: str) -> str:
     return content.strip("` \n")
 
 
-TOPIC_OTHER_RECIPIENTS_REGEX = re.compile(
-    r"Other Recipients:\s*((?:\d{17,21},*)+)", flags=re.IGNORECASE
-)
+TOPIC_OTHER_RECIPIENTS_REGEX = re.compile(r"Other Recipients:\s*((?:\d{17,21},*)+)", flags=re.IGNORECASE)
 TOPIC_TITLE_REGEX = re.compile(r"\bTitle: (.*)\n(?:User ID: )\b", flags=re.IGNORECASE | re.DOTALL)
 TOPIC_UID_REGEX = re.compile(r"\bUser ID:\s*(\d{17,21})\b", flags=re.IGNORECASE)