mirrors/discord.py
1
0
Fork 0
mirror of https://github.com/Rapptz/discord.py.git synced 2025-05-10 15:59:50 +00:00
Code Issues Projects Releases Wiki Activity

Fix AutoModTrigger ignoring allow_list with type keyword

Browse Source
This commit is contained in:
rdrescher909 2022-12-14 19:07:32 -05:00 committed by GitHub
parent 039d588447
commit cc3b987229
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
discord/automod.py
View File

@ -121,7 +121,8 @@ class AutoModTrigger:
+-----------------------------------------------+------------------------------------------------+ +-----------------------------------------------+------------------------------------------------+
| Type | Attributes | | Type | Attributes |
+===============================================+================================================+ +===============================================+================================================+
| :attr:`AutoModRuleTriggerType.keyword` | :attr:`keyword_filter`, :attr:`regex_patterns` | | :attr:`AutoModRuleTriggerType.keyword` | :attr:`keyword_filter`, :attr:`regex_patterns`,|
| | :attr:`allow_list` |
+-----------------------------------------------+------------------------------------------------+ +-----------------------------------------------+------------------------------------------------+
| :attr:`AutoModRuleTriggerType.spam` | | | :attr:`AutoModRuleTriggerType.spam` | |
+-----------------------------------------------+------------------------------------------------+ +-----------------------------------------------+------------------------------------------------+
@ -146,7 +147,7 @@ class AutoModTrigger:
`Rust's regex syntax <https://docs.rs/regex/latest/regex/#syntax>`_. `Rust's regex syntax <https://docs.rs/regex/latest/regex/#syntax>`_.
Maximum of 10. Regex strings can only be up to 75 characters in length. Maximum of 10. Regex strings can only be up to 75 characters in length.
This could be combined with :attr:`keyword_filter`. This could be combined with :attr:`keyword_filter` and/or :attr:`allow_list`
.. versionadded:: 2.1 .. versionadded:: 2.1
presets: :class:`AutoModPresets` presets: :class:`AutoModPresets`
@ -213,7 +214,12 @@ class AutoModTrigger:
if data is None: if data is None:
return cls(type=type_) return cls(type=type_)
elif type_ is AutoModRuleTriggerType.keyword: elif type_ is AutoModRuleTriggerType.keyword:
return cls(type=type_, keyword_filter=data.get('keyword_filter'), regex_patterns=data.get('regex_patterns')) return cls(
type=type_,
keyword_filter=data.get('keyword_filter'),
regex_patterns=data.get('regex_patterns'),
allow_list=data.get('allow_list'),
)
elif type_ is AutoModRuleTriggerType.keyword_preset: elif type_ is AutoModRuleTriggerType.keyword_preset:
return cls( return cls(
type=type_, presets=AutoModPresets._from_value(data.get('presets', [])), allow_list=data.get('allow_list') type=type_, presets=AutoModPresets._from_value(data.get('presets', [])), allow_list=data.get('allow_list')
@ -225,7 +231,11 @@ class AutoModTrigger:
def to_metadata_dict(self) -> Optional[Dict[str, Any]]: def to_metadata_dict(self) -> Optional[Dict[str, Any]]:
if self.type is AutoModRuleTriggerType.keyword: if self.type is AutoModRuleTriggerType.keyword:
return {'keyword_filter': self.keyword_filter, 'regex_patterns': self.regex_patterns} return {
'keyword_filter': self.keyword_filter,
'regex_patterns': self.regex_patterns,
'allow_list': self.allow_list,
}
elif self.type is AutoModRuleTriggerType.keyword_preset: elif self.type is AutoModRuleTriggerType.keyword_preset:
return {'presets': self.presets.to_array(), 'allow_list': self.allow_list} return {'presets': self.presets.to_array(), 'allow_list': self.allow_list}
elif self.type is AutoModRuleTriggerType.mention_spam: elif self.type is AutoModRuleTriggerType.mention_spam: