Merge branch 'development' into development

Taaku18 · web-flow · commit 6cb71557914a · 2025-11-28T00:09:00.000-08:00
Signed-off-by: Taku &lt;45324516+Taaku18@users.noreply.github.com&gt;
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,32 @@ however, insignificant breaking changes do not guarantee a major version bump, s
 
 # v4.2.1
 
+### Added
+* `unsnooze_history_limit`: Limits the number of messages replayed when unsnoozing (genesis message and notes are always shown).
+* `snooze_behavior`: Choose between `delete` (legacy) or `move` behavior for snoozing.
+* `snoozed_category_id`: Target category for `move` snoozing; required when `snooze_behavior` is `move`.
+* Thread-creation menu: Adds an interactive select step before a thread channel is created.
+  * Commands:
+    * `threadmenu toggle`: Enable/disable the menu.
+    * `threadmenu show`: List current top-level options.
+    * `threadmenu option add`: Interactive wizard to create an option.
+    * `threadmenu option edit/remove/show`: Manage or inspect an existing option.
+    * `threadmenu submenu create/delete/list/show`: Manage submenus.
+    * `threadmenu submenu option add/edit/remove`: Manage options inside a submenu.
+  * Configuration / Behavior:
+    * Per-option `category` targeting when creating a thread; falls back to `main_category_id` if invalid/missing.
+    * Optional selection logging (`thread_creation_menu_selection_log`) posts the chosen option in the new thread.
+    * Anonymous prompt support (`thread_creation_menu_anonymous_menu`).
+
+### Changed
+- Renamed `max_snooze_time` to `snooze_default_duration`. The old config will be invalidated.
+- When `snooze_behavior` is set to `move`, the snoozed category now has a hard limit of 49 channels. New snoozes are blocked once it’s full until space is freed.
+- When switching `snooze_behavior` to `move` via `?config set`, the bot reminds admins to set `snoozed_category_id` if it’s missing.
+- Thread-creation menu options & submenu options now support an optional per-option `category` target. The interactive wizards (`threadmenu option add` / `threadmenu submenu option add`) and edit commands allow specifying or updating a category. If the stored category is missing or invalid at selection time, channel creation automatically falls back to `main_category_id`.
+
+
+# v4.2.0
+
 Upgraded discord.py to version 2.6.3, added support for CV2.
 Forwarded messages now properly show in threads, rather than showing as an empty embed.
 
@@ -18,7 +44,7 @@ Forwarded messages now properly show in threads, rather than showing as an empty
 - Eliminated duplicate logs and notes.
 - Addressed inconsistent use of `logkey` after ticket restoration.
 - Fixed issues with identifying the user who sent internal messages.
-- Solved an ancient bug where closing with words like `evening` wouldnt work.
+- Solved an ancient bug where closing with words like `evening` wouldn't work.
 - Fixed the command from being included in the reply  in rare conditions.
 
 ### Added
@@ -29,39 +55,16 @@ Commands:
 * `clearsnoozed`: Clears all snoozed items.
 
 Configuration Options:
-* `snooze_default_duration`: Sets the maximum duration for snooze.
+* `max_snooze_time`: Sets the maximum duration for snooze.
 * `snooze_title`: Customizes the title for snooze notifications.
 * `snooze_text`: Customizes the text for snooze notifications.
 * `unsnooze_text`: Customizes the text for unsnooze notifications.
 * `unsnooze_notify_channel`: Specifies the channel for unsnooze notifications.
-* `unsnooze_history_limit`: Limits the number of messages replayed when unsnoozing (genesis message and notes are always shown).
-* `snooze_behavior`: Choose between `delete` (legacy) or `move` behavior for snoozing.
-* `snoozed_category_id`: Target category for `move` snoozing; required when `snooze_behavior` is `move`.
 * `thread_min_characters`: Minimum number of characters required.
 * `thread_min_characters_title`: Title shown when the message is too short.
 * `thread_min_characters_response`: Response shown to the user if their message is too short.
 * `thread_min_characters_footer`: Footer displaying the minimum required characters.
 
-Features:
-* Thread-creation menu: Adds an interactive select step before a thread channel is created.
-  * Commands:
-    * `threadmenu toggle`: Enable/disable the menu.
-    * `threadmenu show`: List current top-level options.
-    * `threadmenu option add`: Interactive wizard to create an option.
-    * `threadmenu option edit/remove/show`: Manage or inspect an existing option.
-    * `threadmenu submenu create/delete/list/show`: Manage submenus.
-    * `threadmenu submenu option add/edit/remove`: Manage options inside a submenu.
-  * Configuration / Behavior:
-    * Per-option `category` targeting when creating a thread; falls back to `main_category_id` if invalid/missing.
-    * Optional selection logging (`thread_creation_menu_selection_log`) posts the chosen option in the new thread.
-    * Anonymous prompt support (`thread_creation_menu_anonymous_menu`).
-
-
-Behavioral changes:
-- When `snooze_behavior` is set to `move`, the snoozed category now has a hard limit of 49 channels. New snoozes are blocked once it’s full until space is freed.
-- When switching `snooze_behavior` to `move` via `?config set`, the bot reminds admins to set `snoozed_category_id` if it’s missing.
-- Thread-creation menu options & submenu options now support an optional per-option `category` target. The interactive wizards (`threadmenu option add` / `threadmenu submenu option add`) and edit commands allow specifying or updating a category. If the stored category is missing or invalid at selection time, channel creation automatically falls back to `main_category_id`.
-
 # v4.1.2
 
 ### Fixed
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@
   <br>
 
   <a href="#">
-    <img src="https://img.shields.io/badge/Latest%20Version-v4.1.2-7289da?style=for-the-badge&logo=data:image/gif;base64,R0lGODlhGAAYAPcAAAAAADQ+Yj5MdThCaEFOekNQfWt5e1lqfEdVhVpriVx1iVtsnFZpll1xlF1znFx5mGNtjGR7hWNzjGd5iWJunGNslmN0lGl1lGN5lWt7lWR0nGp1nWR5nGt8nHJ9l3J9jFxto1xtqlZqqF5zpF15pV10rVx5q1Z2ql1us150s114sV50uVd1smJupGNurGN0pGp1pGR6o2t7o2F0rml0rGR5rGt8q3J9pGNus2Fvu2Bzs2p2smR5s2t7tGF0u2N6vGp7u2l1uXJ+uGJ1wWV7w2l+xWl+yl5zwHWDiWyCmHODnHiGmHSLkW2CpGuEqnSCpHqMo3ODrHWKrXyMq3iHp3yTqGyEtWqFunKDs3uLtHSGvXSMvHuMu3eItnyTs3yTu3iUuW+RsV+ApmuCxG2Dy22LxnSMxHuMxHGGzXSLzXqLzXWFxXyTw3uSy3WSx26E0W+N2m+L1XKG03SL1XmL1HOL2HmL23WF2XiS1m+QyHOK4XmL4XaH4nGM5ImXm4WOlJSjnoOOq4OOpYSUrImXqJOcqYONt4OUtIybtIOUu4ycvImYt5OcuIyiqZekqYyiupOjvJurvJimtp+yvqKruae2ua23trLCucPHvIOMxoOUxIuaw4eYyJKbyISW1YiW0o2kyJWlxJqpxZWkzJury5aoxp6xxZ2zyZio1Jyy2Yuk0aOsyKOyxKOzzKy8zKq2yLO7xqOr1KSz1Ku706W026y73Ki21bK716u75LS95KSu4Zyx6bPDzLjGx63B2LPD1LTE3LvL3brI17/S2bbKzrTE47rF47zM5L3M67bH577R5L7R67zK8rjM8MLM3MPK1sTT3crU3MjW2dLZ2srUy8PN5MTO68nP68jL48TS5MnT5cbR68jS7M3b7Mva5dTb6MTO8srO8szF8MXR8snS8c3a8cnY+NXb9tDL7dnm6dzk8tro99Pq9uTp6+r17fr77eTr/efr+Oz09OXz/Ov0/e37/uj39fX19fX89fz+9vP1/fX9/f7//vr2/ODl4sK75yH5BAEAAAAALAAAAAAYABgAAAj/AAEAmFOnoMGDCAvGmRNHYMKHEOdIhEgRIcGKGDMeTJVO00WNBj194/frFik5IOvgqdaP371N26xpefORYq57/HI+s7Vtmy0eKCmmapcz575FPXt+SfHmociiRae1SroNWIoVTQ2uxAk15yJg1awl7ZSCaUE82uRxhTpt1TNXq0Ip2pSobIqCc0iVoqsI0ipXr1bhywfVXxYdiA3Sourz2dqc8lbNQJz4bDWqix73E7ZjhgrKOjYmvfWLbZcZqCdTPjjHGLdtibi2U5Q6NWiEqqq64ifvVe3at1nX2tTuWQ/QyIMfxHOGi+rkyeMklPMDuvWaBqlbj469IPUU2ykPCOw+53t4AAEBADs=">
+    <img src="https://img.shields.io/badge/Latest%20Version-v4.2.0-7289da?style=for-the-badge&logo=data:image/gif;base64,R0lGODlhGAAYAPcAAAAAADQ+Yj5MdThCaEFOekNQfWt5e1lqfEdVhVpriVx1iVtsnFZpll1xlF1znFx5mGNtjGR7hWNzjGd5iWJunGNslmN0lGl1lGN5lWt7lWR0nGp1nWR5nGt8nHJ9l3J9jFxto1xtqlZqqF5zpF15pV10rVx5q1Z2ql1us150s114sV50uVd1smJupGNurGN0pGp1pGR6o2t7o2F0rml0rGR5rGt8q3J9pGNus2Fvu2Bzs2p2smR5s2t7tGF0u2N6vGp7u2l1uXJ+uGJ1wWV7w2l+xWl+yl5zwHWDiWyCmHODnHiGmHSLkW2CpGuEqnSCpHqMo3ODrHWKrXyMq3iHp3yTqGyEtWqFunKDs3uLtHSGvXSMvHuMu3eItnyTs3yTu3iUuW+RsV+ApmuCxG2Dy22LxnSMxHuMxHGGzXSLzXqLzXWFxXyTw3uSy3WSx26E0W+N2m+L1XKG03SL1XmL1HOL2HmL23WF2XiS1m+QyHOK4XmL4XaH4nGM5ImXm4WOlJSjnoOOq4OOpYSUrImXqJOcqYONt4OUtIybtIOUu4ycvImYt5OcuIyiqZekqYyiupOjvJurvJimtp+yvqKruae2ua23trLCucPHvIOMxoOUxIuaw4eYyJKbyISW1YiW0o2kyJWlxJqpxZWkzJury5aoxp6xxZ2zyZio1Jyy2Yuk0aOsyKOyxKOzzKy8zKq2yLO7xqOr1KSz1Ku706W026y73Ki21bK716u75LS95KSu4Zyx6bPDzLjGx63B2LPD1LTE3LvL3brI17/S2bbKzrTE47rF47zM5L3M67bH577R5L7R67zK8rjM8MLM3MPK1sTT3crU3MjW2dLZ2srUy8PN5MTO68nP68jL48TS5MnT5cbR68jS7M3b7Mva5dTb6MTO8srO8szF8MXR8snS8c3a8cnY+NXb9tDL7dnm6dzk8tro99Pq9uTp6+r17fr77eTr/efr+Oz09OXz/Ov0/e37/uj39fX19fX89fz+9vP1/fX9/f7//vr2/ODl4sK75yH5BAEAAAAALAAAAAAYABgAAAj/AAEAmFOnoMGDCAvGmRNHYMKHEOdIhEgRIcGKGDMeTJVO00WNBj194/frFik5IOvgqdaP371N26xpefORYq57/HI+s7Vtmy0eKCmmapcz575FPXt+SfHmociiRae1SroNWIoVTQ2uxAk15yJg1awl7ZSCaUE82uRxhTpt1TNXq0Ip2pSobIqCc0iVoqsI0ipXr1bhywfVXxYdiA3Sourz2dqc8lbNQJz4bDWqix73E7ZjhgrKOjYmvfWLbZcZqCdTPjjHGLdtibi2U5Q6NWiEqqq64ifvVe3at1nX2tTuWQ/QyIMfxHOGi+rkyeMklPMDuvWaBqlbj469IPUU2ykPCOw+53t4AAEBADs=">
   </a>
 
   <br>
diff --git a/bot.py b/bot.py
@@ -953,10 +953,7 @@ async def process_dm_modmail(self, message: discord.Message) -> None:
                             )
                         )
                         return
-                    if self.config["dm_disabled"] in (
-                        DMDisabled.NEW_THREADS,
-                        DMDisabled.ALL_THREADS,
-                    ):
+                    if self.config["dm_disabled"] in (DMDisabled.NEW_THREADS, DMDisabled.ALL_THREADS):
                         embed = discord.Embed(
                             title=self.config["disabled_new_thread_title"],
                             color=self.error_color,
@@ -967,8 +964,7 @@ async def process_dm_modmail(self, message: discord.Message) -> None:
                             icon_url=self.get_guild_icon(guild=message.guild, size=128),
                         )
                         logger.info(
-                            "A new thread was blocked from %s due to disabled Modmail.",
-                            message.author,
+                            "A new thread was blocked from %s due to disabled Modmail.", message.author
                         )
                         await self.add_reaction(message, blocked_emoji)
                         return await message.channel.send(embed=embed)
@@ -984,10 +980,7 @@ async def process_dm_modmail(self, message: discord.Message) -> None:
                             text=self.config["disabled_current_thread_footer"],
                             icon_url=self.get_guild_icon(guild=message.guild, size=128),
                         )
-                        logger.info(
-                            "A message was blocked from %s due to disabled Modmail.",
-                            message.author,
-                        )
+                        logger.info("A message was blocked from %s due to disabled Modmail.", message.author)
                         await self.add_reaction(message, blocked_emoji)
                         return await message.channel.send(embed=embed)
                 # Extract forwarded content using utility function
@@ -1044,10 +1037,7 @@ def __init__(self, original_message, forwarded_content):
                                 )
                             )
                             return
-                        if self.config["dm_disabled"] in (
-                            DMDisabled.NEW_THREADS,
-                            DMDisabled.ALL_THREADS,
-                        ):
+                        if self.config["dm_disabled"] in (DMDisabled.NEW_THREADS, DMDisabled.ALL_THREADS):
                             embed = discord.Embed(
                                 title=self.config["disabled_new_thread_title"],
                                 color=self.error_color,
@@ -1058,8 +1048,7 @@ def __init__(self, original_message, forwarded_content):
                                 icon_url=self.get_guild_icon(guild=message.guild, size=128),
                             )
                             logger.info(
-                                "A new thread was blocked from %s due to disabled Modmail.",
-                                message.author,
+                                "A new thread was blocked from %s due to disabled Modmail.", message.author
                             )
                             await self.add_reaction(message, blocked_emoji)
                             return await message.channel.send(embed=embed)
@@ -1076,8 +1065,7 @@ def __init__(self, original_message, forwarded_content):
                                 icon_url=self.get_guild_icon(guild=message.guild, size=128),
                             )
                             logger.info(
-                                "A message was blocked from %s due to disabled Modmail.",
-                                message.author,
+                                "A message was blocked from %s due to disabled Modmail.", message.author
                             )
                             await self.add_reaction(message, blocked_emoji)
                             return await message.channel.send(embed=embed)
diff --git a/cogs/modmail.py b/cogs/modmail.py
@@ -99,6 +99,19 @@ def _resolve_user(self, user_str):
             return int(match.group(1))
         return None
 
+    def _resolve_user(self, user_str):
+        """Helper to resolve a user from mention, ID, or username."""
+        import re
+
+        if not user_str:
+            return None
+        if user_str.isdigit():
+            return int(user_str)
+        match = re.match(r"<@!?(\d+)>", user_str)
+        if match:
+            return int(match.group(1))
+        return None
+
     @commands.command()
     @trigger_typing
     @checks.has_permissions(PermissionLevel.OWNER)
@@ -220,8 +233,7 @@ async def snippet(self, ctx, *, name: str.lower = None):
                     description = format_description(i, names)
                     embed = discord.Embed(color=self.bot.main_color, description=description)
                     embed.set_author(
-                        name="Snippets",
-                        icon_url=self.bot.get_guild_icon(guild=ctx.guild, size=128),
+                        name="Snippets", icon_url=self.bot.get_guild_icon(guild=ctx.guild, size=128)
                     )
                     embeds.append(embed)
 
@@ -256,10 +268,7 @@ async def snippet(self, ctx, *, name: str.lower = None):
 
         embeds = [discord.Embed(color=self.bot.main_color) for _ in range((len(self.bot.snippets) // 10) + 1)]
         for embed in embeds:
-            embed.set_author(
-                name="Snippets",
-                icon_url=self.bot.get_guild_icon(guild=ctx.guild, size=128),
-            )
+            embed.set_author(name="Snippets", icon_url=self.bot.get_guild_icon(guild=ctx.guild, size=128))
 
         for i, snippet in enumerate(sorted(self.bot.snippets.items())):
             embeds[i // 10].add_field(
@@ -974,8 +983,7 @@ async def adduser(self, ctx, *users_arg: Union[discord.Member, discord.Role, str
             if self.bot.config["show_timestamp"]:
                 em.timestamp = discord.utils.utcnow()
             em.set_footer(
-                text=f"{users[0]}",
-                icon_url=users[0].display_avatar.url if users[0].display_avatar else None,
+                text=f"{users[0]}", icon_url=users[0].display_avatar.url if users[0].display_avatar else None
             )
 
             for i in ctx.thread.recipients:
@@ -1074,8 +1082,7 @@ async def removeuser(self, ctx, *users_arg: Union[discord.Member, discord.Role,
             if self.bot.config["show_timestamp"]:
                 em.timestamp = discord.utils.utcnow()
             em.set_footer(
-                text=f"{users[0]}",
-                icon_url=users[0].display_avatar.url if users[0].display_avatar else None,
+                text=f"{users[0]}", icon_url=users[0].display_avatar.url if users[0].display_avatar else None
             )
 
             for i in ctx.thread.recipients:
@@ -1171,8 +1178,7 @@ async def anonadduser(self, ctx, *users_arg: Union[discord.Member, discord.Role,
             if self.bot.config["show_timestamp"]:
                 em.timestamp = discord.utils.utcnow()
             em.set_footer(
-                text=f"{users[0]}",
-                icon_url=users[0].display_avatar.url if users[0].display_avatar else None,
+                text=f"{users[0]}", icon_url=users[0].display_avatar.url if users[0].display_avatar else None
             )
 
             for i in ctx.thread.recipients:
@@ -1263,8 +1269,7 @@ async def anonremoveuser(self, ctx, *users_arg: Union[discord.Member, discord.Ro
             if self.bot.config["show_timestamp"]:
                 em.timestamp = discord.utils.utcnow()
             em.set_footer(
-                text=f"{users[0]}",
-                icon_url=users[0].display_avatar.url if users[0].display_avatar else None,
+                text=f"{users[0]}", icon_url=users[0].display_avatar.url if users[0].display_avatar else None
             )
 
             for i in ctx.thread.recipients:
@@ -1859,8 +1864,7 @@ async def contact(
             if self.bot.config["show_timestamp"]:
                 em.timestamp = discord.utils.utcnow()
             em.set_footer(
-                text=f"{creator}",
-                icon_url=creator.display_avatar.url if creator.display_avatar else None,
+                text=f"{creator}", icon_url=creator.display_avatar.url if creator.display_avatar else None
             )
 
             for u in users:
diff --git a/cogs/utility.py b/cogs/utility.py
@@ -93,8 +93,7 @@ async def format_cog_help(self, cog, *, no_cog=False):
 
             name = cog.qualified_name + " - Help" if not no_cog else "Miscellaneous Commands"
             embed.set_author(
-                name=name,
-                icon_url=bot.user.display_avatar.url if bot.user.display_avatar else None,
+                name=name, icon_url=bot.user.display_avatar.url if bot.user.display_avatar else None
             )
 
             embed.set_footer(
diff --git a/core/thread.py b/core/thread.py
@@ -34,6 +34,7 @@
     DenyButton,
     ConfirmThreadCreationView,
     DummyParam,
+    extract_forwarded_content,
 )
 
 logger = getLogger(__name__)
@@ -700,18 +701,12 @@ async def _ensure_genesis(force: bool = False):
         if self.log_key:
             result = await self.bot.api.logs.update_one(
                 {"key": self.log_key},
-                {
-                    "$set": {"channel_id": str(channel.id)},
-                    "$unset": {"snoozed": "", "snooze_data": ""},
-                },
+                {"$set": {"channel_id": str(channel.id)}, "$unset": {"snoozed": "", "snooze_data": ""}},
             )
         else:
             result = await self.bot.api.logs.update_one(
                 {"recipient.id": str(self.id)},
-                {
-                    "$set": {"channel_id": str(channel.id)},
-                    "$unset": {"snoozed": "", "snooze_data": ""},
-                },
+                {"$set": {"channel_id": str(channel.id)}, "$unset": {"snoozed": "", "snooze_data": ""}},
             )
             if result.modified_count == 0:
                 result = await self.bot.api.logs.update_one(
@@ -1781,8 +1776,7 @@ async def send(
 
             # Create embed for note with Discord system message style
             embed = discord.Embed(
-                description=content,
-                color=0x5865F2,  # Discord blurple color for system messages
+                description=content, color=0x5865F2  # Discord blurple color for system messages
             )
 
             # Set author with note icon and username
@@ -1792,8 +1786,7 @@ async def send(
                 note_type = "Note"
 
             embed.set_author(
-                name=f"📝 {note_type} ({message.author.name})",
-                icon_url=message.author.display_avatar.url,
+                name=f"📝 {note_type} ({message.author.name})", icon_url=message.author.display_avatar.url
             )
 
             # Add timestamp if enabled
diff --git a/requirements.txt b/requirements.txt
@@ -44,4 +44,4 @@ urllib3==2.5.0; python_version >= '3.9'
 uvloop==0.22.1; sys_platform != 'win32'
 webencodings==0.5.1
 yarl==1.22.0; python_version >= '3.9'
-zstandard==0.25.0; python_version >= '3.9'
+zstandard==0.25.0; python_version >= '3.9'

Original file line number	Diff line number	Diff line change
`@@ -93,8 +93,7 @@ async def format_cog_help(self, cog, *, no_cog=False):`
`93`	`93`
`94`	`94`	`name = cog.qualified_name + " - Help" if not no_cog else "Miscellaneous Commands"`
`95`	`95`	`embed.set_author(`
`96`		`- name=name,`
`97`		`- icon_url=bot.user.display_avatar.url if bot.user.display_avatar else None,`
	`96`	`+ name=name, icon_url=bot.user.display_avatar.url if bot.user.display_avatar else None`
`98`	`97`	`)`
`99`	`98`
`100`	`99`	`embed.set_footer(`