modmail update QOL #3392

lorenzo132 · 2025-10-08T15:35:31Z

fix: raceconditions, thread duplication on unsnooze, message queue for accuracy on highload, escape mentions.
feat: unsnooze_history_limit, command queue during snooze process.

Make Modmail keep working when typing is disabled/outage

Signed-off-by: lorenzo132 <50767078+lorenzo132@users.noreply.github.com>

…evelopment into development

Corrected wording in the changelog entry regarding command inclusion in replies. Signed-off-by: lorenzo132 <50767078+lorenzo132@users.noreply.github.com>

Forwarded messages now display correctly in threads. Signed-off-by: lorenzo132 <50767078+lorenzo132@users.noreply.github.com>

…r accurasy on high load

Signed-off-by: lorenzo132 <50767078+lorenzo132@users.noreply.github.com>

…permissions on auto-created Snoozed Threads and sync perms on move; restore original overwrites on unsnooze; add capacity guard and config docs

…eplay and notifications)

… replay logic

…for snooze

feat(config): `unsnooze_history_limit`: Limits the number of messages replayed when unsnoozing (genesis message and notes are always shown).

lorenzo132 · 2025-11-09T20:23:45Z

The above suggested changes requested by sebkuip have been introduced.

sssmartfridge

Looks good overall, seems ready for testing

Update sponsors and bmac links

The logs command can be used anywhere again.

This PR fixes displaying the wrong guild icon in the thread_creation_response embed. When servers having a seperate server setup, the guild icon from the main guild should be displayed instead of the inbox guild.

…permission is missing

Copilot

Pull request overview

This PR introduces significant quality-of-life improvements to a Modmail bot, addressing race conditions, thread duplication issues, and adding new features like message queueing, configurable snooze behaviors, and an interactive thread-creation menu system.

Key Changes:

Implements message queueing per user to prevent race conditions during high load
Adds move-based snooze behavior as an alternative to channel deletion
Introduces an interactive thread-creation menu with category-specific routing
Improves command queueing during unsnooze operations to prevent conflicts

Reviewed changes

Copilot reviewed 12 out of 15 changed files in this pull request and generated 16 comments.

Show a summary per file

File	Description
requirements.txt	Updates pymongo (4.15.2→4.9.2) and motor (3.3.2→3.6.1) versions
core/utils.py	Adds debug logging for reference preview extraction failures; formatting improvements
core/time.py	Code formatting improvements only (multi-line function signatures)
core/thread.py	Major refactor: adds snooze move behavior, command queueing, race condition prevention, genesis message handling, and thread-creation menu integration
core/paginator.py	Minor formatting fix (spacing around operators)
core/models.py	Formatting improvements and enhanced logging configuration
core/config_help.json	Adds extensive documentation for new snooze and thread-creation menu options
core/config.py	Adds 20+ new configuration options for snooze behavior and thread menus
core/clients.py	Formatting improvements only
cogs/utility.py	Adds config pagination (15 fields/embed), snooze behavior validation warnings
cogs/threadmenu.py	New cog providing interactive thread-creation menu management commands
cogs/plugins.py	Formatting improvements only
cogs/modmail.py	Updates reply commands to pass content explicitly, adds auto-unsnooze task, scheduled close improvements
bot.py	Implements per-user message queue, stale thread detection, adds threadmenu cog
CHANGELOG.md	Documents new features and configuration options

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2025-11-22T20:21:29Z

cogs/threadmenu.py

+        new_description = None
+        if description.lower() == "skip":
+            new_description = conf["options"][key]["description"]


Variable new_description is not used.

Suggested change

new_description = None

if description.lower() == "skip":

new_description = conf["options"][key]["description"]

if description.lower() == "skip":

description = conf["options"][key]["description"]

Copilot · 2025-11-22T20:21:30Z

core/thread.py

@@ -1258,7 +1906,7 @@ async def send(
                    tag = str(get_top_role(author, self.bot.config["use_hoisted_top_role"]))


Variable tag is not used.

Copilot · 2025-11-22T20:21:30Z

core/thread.py

+                timeout = 20
+
+            options = self.bot.config.get("thread_creation_menu_options") or {}
+            submenus = self.bot.config.get("thread_creation_menu_submenus") or {}


Variable submenus is not used.

Suggested change

submenus = self.bot.config.get("thread_creation_menu_submenus") or {}

Copilot · 2025-11-22T20:21:30Z

cogs/modmail.py

+                    recipient = thread_data.get("recipient")
+                    if not recipient or not recipient.get("id"):
+                        continue
+                    thread_id = int(recipient.get("id"))


This assignment to 'thread_id' is unnecessary as it is redefined before this value is used.

Suggested change

thread_id = int(recipient.get("id"))

Copilot · 2025-11-22T20:21:30Z

core/thread.py

            return False
-        # Now safe to access self.snooze_data
+
+        # Cache some fields we need later (before we potentially clear snooze_data)
        snoozed_by = self.snooze_data.get("snoozed_by")


This assignment to 'snoozed_by' is unnecessary as it is redefined before this value is used.

Suggested change

snoozed_by = self.snooze_data.get("snoozed_by")

Copilot · 2025-11-22T20:21:32Z

cogs/modmail.py

+                    except (discord.Forbidden, discord.NotFound):
+                        pass


'except' clause does nothing but pass and there is no explanatory comment.

Suggested change

except (discord.Forbidden, discord.NotFound):

pass

except (discord.Forbidden, discord.NotFound) as e:

logger.debug(f"Failed to delete message (likely already deleted or lacking permissions): {e}")

Copilot · 2025-11-22T20:21:32Z

cogs/modmail.py

+            try:
+                await ctx.message.delete(delay=5)
+            except (discord.Forbidden, discord.NotFound):
+                pass


'except' clause does nothing but pass and there is no explanatory comment.

Suggested change

pass

logger.debug("Failed to delete message %s due to missing permissions or message not found.", ctx.message.id)

Copilot · 2025-11-22T20:21:32Z

core/thread.py

+                        regular_messages = regular_messages[-history_limit:]
+                        limited = True
+                except (ValueError, TypeError):
+                    pass


'except' clause does nothing but pass and there is no explanatory comment.

Suggested change

pass

logger.warning(

f"Invalid unsnooze_history_limit config value: {history_limit!r}. No history limit will be applied."

)

Copilot · 2025-11-22T20:21:33Z

cogs/threadmenu.py

+        if conf.get("embed_color"):
+            try:
+                await self.bot.config.set("thread_creation_menu_embed_color", conf.get("embed_color"))
+            except Exception:


'except' clause does nothing but pass and there is no explanatory comment.

Copilot · 2025-11-22T20:21:33Z

core/thread.py

+                    avatar_url = getattr(self.bot.user.display_avatar, "url", system_avatar_url)
+                else:
+                    name = str(author)
+                    avatar_url = avatar_url


This assignment assigns a variable to itself.

Suggested change

avatar_url = avatar_url

avatar_url = getattr(author.display_avatar, "url", system_avatar_url)

lorenzo132 and others added 30 commits October 4, 2025 13:07

fix: ignore typing failures

42070be

Make Modmail keep working when typing is disabled/outage

fix: only surpress failures

6683311

chore: sync local edits before push

71fd480

Fix: closing with timed words/ command in reply.

e764121

Fix: typing in changelog command.

7e3ce81

Merge branch 'development' into development

7dae055

Signed-off-by: lorenzo132 <50767078+lorenzo132@users.noreply.github.com>

Fix: closing with timed words (additional))

48c4d5a

Merge branch 'development' of https://github.com/lorenzo132/Modmail-D…

43658e0

…evelopment into development

Fix changelog entry for command reply issue

7e958fc

Corrected wording in the changelog entry regarding command inclusion in replies. Signed-off-by: lorenzo132 <50767078+lorenzo132@users.noreply.github.com>

Update CHANGELOG for v4.2.0 enhancements

e853585

Forwarded messages now display correctly in threads. Signed-off-by: lorenzo132 <50767078+lorenzo132@users.noreply.github.com>

fix; raceconditions, thread duplication on unsnooze, message queue fo…

d89f405

…r accurasy on high load

Update package versions in requirements.txt

aa28107

Signed-off-by: lorenzo132 <50767078+lorenzo132@users.noreply.github.com>

Merge branch 'development' into development

0990639

Signed-off-by: lorenzo132 <50767078+lorenzo132@users.noreply.github.com>

snooze(move): auto-unsnooze on reply/any mod message; enforce hidden …

6181467

…permissions on auto-created Snoozed Threads and sync perms on move; restore original overwrites on unsnooze; add capacity guard and config docs

unsnooze: suppress mentions during restore (AllowedMentions.none on r…

19c0668

…eplay and notifications)

Remove base64 snooze/unsnooze logic, fix notification crash, clean up…

0cb5150

… replay logic

fix: escape mentions on unsnooze

f46a668

Fix: Only create log URL button if valid, and robust channel restore …

7fc1359

…for snooze

black formatting

542d9f6

Unsnooze: prefix username (user_id) for plain-text replay messages

3ffea2c

feat: command queue during unsnooze process.

5e7802e

feat(config): `unsnooze_history_limit`: Limits the number of messages replayed when unsnoozing (genesis message and notes are always shown).

fix: contact while snooze returned as invalid channel

b0776da

Update thread.py

2b3a32c

fix: snooze timing

76f12f7

change: rename default snooze time config

b6d7431

fix: parsing

b60ddbe

fix: cache for snooze timer

15e6391

fix: Properly accessing nested data

07a0a77

rename: default_snooze_time -> snooze_default_duration

1654c26

improve unsnooze notify

e3f9f73

lorenzo132 added 4 commits November 9, 2025 20:42

codereviews response. Formatting (ruff)

0427d50

log instead of pass on exception

f6413c4

format

475fd77

higher delays

8c341fb

lorenzo132 added 3 commits November 10, 2025 14:14

black formatting, smoothen menu closure

f2e8766

smoothen which selecetion was made

6b727b4

solves the command from showing in the replies in rare cases

58da525

sssmartfridge reviewed Nov 10, 2025

View reviewed changes

lorenzo132 and others added 5 commits November 10, 2025 19:11

Update CHANGELOG.md

2364890

Merge pull request #6 from modmail-dev/development

2a91242

Update sponsors and bmac links

fix: typeerror

b757dea

fix: Remove thread-only restriction from logs command

37d3c32

The logs command can be used anywhere again.

Remove commands from being saved in DB.

c5ebb4a

StephenDaDev mentioned this pull request Nov 16, 2025

[BUG]: Replies sometimes include the command in the mod-facing thread messages #3388

Closed

lorenzo132 mentioned this pull request Nov 16, 2025

Allow ?logs [user] to be used outside of Modmail threads #3395

Closed

StephenDaDev mentioned this pull request Nov 16, 2025

Topics / Forms #3370

Closed

2 tasks

fix: correct guildpfp with sepserver setup - made by martin

337123f

This PR fixes displaying the wrong guild icon in the thread_creation_response embed. When servers having a seperate server setup, the guild icon from the main guild should be displayed instead of the inbox guild.

This was referenced Nov 16, 2025

Fix wrong guild icon #3371

Closed

Automatic thread creation config option #3377

Closed

Display Name #3372

Closed

fix: robust channel deletion handling, skip audit log attribution if …

da9a9ba

…permission is missing

Taaku18 requested a review from Copilot November 22, 2025 20:18

Copilot started reviewing on behalf of Taaku18 November 22, 2025 20:18 View session

Copilot finished reviewing on behalf of Taaku18 November 22, 2025 20:19

Copilot AI reviewed Nov 22, 2025

View reviewed changes

lorenzo132 added 4 commits November 22, 2025 21:27

update: use current reqs.txt as masterbranch

9510b19

sync: pip&pip lock with master

6c2bfef

Patch Thread Menu Editing Crash

e4f15fc

bump version

dd48ce7

		@@ -1258,7 +1906,7 @@ async def send(
		tag = str(get_top_role(author, self.bot.config["use_hoisted_top_role"]))

-                    except (discord.Forbidden, discord.NotFound):
-                        pass
+                    except (discord.Forbidden, discord.NotFound) as e:
+                        logger.debug(f"Failed to delete message (likely already deleted or lacking permissions): {e}")

	pass
	logger.debug("Failed to delete message %s due to missing permissions or message not found.", ctx.message.id)

-                    pass
+                    logger.warning(
+                        f"Invalid unsnooze_history_limit config value: {history_limit!r}. No history limit will be applied."
+                    )

	avatar_url = avatar_url
	avatar_url = getattr(author.display_avatar, "url", system_avatar_url)

Uh oh!

modmail update QOL #3392

Are you sure you want to change the base?

modmail update QOL #3392

Uh oh!

Conversation

lorenzo132 commented Oct 8, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

lorenzo132 commented Nov 9, 2025

Uh oh!

sssmartfridge left a comment

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Nov 22, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Nov 22, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Nov 22, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Nov 22, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Nov 22, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Nov 22, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Nov 22, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Nov 22, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Nov 22, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Nov 22, 2025

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

lorenzo132 commented Oct 8, 2025 •

edited

Loading