Resolved a TODO

Author: Taaku18

CHANGELOG.md

@@ -248,7 +248,7 @@ Breaking changes.
 # v2.0.10
 
 ### Security
-- Fix a bug where blocked users were still able to message modmail.
+- Fix a bug where blocked users were still able to message Modmail.
 
 # v2.0.9
 
@@ -273,7 +273,7 @@ Improvements to commands and new config options available.
 ### Changed
 - You now have the ability to supply a reason when blocking a user.
 - Blocked users are now stored in the database instead of in the channel topic.
-    - This means you can delete the top channel in the modmail category now. (Migrate first though.)
+    - This means you can delete the top channel in the Modmail category now. (Migrate first though.)
 
 # v2.0.7
 
@@ -303,7 +303,7 @@ New command and improvements in bot update message interfaces.
 # v2.0.4
 
 ### Fixed
-- Fixed a one-off bug where the channel topic disappears, but modmail operations should still continue.
+- Fixed a one-off bug where the channel topic disappears, but Modmail operations should still continue.
 - Fixed `linked_message_id` issues.
 
 # v2.0.3

README.md

@@ -1,7 +1,7 @@
 <div align="center">
     <img src='https://i.imgur.com/o558Qnq.png' align='center'>
     <br>
-    <strong><i>A simple and functional modmail bot for Discord.</i></strong>
+    <strong><i>A simple and functional Modmail bot for Discord.</i></strong>
     <br>
     <br>
 

bot.py

@@ -357,7 +357,7 @@ async def process_modmail(self, message):
         blocked_em = discord.Embed(
             title='Message not sent!',
             color=discord.Color.red(),
-            description='You have been blocked from using modmail.'
+            description='You have been blocked from using Modmail.'
         )
 
         if str(message.author.id) in self.blocked_users:
@@ -518,7 +518,7 @@ async def validate_api_token(self):
                   'with a token from https://dashboard.modmail.tk')
             print('If you want to self-host logs, '
                   'input a MONGO_URI config variable.')
-            print('A modmail api token is not needed '
+            print('A Modmail api token is not needed '
                   'if you are self-hosting logs.')
             return await self.logout()
         else:
@@ -599,7 +599,7 @@ async def autoupdate_loop(self):
                 embed.set_author(name=user['username'] + ' - Updating Bot',
                                  icon_url=user['avatar_url'],
                                  url=user['url'])
-                embed.set_footer(text=f"Updating modmail v{self.version} "
+                embed.set_footer(text=f"Updating Modmail v{self.version} "
                                       f"-> v{metadata['latest_version']}")
 
                 changelog = await ChangeLog.from_repo(self)

cogs/modmail.py

@@ -136,7 +136,12 @@ async def move(self, ctx, *, category: discord.CategoryChannel):
         """Moves a thread to a specified category."""
         thread = await self.bot.threads.find(channel=ctx.channel)
         if not thread:
-            return await ctx.send('This is not a modmail thread.')
+            embed = discord.Embed(
+                title='Error',
+                description='This is not a Modmail thread.',
+                color=discord.Color.red()
+            )
+            return await ctx.send(embed=embed)
 
         await thread.channel.edit(category=category, sync_permissions=True)
         await ctx.message.add_reaction('✅')

cogs/utility.py

@@ -246,7 +246,7 @@ async def update(self, ctx):
             embed.set_author(name=user['username'],
                              icon_url=user['avatar_url'],
                              url=user['url'])
-            embed.set_footer(text=f'Updating modmail v{self.bot.version} '
+            embed.set_footer(text=f'Updating Modmail v{self.bot.version} '
                                   f"-> v{metadata['latest_version']}")
 
             if commit_data:
@@ -258,7 +258,6 @@ async def update(self, ctx):
                 embed.description = latest.description
                 for name, value in latest.fields.items():
                     embed.add_field(name=name, value=value)
-                # TODO: message unused?
                 # message = commit_data['commit']['message']
                 html_url = commit_data["html_url"]
                 short_sha = commit_data['sha'][:6]
@@ -306,7 +305,7 @@ async def activity(self, ctx, activity_type: str, *, message: str = ''):
 
         if activity_type == ActivityType.streaming:
             url = self.bot.config.get('twitch_url',
-                                      'https://www.twitch.tv/discord-modmail/')
+                                      'https://www.twitch.tv/discord-Modmail/')
         else:
             url = None
         activity = Activity(type=activity_type, name=message, url=url)
@@ -537,14 +536,23 @@ async def add_(self, ctx, name: str.lower, *, value):
         if 'aliases' not in self.bot.config.cache:
             self.bot.config['aliases'] = {}
 
-        # TODO: Make embed
         if self.bot.get_command(name) or self.bot.config.aliases.get(name):
-            return await ctx.send('A command or alias already exists '
-                                  f'with the same name: `{name}`')
+            embed = Embed(
+                title='Error',
+                color=Color.red(),
+                description='A command or alias already exists '
+                            f'with the same name: `{name}`.'
+            )
+            return await ctx.send(embed=embed)
 
         if not self.bot.get_command(value.split()[0]):
-            return await ctx.send('The command you are attempting to point '
-                                  f'to does not exist: `{value.split()[0]}`')
+            embed = Embed(
+                title='Error',
+                color=Color.red(),
+                description='The command you are attempting to point '
+                            f'to does not exist: `{value.split()[0]}`.'
+            )
+            return await ctx.send(embed=embed)
 
         self.bot.config.aliases[name] = value
         await self.bot.config.update()