Merge

Author: fourjr

bot.py

@@ -306,8 +306,7 @@ async def data_loop(self):
 
     async def autoupdate_loop(self):
         while True:
-            if not self.config.get('autoupdates'):
-                print(self.config.get('autoupdates', 'none'))
+            if self.config.get('disable_autoupdates'):
                 await asyncio.sleep(3600)
                 continue
 

cogs/modmail.py

@@ -291,8 +291,7 @@ async def contact(self, ctx, *, user: discord.Member):
     @commands.has_permissions(manage_channels=True)
     async def blocked(self, ctx):
         """Returns a list of blocked users"""
-        em = discord.Embed(title='Blocked Users', color=discord.Color.green())
-        em.description = ''
+        em = discord.Embed(title='Blocked Users', color=discord.Color.green(), description='')
 
         users = []
         not_reachable = []
@@ -381,7 +380,7 @@ async def unblock(self, ctx, id=None):
             await top_chan.edit(topic=topic)
 
             em.title = 'Success'
-            em.description = f'{mention} is no longer blocked'
+            em.description = f'{mention} (`{mention.id}`) is no longer blocked'
 
             await ctx.send(embed=em)
         else:

cogs/utility.py

@@ -257,7 +257,7 @@ async def update(self, ctx):
 
         await ctx.send(embed=em)
 
-    @commands.command(name="status", aliases=['customstatus', 'presence'])
+    @commands.command(name='status', aliases=['customstatus', 'presence'])
     @commands.has_permissions(administrator=True)
     async def _status(self, ctx, *, message):
         """Set a custom playing status for the bot.
@@ -294,7 +294,7 @@ async def ping(self, ctx):
     @commands.has_permissions(administrator=True)
     async def mention(self, ctx, *, mention=None):
         """Changes what the bot mentions at the start of each thread."""
-        current = self.bot.config.get("mention", "@here")
+        current = self.bot.config.get('mention', '@here')
         em = discord.Embed(
             title='Current text',
             color=discord.Color.green(),
@@ -305,7 +305,7 @@ async def mention(self, ctx, *, mention=None):
             await ctx.send(embed=em)
         else:
             em.title = 'Changed mention!'
-            em.description = f'On thread creation the bot now says: {mention}'
+            em.description = f'On thread creation the bot now says {mention}'
             self.bot.config['mention'] = mention
             await self.bot.config.update()
             await ctx.send(embed=em)

core/config.py

@@ -5,6 +5,7 @@
 
 
 class ConfigManager:
+    """Class that manages a cached configuration"""
 
     def __init__(self, bot):
         self.bot = bot

core/paginator.py

@@ -81,7 +81,7 @@ async def show_page(self, index: int):
             await self.create_base(page)
 
     def react_check(self, reaction, user):
-        return user.id == self.ctx.author.id and reaction.emoji in self.reaction_map.keys()
+        return reaction.message == self.base and user.id == self.ctx.author.id and reaction.emoji in self.reaction_map.keys()
 
     async def run(self):
         if not self.running: