Merge pull request #36 from matthewflegg/dev

Bug fixes and UI improvements

Author: v0idzdev

cogs/admin/admin_cog.py

@@ -39,11 +39,10 @@ async def clear(self, ctx: commands.Context, amount: int | None):
         ```
         """
         if isinstance(amount, int) and amount is not None:
-            await ctx.channel.purge(limit=amount)
-            return await ctx.send(f"🛠️ Deleted **{amount}** messages.")
+            return await ctx.channel.purge(limit=amount)
 
         embed = discord.Embed(
-            title="⚠️ You have not selected a number of messages to clear.",
+            title="⚠️ You Have Not Selected a Number of Messages to Clear",
             description="❓ Would you like to clear all messages in this channel?",
         )
 
@@ -87,6 +86,8 @@ async def softban(
         """
         ⚙️ Temporarily bans a member from a server.
 
+        ❓ If a number of days is not specified, the user is kicked for 1 day.
+
         Usage:
         ```
         ~softban <member> [days] [reason]
@@ -125,27 +126,29 @@ async def blacklist(self, ctx: commands.Context, *, words: str = None):
         if not words:
             view = BlacklistAddView(ctx)
             embed = discord.Embed(
-                title="🛠️ Please enter one or more words to blacklist."
+                title="🛠️ Please Enter One or More Words to Blacklist"
             )
             view.message = await ctx.send(embed=embed, view=view)
             return
 
         id = str(ctx.guild.id)
-        words = [word.lower() for word in words.split(" ")]
+        words = {word.strip().lower() for word in words.split(" ")} - {
+            ""
+        }  # Remove empty strings ''
 
         blacklist = self.client.cache.blacklist
         if id not in blacklist.keys():
             blacklist[id] = []
 
         # Remove words that are already in the blacklist from the words to add.
         # Make a copy so we can add a footer if any words were removed
-        words_ = set(words) - set(blacklist[id])
+        words_ = words - set(blacklist[id])
 
         # If the list of words is zero, we know that none of the words
         # can be added. So, send an error message
         if not words_:
-            return await ctx.send(
-                f"❌ {ctx.author.mention}: Sorry. Those words are already in the blacklist."
+            return await ctx.reply(
+                f"❌ Those words are already in the blacklist.", delete_after=20
             )
 
         # If duplicate words have been removed, add non-duplicates
@@ -156,7 +159,7 @@ async def blacklist(self, ctx: commands.Context, *, words: str = None):
         self.client.update_json(FILEPATH, blacklist)
 
         embed = discord.Embed(
-            title=f"🛠️ Words successfully added.",
+            title=f"🛠️ Words Successfully Added",
             description=" ".join(f"`{word}`" for word in words_),
         )
 
@@ -178,15 +181,14 @@ async def clearblacklist(self, ctx: commands.Context):
         """
         id = str(ctx.guild.id)
         blacklist = self.client.cache.blacklist
-        mention = ctx.author.mention
 
         if id not in blacklist.keys():
-            return await ctx.send(
-                f"❌ {mention}: This server does not have any words blacklisted."
+            return await ctx.reply(
+                f"❌ This server does not have any words blacklisted.", delete_after=20
             )
 
         embed = discord.Embed(
-            title=f"⚠️ Are you sure you'd like to clear your server's blacklist?\n",
+            title=f"⚠️ Are You Sure You'd Like to Clear Your Server's Blacklist?\n",
             description=f"❗ This action cannot be undone.",
         )
 
@@ -208,11 +210,11 @@ async def showblacklist(self, ctx: commands.Context):
         server_id = str(ctx.guild.id)
 
         if server_id not in blacklist.keys() or not blacklist[server_id]:
-            return await ctx.send(
-                f"❌ {ctx.author.mention}: This server does not have any words blacklisted."
+            return await ctx.reply(
+                f"❌ This server does not have any words blacklisted.", delete_after=20
             )
 
-        embed = discord.Embed(title="⛔ Blacklist:")
+        embed = discord.Embed(title="⛔ Blacklist")
         embed.description = "".join([f" `{word}` " for word in blacklist[server_id]])
 
         await ctx.send(embed=embed)
@@ -230,30 +232,30 @@ async def blacklistremove(self, ctx: commands.Context, *, words: str = None):
         """
         if not words:
             view = BlacklistRemoveView(ctx)
-            embed = discord.Embed(
-                title="🛠️ Please enter one or more words to remove from the blacklist."
-            )
+            embed = discord.Embed(title="🛠️ Please Enter One or More Words to Remove")
 
             view.message = await ctx.send(embed=embed, view=view)
             return
 
         id = str(ctx.guild.id)
-        words = {word.lower() for word in words.split(" ")}
+        words = {word.strip().lower() for word in words.split(" ")} - {
+            ""
+        }  # Remove empty strings ''
 
         blacklist = self.client.cache.blacklist
 
         if id not in blacklist.keys():
-            return await ctx.send(
-                f"❌ {ctx.author.mention}: This server does not have any words blacklisted."
+            return await ctx.reply(
+                f"❌ This server does not have any words blacklisted.", delete_after=20
             )
 
         # Only remove words that are already in the blacklist from the words to remove.
         # Make a copy so we can add a footer if any words were removed
         words_ = words & set(blacklist[id])
 
         if not words_:
-            return await ctx.send(
-                f"❌ {ctx.author.mention}: Sorry. Those words are not in the blacklist."
+            return await ctx.reply(
+                f"❌ Those words are not in the blacklist.", delete_after=20
             )
 
         # If duplicate words have been removed, remove non-duplicates
@@ -264,7 +266,7 @@ async def blacklistremove(self, ctx: commands.Context, *, words: str = None):
         self.client.update_json(FILEPATH, blacklist)
 
         embed = discord.Embed(
-            title=f"🛠️ Words successfully removed.",
+            title=f"🛠️ Words Successfully Removed",
             description=" ".join(f"`{word}`" for word in words_),
         )
 

cogs/help/help_cog.py

@@ -50,10 +50,6 @@ async def docs(self, ctx: commands.Context):
             icon_url="https://imagemagick.org/image/convex-hull.png",
         )
 
-        embed.set_thumbnail(
-            url="https://media.istockphoto.com/vectors/robot-avatar-icon-vector-id908807494?k=20&m=908807494&s=612x612&w=0&h=N050SIC8pgzsf_LaJT-ZyEE6HHMXLU5PYfMpixuinas="
-        )
-
         embed.set_footer(
             text="Contribute to the open source Beep Boop Bot GitHub repository."
         )

cogs/help/help_command.py

@@ -74,8 +74,8 @@ async def send_bot_help(self, mapping: dict):
         Sends a bot help command.
         """
         embed = await self.help_embed(
-            title="Bot Commands",
-            description="BB.Bot commands. See our GitHub repository for more information."
+            title="📝 Bot Commands",
+            description="❓ BB.Bot's full command list. See our GitHub repository for more information."
             + f"\n\nUse **~help <command name>** for more information about a command."
             + f"\nUse **~help <cog name>** for more information about a cog.",
             mapping=mapping,

cogs/misc/misc_cog.py

@@ -21,7 +21,7 @@ def __init__(self, client: commands.Bot):
         self.client = client
 
     @commands.command()
-    async def twitch(self, ctx: commands.Context, *, name: str):
+    async def twitch(self, ctx: commands.Context, *, name: str = None):
         """
         🎲 Shows information about a Twitch stream.
 
@@ -36,8 +36,13 @@ async def twitch(self, ctx: commands.Context, *, name: str):
         /twitch <streamer name>
         ```
         """
+        if name is None:
+            return await ctx.reply(
+                f"❌ You need to specify a streamer name.", delete_after=20
+            )
+
         client = self.client.twitch
-        name = name.lower()
+        name = name.strip().lower()
         broadcaster_data = await client.connect("helix/users", login=name)
         broad_list = broadcaster_data["data"]
 
@@ -48,8 +53,8 @@ async def twitch(self, ctx: commands.Context, *, name: str):
             json = await client.connect("helix/streams", user_id=str(broadcaster_id))
 
             if not json["data"]:
-                return await ctx.send(
-                    f":x: {ctx.author.mention}: {broadcaster_name} isn't live."
+                return await ctx.reply(
+                    f"❌ **{broadcaster_name}** isn't live.", delete_after=20
                 )
 
             stream: TwitchBroadcast = await client.return_information(json)
@@ -82,8 +87,8 @@ async def twitch(self, ctx: commands.Context, *, name: str):
 
             return await ctx.send(embed=embed, file=file)
 
-        return await ctx.send(
-            f":x: {ctx.author.mention}: I couldn't find a streamer with the name '{name}'."
+        return await ctx.reply(
+            f":x: I couldn't find a streamer with the name '{name}'.", delete_after=20
         )
 
     @commands.command()
@@ -105,15 +110,16 @@ async def choose(self, ctx: commands.Context, *choices: str):
         # Display some error messages if the user's input is invalid.
         # This is because it's kinda awkward to do this in the on_command_error event.
         if len(choices) < 1:
-            return await ctx.send(
-                f":x: {ctx.author.mention}: You need to give me choices to choose from."
+            return await ctx.reply(
+                f":x: You need to give me choices to choose from.", delete_after=20
             )
         if len(choices) == 1:
-            return await ctx.send(
-                f":x: {ctx.author.mention}: I need more than one choice!"
-            )
+            return await ctx.reply(f":x: I need more than one choice!", delete_after=20)
 
-        embed = discord.Embed(title=f"🎲 I choose {random.choice(choices)}")
+        embed = discord.Embed(
+            title=f"🎲 I Choose",
+            description=f"```{random.choice(choices)}```",
+        )
         await ctx.send(embed=embed)
 
     @commands.command()
@@ -158,7 +164,7 @@ async def poll(self, ctx: commands.Context, *poll: str):
         """
         if not poll:
             return await ctx.reply(
-                f":x: {ctx.author.mention}: You need to specify a question."
+                f":x: You need to specify a question.", delete_after=20
             )
 
         embed = discord.Embed(