matthew/enhanced-discord.py
1
0
Fork 0
Code Issues 4 Pull Requests 21 Projects Releases Wiki Activity

Rename allowed mention parameters to allowed_mentions

Browse Source
This commit is contained in:
Rapptz
2020-04-04 13:03:08 -04:00
parent 730d79d60a
commit d853a57e86
5 changed files with 35 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
discord/webhook.py
View File

@ -688,7 +688,7 @@ class Webhook:
return self._adapter.edit_webhook(**payload)
def send(self, content=None, *, wait=False, username=None, avatar_url=None, tts=False,
file=None, files=None, embed=None, embeds=None, mentions=None):
file=None, files=None, embed=None, embeds=None, allowed_mentions=None):
"""|maybecoro|
Sends a message using the webhook.
@ -732,8 +732,8 @@ class Webhook:
embeds: List[:class:`Embed`]
A list of embeds to send with the content. Maximum of 10. This cannot
be mixed with the ``embed`` parameter.
mentions: :class:`AllowedMentions`
Controls the mentions being processed in this message.
allowed_mentions: :class:`AllowedMentions`
Controls the allowed_mentions being processed in this message.
.. versionadded:: 1.4
@ -781,13 +781,13 @@ class Webhook:
if username:
payload['username'] = username
previous_mentions = getattr(self._state, 'mentions', None)
previous_mentions = getattr(self._state, 'allowed_mentions', None)
if mentions:
if allowed_mentions:
if previous_mentions is not None:
payload['allowed_mentions'] = previous_mentions.merge(mentions).to_dict()
payload['allowed_mentions'] = previous_mentions.merge(allowed_mentions).to_dict()
else:
payload['allowed_mentions'] = mentions.to_dict()
payload['allowed_mentions'] = allowed_mentions.to_dict()
elif previous_mentions is not None:
payload['allowed_mentions'] = previous_mentions.to_dict()