Updated changelog, pylint

Author: Taaku18

.pylintrc

@@ -79,7 +79,8 @@ disable=raw-checker-failed,
         too-many-instance-attributes,
         too-many-arguments,
         too-few-public-methods,
-        too-many-lines
+        too-many-lines,
+        line-too-long
 
 
 # Enable the message, report, category or checker with the given id(s). You can
@@ -361,12 +362,12 @@ good-names=i,
            k,
            ex,
            _,
-           v,
            id,
            db,
            f,
            dt,
-           c
+           ch,
+           ts
 
 # Include a hint for the correct naming format with invalid-name.
 include-naming-hint=yes

CHANGELOG.md

@@ -5,6 +5,17 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 
+# v2.20.1
+
+### Changes
+
+This update contains mostly internal changes.
+  - Implemented support for the new discord.py v1.1.1.
+  - New error message when using thread-only commands outside of threads.
+  - Improved help text for most commands.
+  - Completely revamped help command, few user changes.
+  - Removed abc (internal).
+
 # v2.20.0
 
 ### What's new? 

bot.py

@@ -22,7 +22,7 @@
 SOFTWARE.
 """
 
-__version__ = '2.20.0'
+__version__ = '2.20.1'
 
 import asyncio
 import logging
@@ -32,7 +32,6 @@
 import typing
 
 from datetime import datetime
-from pkg_resources import parse_version
 from types import SimpleNamespace
 
 import discord
@@ -45,6 +44,7 @@
 from colorama import init, Fore, Style
 from emoji import UNICODE_EMOJI
 from motor.motor_asyncio import AsyncIOMotorClient
+from pkg_resources import parse_version
 
 from core.changelog import Changelog
 from core.clients import ApiClient, PluginDatabaseClient
@@ -240,7 +240,7 @@ def run(self, *args, **kwargs):
     async def is_owner(self, user: discord.User) -> bool:
         raw = str(self.config.get('owners', '0')).split(',')
         allowed = {int(x) for x in raw}
-        return (user.id in allowed) or await super().is_owner(user) 
+        return (user.id in allowed) or await super().is_owner(user)
 
     @property
     def log_channel(self) -> typing.Optional[discord.TextChannel]:
@@ -518,8 +518,8 @@ async def process_modmail(self, message: discord.Message) -> None:
 
         try:
             min_account_age = message.author.created_at + account_age
-        except ValueError as e:
-            logger.warning(e.args[0])
+        except ValueError as exc:
+            logger.warning(exc.args[0])
             del self.config.cache['account_age']
             await self.config.update()
             min_account_age = now
@@ -530,8 +530,8 @@ async def process_modmail(self, message: discord.Message) -> None:
                 min_guild_age = member.joined_at + guild_age
             else:
                 min_guild_age = now
-        except ValueError as e:
-            logger.warning(e.args[0])
+        except ValueError as exc:
+            logger.warning(exc.args[0])
             del self.config.cache['guild_age']
             await self.config.update()
             min_guild_age = now
@@ -641,11 +641,6 @@ async def get_context(self, message, *, cls=commands.Context):
         ctx.prefix = self.prefix  # Sane prefix (No mentions)
         ctx.command = self.all_commands.get(invoker)
 
-        has_ai = hasattr(ctx, '_alias_invoked')
-        if ctx.command is self.get_command('eval') and has_ai:
-            # ctx.command.checks = None # Let anyone use the command.
-            pass
-
         return ctx
 
     async def update_perms(self, name: typing.Union[PermissionLevel, str],
@@ -691,7 +686,7 @@ async def on_message(self, message):
                 if thread:
                     snippet = snippet.format(recipient=thread.recipient)
                 message.content = f'{prefix}reply {snippet}'
-        
+
         ctx = await self.get_context(message)
         if ctx.command:
             return await self.invoke(ctx)
@@ -853,29 +848,29 @@ async def on_error(self, event_method, *args, **kwargs):
         logger.error(error('Ignoring exception in {}'.format(event_method)))
         logger.error(error('Unexpected exception:'), exc_info=sys.exc_info())
 
-    async def on_command_error(self, ctx, exception):
+    async def on_command_error(self, context, exception):
         if isinstance(exception, commands.BadUnionArgument):
             msg = 'Could not find the specified ' + human_join([c.__name__ for c in exception.converters])
-            await ctx.trigger_typing()
-            await ctx.send(embed=discord.Embed(
-                color=discord.Color.red(), 
+            await context.trigger_typing()
+            await context.send(embed=discord.Embed(
+                color=discord.Color.red(),
                 description=msg
                 ))
 
         elif isinstance(exception, commands.BadArgument):
-            await ctx.trigger_typing()
-            await ctx.send(embed=discord.Embed(
-                color=discord.Color.red(), 
+            await context.trigger_typing()
+            await context.send(embed=discord.Embed(
+                color=discord.Color.red(),
                 description=str(exception)
                 ))
         elif isinstance(exception, commands.CommandNotFound):
             logger.warning(error('CommandNotFound: ' + str(exception)))
         elif isinstance(exception, commands.MissingRequiredArgument):
-            await ctx.send_help(ctx.command)
+            await context.send_help(context.command)
         elif isinstance(exception, commands.CheckFailure):
-            for check in ctx.command.checks:
-                if not await check(ctx) and hasattr(check, 'fail_msg'):
-                    await ctx.send(embed=discord.Embed(
+            for check in context.command.checks:
+                if not await check(context) and hasattr(check, 'fail_msg'):
+                    await context.send(embed=discord.Embed(
                         color=discord.Color.red(),
                         description=check.fail_msg
                     ))

cogs/modmail.py

@@ -53,7 +53,7 @@ async def setup(self, ctx):
 
         embed = discord.Embed(
             title='Friendly Reminder:',
-            description='You may use the `config set log_channel_id '
+            description=f'You may use the `{self.bot.prefix}config set log_channel_id '
                         '<channel-id>` command to set up a custom log channel'
                         ', then you can delete the default '
                         f'{log_channel.mention} channel.',
@@ -72,7 +72,7 @@ async def setup(self, ctx):
                        'Consider setting permission groups to give access '
                        'to roles or users the ability to use Modmail.\n'
                        f'Type `{self.bot.prefix}permissions` for more info.')
-                       
+
         if not self.bot.config.get('permissions'):
             await self.bot.update_perms(PermissionLevel.REGULAR, -1)
             await self.bot.update_perms(PermissionLevel.OWNER, ctx.author.id)
@@ -278,7 +278,7 @@ async def notify(self, ctx, *, role: Union[discord.Role, str.lower, None] = None
         """
         thread = ctx.thread
 
-        if role is None or role == 'me':
+        if role is None:
             mention = ctx.author.mention
         elif isinstance(role, discord.Role):
             mention = role.mention
@@ -594,7 +594,6 @@ async def anonreply(self, ctx, *, msg: str = ''):
         async with ctx.typing():
             await ctx.thread.reply(ctx.message, anonymous=True)
 
-
     @commands.command()
     @checks.has_permissions(PermissionLevel.SUPPORTER)
     @checks.thread_only()

cogs/plugins.py

@@ -180,7 +180,7 @@ async def plugin_remove(self, ctx, *, plugin_name: str):
                 if not any(i.startswith(f'{username}/{repo}')
                            for i in self.bot.config.plugins):
                     # if there are no more of such repos, delete the folder
-                    def onerror(func, path, exc_info):
+                    def onerror(func, path, exc_info):  # pylint: disable=W0613
                         if not os.access(path, os.W_OK):
                             # Is the error an access error?
                             os.chmod(path, stat.S_IWUSR)

cogs/utility.py

@@ -8,14 +8,14 @@
 from io import StringIO
 from typing import Union
 from json import JSONDecodeError
-from pkg_resources import parse_version
 from textwrap import indent
 
 from discord import Embed, Color, Activity, Role
 from discord.enums import ActivityType, Status
 from discord.ext import commands
 
 from aiohttp import ClientResponseError
+from pkg_resources import parse_version
 
 from core import checks
 from core.changelog import Changelog
@@ -57,7 +57,7 @@ async def format_cog_help(self, cog):
 
             embed.add_field(name='Commands', value=format_)
 
-            continued = ' (Continued)' if len(embeds) > 0 else ''
+            continued = ' (Continued)' if embeds else ''
             embed.set_author(name=cog.qualified_name + ' - Help' + continued,
                              icon_url=bot.user.avatar_url)
 
@@ -66,8 +66,8 @@ async def format_cog_help(self, cog):
             embeds.append(embed)
         return embeds
 
-    def process_help_msg(self, help: str):
-        return help.format(prefix=self.clean_prefix)
+    def process_help_msg(self, help_: str):
+        return help_.format(prefix=self.clean_prefix)
 
     async def send_bot_help(self, mapping):
         embeds = []
@@ -138,7 +138,7 @@ async def send_group_help(self, group):
         )
         await self.get_destination().send(embed=embed)
 
-    async def send_error_message(self, msg):
+    async def send_error_message(self, msg):  # pylint: disable=W0221
         logger.warning(error(f'CommandNotFound: {msg}'))
 
         embed = Embed(
@@ -583,9 +583,9 @@ async def set_presence(self, *,
         presence = {'activity': (None, 'No activity has been set.'),
                     'status': (None, 'No status has been set.')}
         if activity is not None:
-            to = 'to ' if activity.type == ActivityType.listening else ''
+            use_to = 'to ' if activity.type == ActivityType.listening else ''
             msg = f'Activity set to: {activity.type.name.capitalize()} '
-            msg += f'{to}{activity.name}.'
+            msg += f'{use_to}{activity.name}.'
             presence['activity'] = (activity, msg)
         if status is not None:
             msg = f'Status set to: {status.value}.'
@@ -1276,14 +1276,14 @@ async def oauth_whitelist(self, ctx, target: Union[User, Role]):
 
         await self.bot.config.update()
 
-        em = Embed(color=self.bot.main_color)
-        em.title = 'Success'
-        em.description = (
+        embed = Embed(color=self.bot.main_color)
+        embed.title = 'Success'
+        embed.description = (
             f"{'Un-w' if removed else 'W'}hitelisted "
             f"{target.mention} to view logs."
             )
 
-        await ctx.send(embed=em)
+        await ctx.send(embed=embed)
 
     @oauth.command(name='show', aliases=['get', 'list', 'view'])
     @checks.has_permissions(PermissionLevel.OWNER)

core/config.py

@@ -166,8 +166,8 @@ async def clean_data(self, key: str,
                     time = await converter.convert(None, val)
                     if time.arg:
                         raise ValueError
-                except BadArgument as e:
-                    raise InvalidConfigError(*e.args)
+                except BadArgument as exc:
+                    raise InvalidConfigError(*exc.args)
                 except Exception:
                     raise InvalidConfigError(
                         'Unrecognized time, please use ISO-8601 duration format '

core/utils.py

@@ -129,8 +129,7 @@ def parse_image_url(url: str) -> str:
 def human_join(strings):
     if len(strings) <= 2:
         return ' or '.join(strings)
-    else:
-        return ', '.join(strings[:len(strings) - 1]) + ' or ' + strings[-1]
+    return ', '.join(strings[:len(strings) - 1]) + ' or ' + strings[-1]
 
 
 def days(day: typing.Union[str, int]) -> str: