aboutsummaryrefslogtreecommitdiff
path: root/discord/abc.py
diff options
context:
space:
mode:
authorRapptz <[email protected]>2020-04-04 12:45:17 -0400
committerRapptz <[email protected]>2020-04-04 12:45:17 -0400
commit481b335f2d3adeef15d003d65966846c60c93b04 (patch)
tree12f1a78a50d83f400a4f269ac062334f76fbf28a /discord/abc.py
parentAdd support for configuring allowed mentions per message or bot wide. (diff)
downloaddiscord.py-481b335f2d3adeef15d003d65966846c60c93b04.tar.xz
discord.py-481b335f2d3adeef15d003d65966846c60c93b04.zip
Fix various implementation bugs with allowed mentions
Diffstat (limited to 'discord/abc.py')
-rw-r--r--discord/abc.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/discord/abc.py b/discord/abc.py
index b4a07791..7ce7224f 100644
--- a/discord/abc.py
+++ b/discord/abc.py
@@ -838,6 +838,8 @@ class Messageable(metaclass=abc.ABCMeta):
mentions = state.mentions.merge(mentions).to_dict()
else:
mentions = mentions.to_dict()
+ else:
+ mentions = state.mentions and state.mentions.to_dict()
if file is not None and files is not None:
raise InvalidArgument('cannot pass both file and files parameter to send()')