From 23f16618fdf5fcbeeefed7acb56b579e74bc88d8 Mon Sep 17 00:00:00 2001
From: Rapptz <rapptz@gmail.com>
Date: Wed, 15 Jan 2020 09:26:47 -0500
Subject: [PATCH] Make CustomActivity.__str__ not raise errors and match the
 client

---
 discord/activity.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/discord/activity.py b/discord/activity.py
index 6f7241991..5b2861bb3 100644
--- a/discord/activity.py
+++ b/discord/activity.py
@@ -724,7 +724,12 @@ class CustomActivity(BaseActivity):
         return hash((self.name, str(self.emoji)))
 
     def __str__(self):
-        return self.name
+        if self.emoji:
+            if self.name:
+                return '%s %s' % (self.emoji, self.name)
+            return str(self.emoji)
+        else:
+            return str(self.name)
 
     def __repr__(self):
         return '<CustomActivity name={0.name!r} emoji={0.emoji!r}>'.format(self)