Spacing

Author: Taaku18

bot.py

@@ -52,7 +52,6 @@
 from core.thread import ThreadManager
 from core.time import human_timedelta
 
-
 init()
 
 logger = logging.getLogger('Modmail')
@@ -486,7 +485,8 @@ async def process_modmail(self, message):
             except isodate.ISO8601Error:
                 logger.warning('The account age limit needs to be a '
                                'ISO-8601 duration formatted duration string '
-                               f'greater than 0 days, not "%s".', str(account_age))
+                               f'greater than 0 days, not "%s".',
+                               str(account_age))
                 del self.config.cache['account_age']
                 await self.config.update()
                 account_age = isodate.duration.Duration()
@@ -541,7 +541,7 @@ async def process_modmail(self, message):
                         await self.config.update()
         else:
             reaction = sent_emoji
-        
+
         if reaction != 'disable':
             try:
                 await message.add_reaction(reaction)
@@ -610,7 +610,9 @@ async def update_perms(self, name, value, add=True):
             else:
                 if value in permissions[name]:
                     permissions[name].remove(value)
-        logger.info(info(f'Updating permissions for {name}, {value} (add={add}).'))
+        logger.info(
+            info(f'Updating permissions for {name}, {value} (add={add}).')
+        )
         await self.config.update()
 
     async def on_message(self, message):
@@ -649,7 +651,7 @@ async def on_message(self, message):
 
     async def on_typing(self, channel, user, _):
         if user.bot:
-            return 
+            return
         if isinstance(channel, discord.DMChannel):
             if not self.config.get('user_typing'):
                 return
@@ -662,7 +664,7 @@ async def on_typing(self, channel, user, _):
             thread = await self.threads.find(channel=channel)
             if thread and thread.recipient:
                 await thread.recipient.trigger_typing()
-    
+
     async def on_raw_reaction_add(self, payload):
 
         user = self.get_user(payload.user_id)
@@ -682,12 +684,14 @@ async def on_raw_reaction_add(self, payload):
         message = await channel.get_message(payload.message_id)
         reaction = payload.emoji
 
-        close_emoji = await self.convert_emoji(self.config.get('close_emoji', '🔒'))
+        close_emoji = await self.convert_emoji(
+            self.config.get('close_emoji', '🔒')
+        )
 
         if isinstance(channel, discord.DMChannel) and str(reaction) == str(close_emoji):  # closing thread
             thread = await self.threads.find(recipient=user)
             ts = message.embeds[0].timestamp if message.embeds else None
-            if thread and ts == thread.channel.created_at: 
+            if thread and ts == thread.channel.created_at:
                 # the reacted message is the corresponding thread creation embed
                 if not self.config.get('disable_recipient_thread_close'):
                     await thread.close(closer=user)
@@ -733,23 +737,23 @@ async def on_guild_channel_delete(self, channel):
             return
 
         await thread.close(closer=mod, silent=True, delete_channel=False)
-    
+
     async def on_member_remove(self, member):
         thread = await self.threads.find(recipient=member)
         if thread:
             em = discord.Embed(
                 description='The recipient has left the server.',
                 color=discord.Color.red()
-                )
+            )
             await thread.channel.send(embed=em)
-    
+
     async def on_member_join(self, member):
         thread = await self.threads.find(recipient=member)
         if thread:
             em = discord.Embed(
                 description='The recipient has joined the server.',
                 color=self.mod_color
-                )
+            )
             await thread.channel.send(embed=em)
 
     async def on_message_delete(self, message):
@@ -909,7 +913,7 @@ async def autoupdate_loop(self):
                 embed.set_author(name=user['username'] + ' - Updating Bot',
                                  icon_url=user['avatar_url'],
                                  url=user['url'])
-                embed.set_footer(text=f"Updating Modmail v{self.version} "
+                embed.set_footer(text=f'Updating Modmail v{self.version} '
                                       f"-> v{metadata['latest_version']}")
 
                 changelog = await Changelog.from_url(self)
@@ -935,6 +939,7 @@ async def autoupdate_loop(self):
 if __name__ == '__main__':
     if os.name != 'nt':
         import uvloop
+
         uvloop.install()
     bot = ModmailBot()
     bot.run()

cogs/utility.py

@@ -442,9 +442,9 @@ async def activity(self, ctx, activity_type: str.lower, *, message: str = ''):
             raise commands.UserInputError
 
         activity, msg = (await self.set_presence(
-                activity_identifier=activity_type,
-                activity_by_key=True,
-                activity_message=message
+            activity_identifier=activity_type,
+            activity_by_key=True,
+            activity_message=message
          ))['activity']
         if activity is None:
             raise commands.UserInputError
@@ -488,8 +488,8 @@ async def status(self, ctx, *, status_type: str.lower):
         status_type = status_type.replace(' ', '_')
 
         status, msg = (await self.set_presence(
-                status_identifier=status_type,
-                status_by_key=True
+            status_identifier=status_type,
+            status_by_key=True
         ))['status']
         if status is None:
             raise commands.UserInputError

core/checks.py

@@ -37,7 +37,7 @@ async def predicate(ctx):
     return commands.check(predicate)
 
 
-async def check_permissions(ctx: commands.Context, 
+async def check_permissions(ctx: commands.Context,
                             command_name: str,
                             permission_level: PermissionLevel) -> bool:
     if await ctx.bot.is_owner(ctx.author):

core/thread.py

@@ -12,7 +12,6 @@
 from core.utils import is_image_url, days, match_user_id
 from core.utils import truncate, ignore, error
 
-
 logger = logging.getLogger('Modmail')
 
 
@@ -104,12 +103,12 @@ async def setup(self, *, creator=None, category=None):
         try:
             log_url, log_data = await asyncio.gather(
                 self.bot.api.create_log_entry(recipient, channel,
-                                            creator or recipient),
+                                              creator or recipient),
                 self.bot.api.get_user_logs(recipient.id)
             )
 
             log_count = sum(1 for log in log_data if not log['open'])
-        except: # Something went wrong with database?
+        except:  # Something went wrong with database?
             log_url = log_count = None
             # ensure core functionality still works
 
@@ -153,14 +152,15 @@ async def send_info_embed():
 
         footer = self.bot.config.get('thread_creation_footer', footer)
         embed.set_footer(text=footer, icon_url=self.bot.guild.icon_url)
-        embed.title = self.bot.config.get('thread_creation_title', 'Thread Created')
+        embed.title = self.bot.config.get('thread_creation_title',
+                                          'Thread Created')
 
         if creator is None:
             msg = await recipient.send(embed=embed)
             if not self.bot.config.get('disable_recipient_thread_close'):
                 close_emoji = self.bot.config.get('close_emoji', '🔒')
                 close_emoji = await self.bot.convert_emoji(close_emoji)
-                await msg.add_reaction(close_emoji) 
+                await msg.add_reaction(close_emoji)
 
     def _close_after(self, closer, silent, delete_channel, message):
         return self.bot.loop.create_task(
@@ -245,7 +245,7 @@ async def _close(self, closer, silent=False, delete_channel=True,
             user = f"{self.recipient} (`{self.id}`)"
         else:
             user = f'`{self.id}`'
-        
+
         if self.id == closer.id:
             _closer = 'the Recipient'
         else:
@@ -261,34 +261,37 @@ async def _close(self, closer, silent=False, delete_channel=True,
         tasks = [
             self.bot.config.update()
         ]
-        
+
         try:
             tasks.append(self.bot.log_channel.send(embed=embed))
         except (ValueError, AttributeError):
             pass
 
         # Thread closed message
 
-        embed = discord.Embed(title=self.bot.config.get('thread_close_title', 'Thread Closed'),
-                              color=discord.Color.red(),
-                              timestamp=datetime.utcnow())
+        embed = discord.Embed(
+            title=self.bot.config.get('thread_close_title', 'Thread Closed'),
+            color=discord.Color.red(),
+            timestamp=datetime.utcnow())
 
         if not message:
             if self.id == closer.id:
                 message = self.bot.config.get(
-                    'thread_self_close_response', 
+                    'thread_self_close_response',
                     'You have closed this Modmail thread.'
-                    )
+                )
             else:
                 message = self.bot.config.get(
                     'thread_close_response',
                     '{closer.mention} has closed this Modmail thread.'
-                    )
-            
-        message = message.format(closer=closer, loglink=log_url, logkey=log_data['key'])
+                )
+
+        message = message.format(closer=closer, loglink=log_url,
+                                 logkey=log_data['key'])
 
         embed.description = message
-        footer = self.bot.config.get('thread_close_footer', 'Replying will create a new thread')
+        footer = self.bot.config.get('thread_close_footer',
+                                     'Replying will create a new thread')
         embed.set_footer(text=footer,
                          icon_url=self.bot.guild.icon_url)
 
@@ -476,13 +479,12 @@ async def send(self, message, destination=None,
 
         for att in images:
             if not prioritize_uploads or (
-                    is_image_url(*att) and not
-                    embedded_image and
-                    att[1]
+                    is_image_url(*att) and not embedded_image and att[1]
             ):
                 embed.set_image(url=att[0])
                 if att[1]:
-                    embed.add_field(name='Image', value=f'[{att[1]}]({att[0]})')
+                    embed.add_field(name='Image',
+                                    value=f'[{att[1]}]({att[0]})')
                 embedded_image = True
             elif att[1] is not None:
                 if note: