pull from modmail#3352

Author: raidensakura

CHANGELOG.md

@@ -17,6 +17,7 @@ however, insignificant breaking changes do not guarantee a major version bump, s
 ### Added
 
 - `?snippet` command now include a truncated preview of a snippet's content.
+- Support for custom activities with `?activity custom <text>` ([PR #3352](https://github.com/modmail-dev/Modmail/pull/3352))
 
 ### Fixed
 

cogs/utility.py

@@ -482,11 +482,12 @@ async def activity(self, ctx, activity_type: str.lower, *, message: str = ""):
         Set an activity status for the bot.
 
         Possible activity types:
-            - `playing`
-            - `streaming`
-            - `listening`
-            - `watching`
-            - `competing`
+        - `playing`
+        - `streaming`
+        - `listening`
+        - `watching`
+        - `competing`
+        - `custom`
 
         When activity type is set to `listening`,
         it must be followed by a "to": "listening to..."
@@ -498,6 +499,9 @@ async def activity(self, ctx, activity_type: str.lower, *, message: str = ""):
         the linked twitch page:
         - `{prefix}config set twitch_url https://www.twitch.tv/somechannel/`
 
+        When activity type is set to `custom`, you can set
+        any custom text as the activity message.
+
         To remove the current activity status:
         - `{prefix}activity clear`
         """
@@ -528,6 +532,8 @@ async def activity(self, ctx, activity_type: str.lower, *, message: str = ""):
             msg += f"to {activity.name}."
         elif activity.type == ActivityType.competing:
             msg += f"in {activity.name}."
+        elif activity.type == ActivityType.custom:
+            msg = f"Custom activity set to: {activity.name}."
         else:
             msg += f"{activity.name}."
 
@@ -597,7 +603,9 @@ async def set_presence(self, *, status=None, activity_type=None, activity_messag
         elif activity_type == ActivityType.streaming:
             url = self.bot.config["twitch_url"]
 
-        if activity_type is not None:
+        if activity_type == ActivityType.custom:
+            activity = discord.CustomActivity(name=activity_message)
+        elif activity_type is not None:
             activity = discord.Activity(type=activity_type, name=activity_message, url=url)
         else:
             activity = None