mirrors/discord.py
1
0
Fork 0
mirror of https://github.com/Rapptz/discord.py.git synced 2025-05-16 02:39:01 +00:00
Code Issues Projects Releases Wiki Activity

Fix crash from Discord sending null channel_id for automod audit logs

Browse Source
This commit is contained in:
Rapptz 2023-03-28 04:10:59 -04:00
parent 78175ded1b
commit 4ff66cae73
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
discord/audit_logs.py
View File

@ -521,7 +521,7 @@ class _AuditLogProxyMessageBulkDelete(_AuditLogProxy):
class _AuditLogProxyAutoModAction(_AuditLogProxy): class _AuditLogProxyAutoModAction(_AuditLogProxy):
automod_rule_name: str automod_rule_name: str
automod_rule_trigger_type: str automod_rule_trigger_type: str
channel: Union[abc.GuildChannel, Thread] channel: Optional[Union[abc.GuildChannel, Thread]]
class AuditLogEntry(Hashable): class AuditLogEntry(Hashable):
@ -644,13 +644,17 @@ class AuditLogEntry(Hashable):
or self.action is enums.AuditLogAction.automod_flag_message or self.action is enums.AuditLogAction.automod_flag_message
or self.action is enums.AuditLogAction.automod_timeout_member or self.action is enums.AuditLogAction.automod_timeout_member
): ):
channel_id = int(extra['channel_id']) channel_id = utils._get_as_snowflake(extra, 'channel_id')
channel = None
if channel_id is not None:
channel = self.guild.get_channel_or_thread(channel_id) or Object(id=channel_id)
self.extra = _AuditLogProxyAutoModAction( self.extra = _AuditLogProxyAutoModAction(
automod_rule_name=extra['auto_moderation_rule_name'], automod_rule_name=extra['auto_moderation_rule_name'],
automod_rule_trigger_type=enums.try_enum( automod_rule_trigger_type=enums.try_enum(
enums.AutoModRuleTriggerType, extra['auto_moderation_rule_trigger_type'] enums.AutoModRuleTriggerType, extra['auto_moderation_rule_trigger_type']
), ),
channel=self.guild.get_channel_or_thread(channel_id) or Object(id=channel_id), channel=channel,
) )
elif self.action.name.startswith('overwrite_'): elif self.action.name.startswith('overwrite_'):