v3.0.3 snippets/alias edit

Author: Taaku18

CHANGELOG.md

@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+
+# v3.0.3
+
+### Added
+
+- New commands, `?alias edit <name> <target>` and `?snippets edit <name> <target>`.
+  - They can be used to edit aliases and snippets respectively.
+
 # v3.0.2
 
 ### Added

bot.py

@@ -1,4 +1,4 @@
-__version__ = "3.0.2"
+__version__ = "3.0.3"
 
 import asyncio
 import logging
@@ -271,6 +271,10 @@ def main_category(self) -> typing.Optional[discord.TextChannel]:
     def blocked_users(self) -> typing.Dict[str, str]:
         return self.config.get("blocked", {})
 
+    @property
+    def blocked_whitelisted_users(self) -> typing.List[str]:
+        return self.config.get("blocked_whitelist", [])
+
     @property
     def prefix(self) -> str:
         return self.config.get("prefix", "?")
@@ -443,7 +447,7 @@ async def retrieve_emoji(self) -> typing.Tuple[str, str]:
     async def _process_blocked(self, message: discord.Message) -> bool:
         sent_emoji, blocked_emoji = await self.retrieve_emoji()
 
-        if str(message.author.id) in self.config.blocked_whitelist:
+        if str(message.author.id) in self.blocked_whitelisted_users:
             if str(message.author.id) in self.blocked_users:
                 del self.config.blocked[str(message.author.id)]
                 await self.config.update()

cogs/modmail.py

@@ -147,15 +147,21 @@ async def snippets_add(self, ctx, name: str.lower, *, value):
         {prefix}snippets add "two word" this is a two word snippet.
         ```
         """
+        if name in self.bot.config.snippets:
+            embed = discord.Embed(
+                title="Error",
+                color=discord.Color.red(),
+                description=f"Snippet `{name}` already exists.",
+            )
+        else:
+            self.bot.config.snippets[name] = value
+            await self.bot.config.update()
 
-        self.bot.config.snippets[name] = value
-        await self.bot.config.update()
-
-        embed = discord.Embed(
-            title="Added snippet",
-            color=self.bot.main_color,
-            description=f"`{name}` points to: {value}",
-        )
+            embed = discord.Embed(
+                title="Added snippet",
+                color=self.bot.main_color,
+                description=f'`{name}` will now send "{value}".',
+            )
 
         await ctx.send(embed=embed)
 
@@ -164,7 +170,7 @@ async def snippets_add(self, ctx, name: str.lower, *, value):
     async def snippets_remove(self, ctx, *, name: str.lower):
         """Remove a snippet."""
 
-        if self.bot.config.snippets.get(name):
+        if name in self.bot.config.snippets:
             embed = discord.Embed(
                 title="Removed snippet",
                 color=self.bot.main_color,
@@ -182,6 +188,27 @@ async def snippets_remove(self, ctx, *, name: str.lower):
 
         await ctx.send(embed=embed)
 
+    @snippets.command(name="edit")
+    @checks.has_permissions(PermissionLevel.SUPPORTER)
+    async def snippets_edit(self, ctx, name: str.lower, *, value):
+        if name in self.bot.config.snippets:
+            self.bot.config.snippets[name] = value
+            await self.bot.config.update()
+
+            embed = discord.Embed(
+                title="Edited snippet",
+                color=self.bot.main_color,
+                description=f'`{name}` will now send "{value}".',
+            )
+
+        else:
+            embed = discord.Embed(
+                title="Error",
+                color=discord.Color.red(),
+                description=f"Snippet `{name}` does not exist.",
+            )
+        await ctx.send(embed=embed)
+
     @commands.command()
     @checks.has_permissions(PermissionLevel.MODERATOR)
     @checks.thread_only()
@@ -193,7 +220,11 @@ async def move(self, ctx, *, category: discord.CategoryChannel):
         """
         thread = ctx.thread
         await thread.channel.edit(category=category, sync_permissions=True)
-        await ctx.message.add_reaction("✅")
+        sent_emoji, _ = await self.bot.retrieve_emoji()
+        try:
+            await ctx.message.add_reaction(sent_emoji)
+        except (discord.HTTPException, discord.InvalidArgument):
+            pass
 
     @staticmethod
     async def send_scheduled_close_message(ctx, after, silent=False):
@@ -823,16 +854,16 @@ async def blocked_whitelist(self, ctx, *, user: User = None):
         mention = getattr(user, "mention", f"`{user.id}`")
         msg = ""
 
-        if str(user.id) in self.bot.config.blocked_whitelist:
+        if str(user.id) in self.bot.blocked_whitelisted_users:
             embed = discord.Embed(
                 title="Success",
                 description=f"{mention} is no longer whitelisted.",
                 color=self.bot.main_color,
             )
-            self.bot.config.blocked_whitelist.remove(str(user.id))
+            self.bot.blocked_whitelisted_users.remove(str(user.id))
             return await ctx.send(embed=embed)
 
-        self.bot.config.blocked_whitelist.append(str(user.id))
+        self.bot.blocked_whitelisted_users.append(str(user.id))
 
         if str(user.id) in self.bot.blocked_users:
             msg = self.bot.blocked_users.get(str(user.id))
@@ -891,7 +922,7 @@ async def block(
 
         mention = getattr(user, "mention", f"`{user.id}`")
 
-        if str(user.id) in self.bot.config.blocked_whitelist:
+        if str(user.id) in self.bot.blocked_whitelisted_users:
             embed = discord.Embed(
                 title="Error",
                 description=f"Cannot block {mention}, user is whitelisted.",

cogs/utility.py

@@ -838,7 +838,7 @@ async def alias_add(self, ctx, name: str.lower, *, value):
         if "aliases" not in self.bot.config.cache:
             self.bot.config["aliases"] = {}
 
-        if self.bot.get_command(name) or self.bot.config.aliases.get(name):
+        if self.bot.get_command(name) or name in self.bot.config.aliases:
             embed = Embed(
                 title="Error",
                 color=Color.red(),
@@ -847,22 +847,22 @@ async def alias_add(self, ctx, name: str.lower, *, value):
             )
             return await ctx.send(embed=embed)
 
-        if not self.bot.get_command(value.split()[0]):
+        linked_command = value.split()[0]
+        if not self.bot.get_command(linked_command):
             embed = Embed(
                 title="Error",
                 color=Color.red(),
                 description="The command you are attempting to point "
-                f"to does not exist: `{value.split()[0]}`.",
+                f"to does not exist: `{linked_command}`.",
             )
-            return await ctx.send(embed=embed)
 
         self.bot.config.aliases[name] = value
         await self.bot.config.update()
 
         embed = Embed(
             title="Added alias",
             color=self.bot.main_color,
-            description=f"`{name}` points to: {value}",
+            description=f'`{name}` points to: "{value}".',
         )
 
         return await ctx.send(embed=embed)
@@ -875,7 +875,7 @@ async def alias_remove(self, ctx, *, name: str.lower):
         if "aliases" not in self.bot.config.cache:
             self.bot.config["aliases"] = {}
 
-        if self.bot.config.aliases.get(name):
+        if name in self.bot.config.aliases:
             del self.bot.config["aliases"][name]
             await self.bot.config.update()
 
@@ -894,6 +894,50 @@ async def alias_remove(self, ctx, *, name: str.lower):
 
         return await ctx.send(embed=embed)
 
+    @alias.command(name="edit")
+    @checks.has_permissions(PermissionLevel.MODERATOR)
+    async def alias_edit(self, ctx, name: str.lower, *, value):
+        if "aliases" not in self.bot.config.cache:
+            self.bot.config["aliases"] = {}
+
+        if name not in self.bot.config.aliases:
+            embed = Embed(
+                title="Error",
+                color=Color.red(),
+                description=f"Alias `{name}` does not exist.",
+            )
+
+            return await ctx.send(embed=embed)
+
+        if self.bot.get_command(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)
+
+        linked_command = value.split()[0]
+        if not self.bot.get_command(linked_command):
+            embed = Embed(
+                title="Error",
+                color=Color.red(),
+                description="The command you are attempting to point "
+                f"to does not exist: `{linked_command}`.",
+            )
+            return await ctx.send(embed=embed)
+
+        self.bot.config.aliases[name] = value
+        await self.bot.config.update()
+
+        embed = Embed(
+            title="Edited alias",
+            color=self.bot.main_color,
+            description=f'`{name}` now points to: "{value}".',
+        )
+        return await ctx.send(embed=embed)
+
     @commands.group(aliases=["perms"], invoke_without_command=True)
     @checks.has_permissions(PermissionLevel.OWNER)
     async def permissions(self, ctx):