v2.13.10 fixed activity/status problem

Author: Taaku18

CHANGELOG.md

@@ -4,6 +4,12 @@ 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).
 
+# v2.13.10
+
+### Fixed
+- Fixed an issue where status and activity does not work if they were modified wrongly in the database.
+  - This was especially an issue for older Modmail users, as the old `status` configuration variable clashes with the new `status` variable.
+
 # v2.13.9
 
 ### Fixed

bot.py

@@ -22,7 +22,7 @@
 SOFTWARE.
 """
 
-__version__ = '2.13.9'
+__version__ = '2.13.10'
 
 import asyncio
 import logging

cogs/utility.py

@@ -430,7 +430,7 @@ async def activity(self, ctx, activity_type: str.lower, *, message: str = ''):
             self.bot.config['activity_type'] = None
             self.bot.config['activity_message'] = None
             await self.bot.config.update()
-            await self.set_presence(log=False)
+            await self.set_presence()
             embed = Embed(
                 title='Activity Removed',
                 color=self.bot.main_color
@@ -440,14 +440,12 @@ async def activity(self, ctx, activity_type: str.lower, *, message: str = ''):
         if not message:
             raise commands.UserInputError
 
-        try:
-            activity, msg = (await self.set_presence(
+        activity, msg = (await self.set_presence(
                 activity_identifier=activity_type,
                 activity_by_key=True,
-                activity_message=message,
-                log=False
-            ))['activity']
-        except ValueError:
+                activity_message=message
+         ))['activity']
+        if activity is None:
             raise commands.UserInputError
 
         self.bot.config['activity_type'] = activity.type.value
@@ -480,21 +478,19 @@ async def status(self, ctx, *, status_type: str.lower):
         if status_type == 'clear':
             self.bot.config['status'] = None
             await self.bot.config.update()
-            await self.set_presence(log=False)
+            await self.set_presence()
             embed = Embed(
                 title='Status Removed',
                 color=self.bot.main_color
             )
             return await ctx.send(embed=embed)
         status_type = status_type.replace(' ', '_')
 
-        try:
-            status, msg = (await self.set_presence(
+        status, msg = (await self.set_presence(
                 status_identifier=status_type,
                 status_by_key=True,
-                log=False
-            ))['status']
-        except ValueError:
+        ))['status']
+        if status is None:
             raise commands.UserInputError
 
         self.bot.config['status'] = status.value
@@ -512,8 +508,7 @@ async def set_presence(self, *,
                            status_by_key=True,
                            activity_identifier=None,
                            activity_by_key=True,
-                           activity_message=None,
-                           log=True):
+                           activity_message=None):
 
         activity = status = None
         if status_identifier is None:
@@ -528,10 +523,7 @@ async def set_presence(self, *,
         except (KeyError, ValueError):
             if status_identifier is not None:
                 msg = f'Invalid status type: {status_identifier}'
-                if log:
-                    logger.warning(error(msg))
-                else:
-                    raise ValueError(msg)
+                logger.warning(error(msg))
 
         if activity_identifier is None:
             if activity_message is not None:
@@ -548,10 +540,7 @@ async def set_presence(self, *,
         except (KeyError, ValueError):
             if activity_identifier is not None:
                 msg = f'Invalid activity type: {activity_identifier}'
-                if log:
-                    logger.warning(error(msg))
-                else:
-                    raise ValueError(msg)
+                logger.warning(error(msg))
         else:
             url = None
             activity_message = (
@@ -575,10 +564,7 @@ async def set_presence(self, *,
                                     url=url)
             else:
                 msg = 'You must supply an activity message to use custom activity.'
-                if log:
-                    logger.warning(error(msg))
-                else:
-                    raise ValueError(msg)
+                logger.warning(error(msg))
 
         await self.bot.change_presence(activity=activity, status=status)