Merge 4564ffd4a2 into 2f1f5fe2e2

discord/audit_logs.py

@@ -630,11 +630,6 @@ class _AuditLogProxyAutoModAction(_AuditLogProxy):
     channel: Optional[Union[abc.GuildChannel, Thread]]
 
 
-class _AuditLogProxyAutoModActionQuarantineUser(_AuditLogProxy):
-    automod_rule_name: str
-    automod_rule_trigger_type: str
-
-
 class _AuditLogProxyMemberKickOrMemberRoleUpdate(_AuditLogProxy):
     integration_type: Optional[str]
 
@@ -725,7 +720,6 @@ class AuditLogEntry(Hashable):
             _AuditLogProxyStageInstanceAction,
             _AuditLogProxyMessageBulkDelete,
             _AuditLogProxyAutoModAction,
-            _AuditLogProxyAutoModActionQuarantineUser,
             _AuditLogProxyMemberKickOrMemberRoleUpdate,
             Member, User, None, PartialIntegration,
             Role, Object
@@ -766,6 +760,7 @@ class AuditLogEntry(Hashable):
                 self.action is enums.AuditLogAction.automod_block_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_quarantine_user
             ):
                 channel_id = utils._get_as_snowflake(extra, 'channel_id')
                 channel = None
@@ -781,13 +776,6 @@ class AuditLogEntry(Hashable):
                     ),
                     channel=channel,
                 )
-            elif self.action is enums.AuditLogAction.automod_quarantine_user:
-                self.extra = _AuditLogProxyAutoModActionQuarantineUser(
-                    automod_rule_name=extra['auto_moderation_rule_name'],
-                    automod_rule_trigger_type=enums.try_enum(
-                        enums.AutoModRuleTriggerType, int(extra['auto_moderation_rule_trigger_type'])
-                    ),
-                )
 
             elif self.action.name.startswith('overwrite_'):
                 # the overwrite_ actions have a dict with some information

docs/api.rst

@@ -3063,10 +3063,11 @@ of :class:`enum.Enum`.
         a :class:`Member` with the ID of the person who triggered the automod rule.
 
         When this is the action, the type of :attr:`~AuditLogEntry.extra` is
-        set to an unspecified proxy object with 2 attributes:
+        set to an unspecified proxy object with 3 attributes:
 
         - ``automod_rule_name``: The name of the automod rule that was triggered.
         - ``automod_rule_trigger_type``: A :class:`AutoModRuleTriggerType` representation of the rule type that was triggered.
+        - ``channel``: The channel of the message sent by the member when they were flagged. `None` if the member was quarantined when they just joined the guild.
 
         When this is the action, :attr:`AuditLogEntry.changes` is empty.