Merge branch 'modmail-api' of https://github.com/verixx/modmail into modmail-api

Author: kyb3r

cogs/modmail.py

@@ -379,7 +379,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:
@@ -390,4 +390,4 @@ async def unblock(self, ctx, id=None):
             await ctx.send(embed=em)
 
 def setup(bot):
-    bot.add_cog(Modmail(bot))
+    bot.add_cog(Modmail(bot))

cogs/utility.py

@@ -262,7 +262,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.
@@ -300,7 +300,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(),
@@ -311,7 +311,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)