aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRapptz <[email protected]>2020-02-16 21:45:27 -0500
committerRapptz <[email protected]>2020-02-16 21:52:20 -0500
commitaf6a5efa538763eb2503b54742d8f6b10a60c79f (patch)
tree678021ba32b325244c9be03b99bbaefd57a74d88
parentAdd discord.ChannelType.category to documentation (diff)
downloaddiscord.py-af6a5efa538763eb2503b54742d8f6b10a60c79f.tar.xz
discord.py-af6a5efa538763eb2503b54742d8f6b10a60c79f.zip
Fix crashes when Message.guild is Object
-rw-r--r--discord/message.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/discord/message.py b/discord/message.py
index fb5f5d04..e1b88f12 100644
--- a/discord/message.py
+++ b/discord/message.py
@@ -468,7 +468,7 @@ class Message:
self.mentions = r = []
guild = self.guild
state = self._state
- if guild is None:
+ if not isinstance(guild, Guild):
self.mentions = [state.store_user(m) for m in mentions]
return
@@ -482,7 +482,7 @@ class Message:
def _handle_mention_roles(self, role_mentions):
self.role_mentions = []
- if self.guild is not None:
+ if isinstance(self.guild, Guild):
for role_id in map(int, role_mentions):
role = self.guild.get_role(role_id)
if role is not None: