From 481b335f2d3adeef15d003d65966846c60c93b04 Mon Sep 17 00:00:00 2001
From: Rapptz <rapptz@gmail.com>
Date: Sat, 4 Apr 2020 12:45:17 -0400
Subject: Fix various implementation bugs with allowed mentions

---
 discord/abc.py | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'discord/abc.py')

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()')
-- 
cgit v1.2.3