aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRapptz <[email protected]>2021-02-18 00:43:19 -0500
committerRapptz <[email protected]>2021-02-18 00:43:19 -0500
commit88c23125ffd462e62084f2e1a1dd0f446bf127fc (patch)
tree4bc72f0a6a080ea1ae93ad8316a73885b27c822d
parentClarify Message.nonce documentation (diff)
downloaddiscord.py-88c23125ffd462e62084f2e1a1dd0f446bf127fc.tar.xz
discord.py-88c23125ffd462e62084f2e1a1dd0f446bf127fc.zip
Allow CustomActivity emoji to be constructed as documented.
Fix #4049
-rw-r--r--discord/activity.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/discord/activity.py b/discord/activity.py
index c230154d..cf5192ad 100644
--- a/discord/activity.py
+++ b/discord/activity.py
@@ -693,8 +693,14 @@ class CustomActivity(BaseActivity):
if emoji is None:
self.emoji = emoji
- else:
+ elif isinstance(emoji, dict):
self.emoji = PartialEmoji.from_dict(emoji)
+ elif isinstance(emoji, str):
+ self.emoji = PartialEmoji(name=emoji)
+ elif isinstance(emoji, PartialEmoji):
+ self.emoji = emoji
+ else:
+ raise TypeError('Expected str, PartialEmoji, or None, received {0!r} instead.'.format(type(emoji)))
@property
def type(self):