Skip to content

Fix issue with message listeners firing in DMs #181

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Xarlos89 merged 1 commit into from
Aug 23, 2026
+10 −8
Merged

Fix issue with message listeners firing in DMs #181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/bot/cogs/logging/logging_message_delete.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,10 +122,11 @@ async def on_message_delete(self, message) -> None:
"""
If a mod deletes, take the audit log event. If a user deletes, handle it normally.
"""
if (
message.author.guild.id != int(os.getenv("MASTER_GUILD", 0))
or message.author.guild.id is None
):
if message.guild is None:
logger.debug(">> on_message_delete fired in DMs. Ignoring event.")
return

if message.guild.id != int(os.getenv("MASTER_GUILD", 0)):
logger.warning(
">> on_message_delete fired, but not in master guild. Ignoring event."
)
Expand Down
9 changes: 5 additions & 4 deletions src/bot/cogs/logging/logging_message_edit.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,11 @@ def __init__(self, bot):

@commands.Cog.listener()
async def on_message_edit(self, message_before, message_after):
if (
message_before.guild.id != int(os.getenv("MASTER_GUILD"))
or message_before.guild.id is None
):
if message_before.guild is None:
logger.debug(">> on_message_edit fired in DMs. Ignoring event.")
return

if message_before.guild.id != int(os.getenv("MASTER_GUILD")):
logger.warning(
">> on_message_edit fired, but not in master guild. Ignoring event."
)
Expand Down
Loading