Minor twiddling before refactor

rocketbot.py

@@ -189,24 +189,25 @@ class GuildContext:
 
     async def command_hello(self, message: Message) -> None:
         """
-        $hello command handler
+        Command handler
         """
         await message.channel.send(f'Hey there, {message.author.mention}!')
 
-    async def command_test_warn(self, context: Context) -> None:
+    async def command_testwarn(self, context: Context) -> None:
         """
-        $testwarn command handler
+        Command handler
         """
         if self.warning_channel is None:
             self.__trace('No warning channel set!')
             await context.message.channel.send('No warning channel set on this guild! Type ' +
-                '`$setwarningchannel` in the channel you want warnings to be posted.')
+                f'`{bot.command_prefix}{setwarningchannel.__name__}` in the channel you ' +
+                'want warnings to be posted.')
             return
         await self.__warn('Test warning. This is only a test.')
 
-    async def command_set_warning_channel(self, context: Context):
+    async def command_setwarningchannel(self, context: Context):
         """
-        $setwarningchannel command handler
+        Command handler
         """
         self.__trace(f'Warning channel set to {context.channel.name}')
         self.warning_channel = context.channel
@@ -214,9 +215,9 @@ class GuildContext:
         save_guild_context(self)
         await self.__warn('Warning messages will now be sent to ' + self.warning_channel.mention)
 
-    async def command_set_warning_mention(self, _context: Context, mention: str):
+    async def command_setwarningmention(self, _context: Context, mention: str):
         """
-        $setwarningmention command handler
+        Command handler
         """
         self.__trace('set warning mention')
         m = mention if mention is not None and len(mention) > 0 else None
@@ -227,9 +228,9 @@ class GuildContext:
         else:
             await self.__warn('Warning messages will now mention ' + m)
 
-    async def command_set_raid_warning_rate(self, _context: Context, count: int, seconds: int):
+    async def command_setraidwarningrate(self, _context: Context, count: int, seconds: int):
         """
-        $setraidwarningrate command handler
+        Command handler
         """
         self.join_warning_count = count
         self.join_warning_seconds = seconds
@@ -609,7 +610,7 @@ bot = commands.Bot(command_prefix=CONFIG['commandPrefix'], intents=intents)
 )
 async def hello(ctx: Context):
     """
-    $hello command handler
+    Command handler
     """
     gc: GuildContext = get_or_create_guild_context(ctx.guild)
     if gc is None:
@@ -626,12 +627,12 @@ async def hello(ctx: Context):
 @commands.has_permissions(manage_messages=True)
 async def testwarn(ctx: Context):
     """
-    $testwarn command handler
+    Command handler
     """
     gc: GuildContext = get_or_create_guild_context(ctx.guild)
     if gc is None:
         return
-    await gc.command_test_warn(ctx)
+    await gc.command_testwarn(ctx)
 
 @bot.command(
     brief='Sets the threshold for detecting a join raid.',
@@ -643,12 +644,12 @@ async def testwarn(ctx: Context):
 @commands.has_permissions(manage_messages=True)
 async def setraidwarningrate(ctx: Context, count: int, seconds: int):
     """
-    $setraidwarningrate command handler
+    Command handler
     """
     gc: GuildContext = get_or_create_guild_context(ctx.guild)
     if gc is None:
         return
-    await gc.command_set_raid_warning_rate(ctx, count, seconds)
+    await gc.command_setraidwarningrate(ctx, count, seconds)
 
 @bot.command(
     brief='Sets the current channel as the destination for bot warning messages.'
@@ -656,12 +657,12 @@ async def setraidwarningrate(ctx: Context, count: int, seconds: int):
 @commands.has_permissions(manage_messages=True)
 async def setwarningchannel(ctx: Context):
     """
-    $setwarningchannel command handler
+    Command handler
     """
     gc: GuildContext = get_or_create_guild_context(ctx.guild)
     if gc is None:
         return
-    await gc.command_set_warning_channel(ctx)
+    await gc.command_setwarningchannel(ctx)
 
 @bot.command(
     brief='Sets an optional mention to include in every warning message.',
@@ -672,12 +673,12 @@ async def setwarningchannel(ctx: Context):
 @commands.has_permissions(manage_messages=True)
 async def setwarningmention(ctx: Context, mention: str):
     """
-    $setwarningmention command handler
+    Command handler
     """
     gc: GuildContext = get_or_create_guild_context(ctx.guild)
     if gc is None:
         return
-    await gc.command_set_warning_mention(ctx, mention)
+    await gc.command_setwarningmention(ctx, mention)
 
 # -- Bot events -------------------------------------------------------------