Pylint correction

Author: Taaku18

bot.py

@@ -128,7 +128,7 @@ def _load_extensions(self):
             cog = f'cogs.{file[:-3]}'
             print(f'Loading {cog}')
             self.load_extension(cog)
-    
+
     async def is_owner(self, user):
         allowed = [int(x) for x in str(self.config.get('owners', '0')).split(',')]
         return user.id in allowed
@@ -257,14 +257,14 @@ async def on_connect(self):
         if self.db:
             await self.setup_indexes()
         self._connected.set()
-    
+
     async def setup_indexes(self):
         """Setup text indexes so we can use the $search operator"""
-        coll = self.db.logs 
+        coll = self.db.logs
         index_name = 'messages.content_text_messages.author.name_text'
 
         index_info = await coll.index_information()
-        
+
         # Backwards compatibility
         old_index = 'messages.content_text'
         if old_index in index_info:
@@ -416,7 +416,7 @@ async def get_context(self, message, *, cls=commands.Context):
 
         if self._skip_check(message.author.id, self.user.id):
             return ctx
-        
+
         ctx.thread = await self.threads.find(channel=ctx.channel)
 
         prefixes = await self.get_prefix()

cogs/modmail.py

@@ -4,16 +4,15 @@
 
 import discord
 from dateutil import parser
-from natural.date import duration
 from discord.ext import commands
+from natural.date import duration
 
-from core import checks 
-
+from core import checks
 from core.decorators import trigger_typing
 from core.models import Bot
 from core.paginator import PaginatorSession
 from core.time import UserFriendlyTime, human_timedelta
-from core.utils import truncate, format_preview, User
+from core.utils import format_preview, User
 
 
 class Modmail:
@@ -366,25 +365,37 @@ def format_log_embeds(self, logs, avatar_url, title='Previous Logs'):
             created_at = parser.parse(entry['created_at'])
 
             log_url = (
-                f"https://logs.modmail.tk/{key}" 
-                if not self.bot.self_hosted else 
+                f"https://logs.modmail.tk/{key}"
+                if not self.bot.self_hosted else
                 self.bot.config.log_url.strip('/') + f'/logs/{key}'
-                )
-            
-            username = entry['recipient']['name'] + '#' + entry['recipient']['discriminator']
-
-            em = discord.Embed(color=discord.Color.blurple(), timestamp=created_at)
-            em.set_author(name=f'{title} ({index}) - {username}', icon_url=avatar_url, url=log_url)
-            em.url = log_url
-            em.add_field(name='Created', value=duration(created_at, now=datetime.utcnow()))
-            em.add_field(name='Closed By', value=f"<@{entry['closer']['id']}>")
+            )
+
+            username = entry['recipient']['name'] + '#'
+            username += entry['recipient']['discriminator']
+
+            embed = discord.Embed(color=discord.Color.blurple(),
+                                  timestamp=created_at)
+            embed.set_author(name=f'{title} ({index}) - {username}',
+                             icon_url=avatar_url,
+                             url=log_url)
+            embed.url = log_url
+            embed.add_field(name='Created',
+                            value=duration(created_at, now=datetime.utcnow()))
+            embed.add_field(name='Closed By',
+                            value=f"<@{entry['closer']['id']}>")
+
             if entry['recipient']['id'] != entry['creator']['id']:
-                em.add_field(name='Created by', value=f"<@{entry['creator']['id']}>")
-            em.add_field(name='Preview', value=format_preview(entry['messages']), inline=False)
-            em.add_field(name='Link', value=log_url)
-            em.set_footer(text='Recipient ID: ' + str(entry['recipient']['id']))
-            
-            embeds.append(em)
+                embed.add_field(name='Created by',
+                                value=f"<@{entry['creator']['id']}>")
+
+            embed.add_field(name='Preview',
+                            value=format_preview(entry['messages']),
+                            inline=False)
+            embed.add_field(name='Link', value=log_url)
+            embed.set_footer(
+                text='Recipient ID: ' + str(entry['recipient']['id'])
+            )
+            embeds.append(embed)
         return embeds
 
     @commands.group(invoke_without_command=True)
@@ -393,7 +404,7 @@ async def logs(self, ctx, *, member: User = None):
         """Shows a list of previous Modmail thread logs of a member."""
 
         await ctx.trigger_typing()
-        
+
         if not member:
             thread = ctx.thread
             if not thread:
@@ -419,14 +430,15 @@ async def logs(self, ctx, *, member: User = None):
 
         session = PaginatorSession(ctx, *embeds)
         await session.run()
-    
+
     @logs.command(name='closed-by')
-    async def closed_by(self, ctx, *, user: User=None):
+    async def closed_by(self, ctx, *, user: User = None):
         """Returns all logs closed by a user."""
         if not self.bot.self_hosted:
             embed = discord.Embed(
                 color=discord.Color.red(),
-                description='This command only works if you are self-hosting your logs.'
+                description='This command only works if '
+                            'you are self-hosting your logs.'
                 )
             return await ctx.send(embed=embed)
 
@@ -444,7 +456,9 @@ async def closed_by(self, ctx, *, user: User=None):
 
         entries = await self.bot.db.logs.find(query, projection).to_list(None)
 
-        embeds = self.format_log_embeds(entries, avatar_url=self.bot.guild.icon_url, title='Search Results')
+        embeds = self.format_log_embeds(entries,
+                                        avatar_url=self.bot.guild.icon_url,
+                                        title='Search Results')
 
         if not embeds:
             embed = discord.Embed(
@@ -455,17 +469,18 @@ async def closed_by(self, ctx, *, user: User=None):
 
         session = PaginatorSession(ctx, *embeds)
         await session.run()
-    
+
     @logs.command(name='search')
-    async def search(self, ctx, limit: Optional[int]=None, *, query):
-        '''Searches all logs for a message that contains your query.'''
+    async def search(self, ctx, limit: Optional[int] = None, *, query):
+        """Searches all logs for a message that contains your query."""
 
         await ctx.trigger_typing()
 
         if not self.bot.self_hosted:
             embed = discord.Embed(
                 color=discord.Color.red(),
-                description='This command only works if you are self-hosting your logs.'
+                description='This command only works if you '
+                            'are self-hosting your logs.'
                 )
             return await ctx.send(embed=embed)
 
@@ -483,7 +498,9 @@ async def search(self, ctx, limit: Optional[int]=None, *, query):
 
         entries = await self.bot.db.logs.find(query, projection).to_list(limit)
 
-        embeds = self.format_log_embeds(entries, avatar_url=self.bot.guild.icon_url, title='Search Results')
+        embeds = self.format_log_embeds(entries,
+                                        avatar_url=self.bot.guild.icon_url,
+                                        title='Search Results')
 
         if not embeds:
             embed = discord.Embed(
@@ -494,7 +511,7 @@ async def search(self, ctx, limit: Optional[int]=None, *, query):
 
         session = PaginatorSession(ctx, *embeds)
         await session.run()
-        
+
     @commands.command()
     @checks.thread_only()
     async def reply(self, ctx, *, msg=''):
@@ -510,8 +527,8 @@ async def reply(self, ctx, *, msg=''):
     @commands.command()
     @checks.thread_only()
     async def anonreply(self, ctx, *, msg=''):
-        """Reply to a thread anonymously. 
-        
+        """Reply to a thread anonymously.
+
         You can edit the anonymous user's name,
         avatar and tag using the config command.
 
@@ -570,7 +587,7 @@ async def edit(self, ctx, message_id: Optional[int] = None,
             thread.edit_message(linked_message_id, new_message),
             self.bot.api.edit_message(linked_message_id, new_message)
         )
-        
+
         await ctx.message.add_reaction('✅')
 
     @commands.command()

core/checks.py

@@ -12,13 +12,15 @@ async def predicate(ctx):
         resolved = ctx.channel.permissions_for(ctx.author)
 
         return resolved.administrator or all(
-            getattr(resolved, name, None) == value for name, value in perms.items()
+            getattr(resolved, name, None) == value
+            for name, value in perms.items()
         )
-    
+
     return commands.check(predicate)
 
+
 def thread_only():
     """Checks if the command is being run in a modmail thread"""
     async def predicate(ctx):
         return ctx.thread is not None
-    return commands.check(predicate)
+    return commands.check(predicate)

core/clients.py

@@ -254,10 +254,10 @@ async def post_metadata(self, data):
 
     async def get_user_logs(self, user_id):
         query = {
-            'recipient.id': str(user_id), 
+            'recipient.id': str(user_id),
             'guild_id': str(self.bot.guild_id)
             }
-        
+
         projection = {
             'messages': {'$slice': 5}
         }

core/thread.py

@@ -139,7 +139,8 @@ async def _close(self, closer, silent=False, delete_channel=True,
                 log_url = f"https://logs.modmail.tk/{log_data['key']}"
 
             if log_data['messages']:
-                sneak_peak = str(log_data['messages'][0]['content']).replace('\n', '')
+                content = str(log_data['messages'][0]['content'])
+                sneak_peak = content.replace('\n', '')
             else:
                 sneak_peak = 'No content'
 
@@ -410,7 +411,7 @@ async def send(self, message, destination=None,
         await destination.send(mentions, embed=embed)
 
         if additional_images:
-            self.ready = False 
+            self.ready = False
             await asyncio.gather(*additional_images)
             self.ready = True
 

core/utils.py

@@ -23,23 +23,25 @@ async def convert(self, ctx, argument):
         return Object(int(match.group(1)))
 
 
-def truncate(text: str, max: int=50) -> str:
+def truncate(text: str, max: int = 50) -> str:
     return text[:max-3].strip() + '...' if len(text) > max else text
 
+
 def format_preview(messages):
     messages = messages[:3]
     out = ''
-    for message in messages: 
+    for message in messages:
         if message.get('type') in ('note', 'internal'):
             continue
         author = message['author']
         content = message['content'].replace('\n', ' ')
         name = author['name'] + '#' + str(author['discriminator'])
         prefix = '[M]' if author['mod'] else '[R]'
         out += truncate(f'`{prefix} {name}:` {content}', max=75) + '\n'
-    
+
     return out or 'No Messages'
 
+
 def is_image_url(url: str, _=None) -> bool:
     return bool(parse_image_url(url))
 

requirements.txt

@@ -4,7 +4,8 @@ python-dateutil>=2.7.0
 emoji>=0.2
 uvloop>=0.12.0
 motor>=2.0.0
-natural
+natural==0.2.0
 dnspython~=1.16.0   # required by motor
 parsedatetime==2.4  # to be replaced by dateparser
-aiohttp<3.5         # to comply with discord.py
+aiohttp<3.5         # to comply with discord.py
+pylint              # for style