Skip to content

Moderator changes minor refactor #3340

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
jb3 merged 3 commits into from
Jun 25, 2025
Merged

Moderator changes minor refactor #3340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a7872f5
Use partial messageable and message to tidy up infractions
jb3 Jun 24, 2025
dad7497
Only tidy-up infractions outside mod channels
jb3 Jun 24, 2025
c226ea3
Exclude bot-commands from rules alert relay
jb3 Jun 24, 2025
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
5 changes: 4 additions & 1 deletion bot/exts/info/information.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -691,7 +691,10 @@ async def rules(self, ctx: Context, *, args: str | None) -> set[int] | None:

if constants.Roles.helpers not in {role.id for role in ctx.author.roles}:
# If the user is not a helper, send an alert to the rules thread.
await self._send_rules_alert(ctx, sorted_rules)
#
# Exclude the bot commands channel to avoid spamming it with alerts.
if ctx.channel.id != constants.Channels.bot_commands:
await self._send_rules_alert(ctx, sorted_rules)

await LinePaginator.paginate(final_rules, ctx, rules_embed, max_lines=3)

Expand Down
10 changes: 5 additions & 5 deletions bot/exts/moderation/infraction/_scheduler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
from discord.ext.commands import Context
from pydis_core.site_api import ResponseCodeError
from pydis_core.utils import scheduling
from pydis_core.utils.channel import get_or_fetch_channel

from bot import constants
from bot.bot import Bot
Expand Down Expand Up @@ -115,9 +114,9 @@ async def _delete_infraction_message(
This is used to delete infraction messages after a certain period of time.
"""
try:
channel = await get_or_fetch_channel(self.bot, channel_id)
message = await channel.fetch_message(message_id)
await message.delete()
partial_channel = self.bot.get_partial_messageable(channel_id)
partial_message = partial_channel.get_partial_message(message_id)
await partial_message.delete()
log.trace(f"Deleted infraction message {message_id} in channel {channel_id}.")
except discord.NotFound:
log.warning(f"Channel or message {message_id} not found in channel {channel_id}.")
Expand Down Expand Up @@ -322,7 +321,8 @@ async def apply_infraction(
mentions = discord.AllowedMentions(users=[user], roles=False)
sent_msg = await ctx.send(f"{dm_result}{confirm_msg}{infr_message}.", allowed_mentions=mentions)

if infraction["actor"] == self.bot.user.id:
# Only tidy up bot issued infractions in non-mod channels.
if infraction["actor"] == self.bot.user.id and not is_mod_channel(ctx.channel):
expire_message_time = datetime.now(UTC) + timedelta(hours=AUTOMATED_TIDY_UP_HOURS)

log.trace(f"Scheduling message tidy for infraction #{id_} in {AUTOMATED_TIDY_UP_HOURS} hours.")
Expand Down