Revert "Merge pull request #12" (#56)

This reverts commit 42c0a8d8a5.

discord/activity.py

@@ -794,13 +794,13 @@ class CustomActivity(BaseActivity):
         return hash((self.name, str(self.emoji)))
 
     def __str__(self) -> str:
-        if not self.emoji:
+        if self.emoji:
+            if self.name:
+                return f'{self.emoji} {self.name}'
+            return str(self.emoji)
+        else:
             return str(self.name)
 
-        if self.name:
-            return f'{self.emoji} {self.name}'
-        return str(self.emoji)
-
     def __repr__(self) -> str:
         return f'<CustomActivity name={self.name!r} emoji={self.emoji!r}>'