Fixed a problem where "?activity listening to music" will result in "listening to to music"

Author: Taaku18

bot.py

@@ -249,21 +249,6 @@ async def on_connect(self):
         print(Fore.CYAN + 'Connected to gateway.')
 
         await self.config.refresh()
-
-        activity_type = self.config.get('activity_type')
-        message = self.config.get('activity_message')
-
-        if activity_type is not None and message:
-            if activity_type == ActivityType.streaming:
-
-                url = self.config.get('twitch_url',
-                                      'https://www.twitch.tv/discord-modmail/')
-            else:
-                url = None
-
-            activity = discord.Activity(type=activity_type, name=message,
-                                        url=url)
-            await self.change_presence(activity=activity)
         self._connected.set()
 
     async def on_ready(self):
@@ -284,10 +269,48 @@ async def on_ready(self):
         else:
             await self.threads.populate_cache()
 
-        # Wait until config cache is popluated with stuff from db
+        # Wait until config cache is populated with stuff from db
         await self.config.wait_until_ready()
 
+        # activities
+        activity_type = self.config.get('activity_type', -1)
+        message = self.config.get('activity_message', '')
+
+        normalized_message = ''
+        try:
+            activity_type = ActivityType(activity_type)
+        except ValueError:
+            activity_type = -1
+
+        if activity_type >= 0 and message:
+            if activity_type == ActivityType.listening:
+                if message.lower().startswith('to '):
+                    # Must be listening to...
+                    normalized_message = message[3:].strip()
+            else:
+                normalized_message = message.strip()
+
+        if normalized_message:
+            if activity_type == ActivityType.streaming:
+                url = self.config.get('twitch_url',
+                                      'https://www.twitch.tv/discord-modmail/')
+            else:
+                url = None
+
+            activity = discord.Activity(type=activity_type,
+                                        name=normalized_message,
+                                        url=url)
+            await self.change_presence(activity=activity)
+            # TODO: Trim message
+            print(f'{Fore.CYAN}Activity set to: '
+                  f'{activity_type.name} {message}.')
+        else:
+            print(f'{Fore.CYAN}No activity message set.')
+
+        # closures
         closures = self.config.closures.copy()
+        print(f'{Fore.CYAN}There are {len(closures)} thread(s) pending '
+              'to be closed.')
 
         for recipient_id, items in closures.items():
             after = (datetime.fromisoformat(items['time']) -
@@ -313,6 +336,7 @@ async def on_ready(self):
                 delete_channel=items['delete_channel'],
                 message=items['message']
             )
+        print(LINE)
 
     async def process_modmail(self, message):
         """Processes messages sent to the bot."""

cogs/utility.py

@@ -283,6 +283,9 @@ async def activity(self, ctx, activity_type: str, *, message: str = ''):
             - `clear`
 
         When activity type is set to `clear`, the current activity is removed.
+
+        When activity type is set to `listening`,
+        it must be followed by a "to": "listening to..."
         """
         if activity_type == 'clear':
             await self.bot.change_presence(activity=None)
@@ -299,16 +302,28 @@ async def activity(self, ctx, activity_type: str, *, message: str = ''):
             raise commands.UserInputError
 
         try:
-            activity_type = ActivityType[activity_type]
+            activity_type = ActivityType[activity_type.lower()]
         except KeyError:
             raise commands.UserInputError
 
+        if activity_type == ActivityType.listening:
+            if not message.lower().startswith('to '):
+                # Must be listening to...
+                raise commands.UserInputError
+            normalized_message = message[3:].strip()
+        else:
+            # Discord does not allow leading/trailing spaces anyways
+            normalized_message = message.strip()
+
         if activity_type == ActivityType.streaming:
             url = self.bot.config.get('twitch_url',
                                       'https://www.twitch.tv/discord-Modmail/')
         else:
             url = None
-        activity = Activity(type=activity_type, name=message, url=url)
+
+        activity = Activity(type=activity_type,
+                            name=normalized_message,
+                            url=url)
         await self.bot.change_presence(activity=activity)
 
         self.bot.config['activity_type'] = activity_type