Unnotify, notify/sub with users, pylint

Author: Taaku18

.pylintrc

@@ -359,7 +359,6 @@ function-naming-style=snake_case
 # Good variable names which should always be accepted, separated by a comma.
 good-names=i,
            j,
-           k,
            ex,
            _,
            id,

CHANGELOG.md

@@ -7,11 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 # v2.20.1
 
+### What's new?
+
+  - New error message when using thread-only commands outside of threads.
+  - `?unnotify`, ability to undo `?notify`.
+  - `?notify` and `?subscribe` now accepts other users.
+
 ### 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).

cogs/modmail.py

@@ -266,26 +266,26 @@ async def close(self, ctx, *, after: UserFriendlyTime = None):
     @commands.command(aliases=['alert'])
     @checks.has_permissions(PermissionLevel.SUPPORTER)
     @checks.thread_only()
-    async def notify(self, ctx, *, role: Union[discord.Role, str.lower, None] = None):
+    async def notify(self, ctx, *, user_or_role: Union[discord.Role, User, str.lower, None] = None):
         """
-        Notify a role or yourself when the next thread message received.
+        Notify a user, role, or yourself when the next thread message received.
 
-        Once a thread message is received, `role` will only be pinged once.
+        Once a thread message is received, `user_or_role` will only be pinged once.
 
-        Leave `role` empty to notify yourself.
+        Leave `user_or_role` empty to notify yourself.
         `@here` and `@everyone` can be substituted with `here` and `everyone`.
-        `role` may be a role ID, mention, name, "everyone", or "here".
+        `user_or_role` may be a user ID, mention, name. role ID, mention, name, "everyone", or "here".
         """
         thread = ctx.thread
 
-        if role is None:
+        if user_or_role is None:
             mention = ctx.author.mention
-        elif isinstance(role, discord.Role):
-            mention = role.mention
-        elif role in {'here', 'everyone', '@here', '@everyone'}:
-            mention = '@' + role.lstrip('@')
+        elif hasattr(user_or_role, 'mention'):
+            mention = user_or_role.mention
+        elif user_or_role in {'here', 'everyone', '@here', '@everyone'}:
+            mention = '@' + user_or_role.lstrip('@')
         else:
-            raise commands.BadArgument(f'{role} is not a valid role.')
+            raise commands.BadArgument(f'{user_or_role} is not a valid role.')
 
         if str(thread.id) not in self.bot.config['notification_squad']:
             self.bot.config['notification_squad'][str(thread.id)] = []
@@ -304,29 +304,68 @@ async def notify(self, ctx, *, role: Union[discord.Role, str.lower, None] = None
                                   'on the next message received.')
         return await ctx.send(embed=embed)
 
+    @commands.command(aliases=['unalert'])
+    @checks.has_permissions(PermissionLevel.SUPPORTER)
+    @checks.thread_only()
+    async def unnotify(self, ctx, *, user_or_role: Union[discord.Role, User, str.lower, None] = None):
+        """
+        Un-notify a user, role, or yourself from a thread.
+
+        Leave `user_or_role` empty to un-notify yourself.
+        `@here` and `@everyone` can be substituted with `here` and `everyone`.
+        `user_or_role` may be a user ID, mention, name, role ID, mention, name, "everyone", or "here".
+        """
+        thread = ctx.thread
+
+        if user_or_role is None:
+            mention = ctx.author.mention
+        elif hasattr(user_or_role, 'mention'):
+            mention = user_or_role.mention
+        elif user_or_role in {'here', 'everyone', '@here', '@everyone'}:
+            mention = '@' + user_or_role.lstrip('@')
+        else:
+            mention = f'`{user_or_role}`'
+
+        if str(thread.id) not in self.bot.config['notification_squad']:
+            self.bot.config['notification_squad'][str(thread.id)] = []
+
+        mentions = self.bot.config['notification_squad'][str(thread.id)]
+
+        if mention not in mentions:
+            embed = discord.Embed(color=discord.Color.red(),
+                                  description=f'{mention} does not have a '
+                                              'pending notification.')
+        else:
+            mentions.remove(mention)
+            await self.bot.config.update()
+            embed = discord.Embed(color=self.bot.main_color,
+                                  description=f'{mention} will no longer '
+                                              'be notified.')
+        return await ctx.send(embed=embed)
+
     @commands.command(aliases=['sub'])
     @checks.has_permissions(PermissionLevel.SUPPORTER)
     @checks.thread_only()
-    async def subscribe(self, ctx, *, role: Union[discord.Role, str.lower, None] = None):
+    async def subscribe(self, ctx, *, user_or_role: Union[discord.Role, User, str.lower, None] = None):
         """
-        Notify a role or yourself for every thread message received.
+        Notify a user, role, or yourself for every thread message received.
 
         You will be pinged for every thread message received until you unsubscribe.
 
-        Leave `role` empty to subscribe yourself.
+        Leave `user_or_role` empty to subscribe yourself.
         `@here` and `@everyone` can be substituted with `here` and `everyone`.
-        `role` may be a role ID, mention, name, "everyone", or "here".
+        `user_or_role` may be a user ID, mention, name, role ID, mention, name, "everyone", or "here".
         """
         thread = ctx.thread
 
-        if role is None:
+        if user_or_role is None:
             mention = ctx.author.mention
-        elif isinstance(role, discord.Role):
-            mention = role.mention
-        elif role in {'here', 'everyone', '@here', '@everyone'}:
-            mention = '@' + role.lstrip('@')
+        elif hasattr(user_or_role, 'mention'):
+            mention = user_or_role.mention
+        elif user_or_role in {'here', 'everyone', '@here', '@everyone'}:
+            mention = '@' + user_or_role.lstrip('@')
         else:
-            raise commands.BadArgument(f'{role} is not a valid role.')
+            raise commands.BadArgument(f'{user_or_role} is not a valid role.')
 
         if str(thread.id) not in self.bot.config['subscriptions']:
             self.bot.config['subscriptions'][str(thread.id)] = []
@@ -350,24 +389,24 @@ async def subscribe(self, ctx, *, role: Union[discord.Role, str.lower, None] = N
     @commands.command(aliases=['unsub'])
     @checks.has_permissions(PermissionLevel.SUPPORTER)
     @checks.thread_only()
-    async def unsubscribe(self, ctx, *, role=None):
+    async def unsubscribe(self, ctx, *, user_or_role: Union[discord.Role, User, str.lower, None] = None):
         """
-        Unsubscribe a role or yourself from a thread.
+        Unsubscribe a user, role, or yourself from a thread.
 
-        Leave `role` empty to unsubscribe yourself.
+        Leave `user_or_role` empty to unsubscribe yourself.
         `@here` and `@everyone` can be substituted with `here` and `everyone`.
-        `role` may be a role ID, mention, name, "everyone", or "here".
+        `user_or_role` may be a user ID, mention, name, role ID, mention, name, "everyone", or "here".
         """
         thread = ctx.thread
 
-        if not role:
+        if user_or_role is None:
             mention = ctx.author.mention
-        elif role.lower() in ('here', 'everyone'):
-            mention = '@' + role
+        elif hasattr(user_or_role, 'mention'):
+            mention = user_or_role.mention
+        elif user_or_role in {'here', 'everyone', '@here', '@everyone'}:
+            mention = '@' + user_or_role.lstrip('@')
         else:
-            converter = commands.RoleConverter()
-            role = await converter.convert(ctx, role)
-            mention = role.mention
+            mention = f'`{user_or_role}`'
 
         if str(thread.id) not in self.bot.config['subscriptions']:
             self.bot.config['subscriptions'][str(thread.id)] = []

cogs/utility.py

@@ -148,8 +148,8 @@ async def send_error_message(self, msg):  # pylint: disable=W0221
 
         choices = set()
 
-        for name, c in self.context.bot.all_commands.items():
-            if not c.hidden:
+        for name, cmd in self.context.bot.all_commands.items():
+            if not cmd.hidden:
                 choices.add(name)
         command = self.context.kwargs.get('command')
         # print(self.context.message.content[self.context.in])
@@ -789,8 +789,8 @@ async def config_get(self, ctx, key: str.lower = None):
                              icon_url=self.bot.user.avatar_url)
 
             config = {
-                k: v for k, v in self.bot.config.cache.items()
-                if v and k in keys
+                key: val for key, val in self.bot.config.cache.items()
+                if val and key in keys
             }
 
             for k, v in reversed(list(config.items())):
@@ -1250,7 +1250,7 @@ def get_level(perm_level):
 
         p_session = PaginatorSession(ctx, *embeds)
         return await p_session.run()
-    
+
     @commands.group(invoke_without_command=True, aliases=['oauth2', 'auth', 'authentication'])
     @checks.has_permissions(PermissionLevel.OWNER)
     async def oauth(self, ctx):
@@ -1273,7 +1273,7 @@ async def oauth_whitelist(self, ctx, target: Union[User, Role]):
         else:
             whitelisted.append(target.id)
             removed = False
-        
+
         await self.bot.config.update()
 
         embed = Embed(color=self.bot.main_color)
@@ -1284,7 +1284,7 @@ async def oauth_whitelist(self, ctx, target: Union[User, Role]):
             )
 
         await ctx.send(embed=embed)
-    
+
     @oauth.command(name='show', aliases=['get', 'list', 'view'])
     @checks.has_permissions(PermissionLevel.OWNER)
     async def oauth_show(self, ctx):
@@ -1294,21 +1294,21 @@ async def oauth_show(self, ctx):
         users = []
         roles = []
 
-        for id in whitelisted:
-            user = self.bot.get_user(id)
+        for id_ in whitelisted:
+            user = self.bot.get_user(id_)
             if user:
                 users.append(user)
-            role = self.bot.modmail_guild.get_role(id)
+            role = self.bot.modmail_guild.get_role(id_)
             if role:
                 roles.append(role)
 
-        em = Embed(color=self.bot.main_color)
-        em.title = 'Oauth Whitelist'
+        embed = Embed(color=self.bot.main_color)
+        embed.title = 'Oauth Whitelist'
 
-        em.add_field(name='Users', value=' '.join(u.mention for u in users) or 'None')
-        em.add_field(name='Roles', value=' '.join(r.mention for r in roles) or 'None')
+        embed.add_field(name='Users', value=' '.join(u.mention for u in users) or 'None')
+        embed.add_field(name='Roles', value=' '.join(r.mention for r in roles) or 'None')
 
-        await ctx.send(embed=em)
+        await ctx.send(embed=embed)
 
     @commands.command(hidden=True, name='eval')
     @checks.has_permissions(PermissionLevel.OWNER)

core/config.py

@@ -147,9 +147,9 @@ async def clean_data(self, key: str,
                     val = val[1:]
                 if len(val) != 6:
                     raise InvalidConfigError('Invalid color name or hex.')
-                for v in val:
-                    if v not in {'0', '1', '2', '3', '4', '5', '6', '7',
-                                 '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'}:
+                for letter in val:
+                    if letter not in {'0', '1', '2', '3', '4', '5', '6', '7',
+                                      '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'}:
                         raise InvalidConfigError('Invalid color name or hex.')
                 clean_value = '#' + val
                 value_text = clean_value

core/utils.py

@@ -195,12 +195,12 @@ def match_user_id(text: str) -> int:
 
 
 def get_perm_level(cmd) -> PermissionLevel:
-    for c in cmd.checks:
-        perm = getattr(c, 'permission_level', None)
+    for check in cmd.checks:
+        perm = getattr(check, 'permission_level', None)
         if perm is not None:
             return perm
-    for c in cmd.checks:
-        if 'is_owner' in str(c):
+    for check in cmd.checks:
+        if 'is_owner' in str(check):
             return PermissionLevel.OWNER
     return PermissionLevel.INVALID