From f14f316ebcda20daae3e13d29db7c154e8b5f988 Mon Sep 17 00:00:00 2001
From: andrei <b1naryth1ef@gmail.com>
Date: Mon, 15 May 2017 11:19:46 -0700
Subject: [PATCH] Fix image hashes incorrectly using `binary` type

For some reason when I initially built disco I made these types binary.
They are not binary. They are ascii hash-strings. So lets make them
strings. This fixes the Python 3 oddities described in #29 related to
formatting byte strings into normal strings.
---
 disco/types/base.py  | 12 ------------
 disco/types/guild.py | 12 ++++++------
 disco/types/user.py  |  8 ++++----
 tests/test_user.py   | 22 ++++++++++++++++++++++
 4 files changed, 32 insertions(+), 22 deletions(-)
 create mode 100644 tests/test_user.py

diff --git a/disco/types/base.py b/disco/types/base.py
index d396762..f219b9b 100644
--- a/disco/types/base.py
+++ b/disco/types/base.py
@@ -209,18 +209,6 @@ def text(obj):
         return str(obj)
 
 
-def binary(obj):
-    if obj is None:
-        return None
-
-    if six.PY2:
-        if isinstance(obj, str):
-            return obj.decode('utf-8')
-        return unicode(obj)
-    else:
-        return bytes(obj, 'utf-8')
-
-
 def with_equality(field):
     class T(object):
         def __eq__(self, other):
diff --git a/disco/types/guild.py b/disco/types/guild.py
index efbd421..6fd8a23 100644
--- a/disco/types/guild.py
+++ b/disco/types/guild.py
@@ -7,7 +7,7 @@ from disco.api.http import APIException
 from disco.util.snowflake import to_snowflake
 from disco.util.functional import cached_property
 from disco.types.base import (
-    SlottedModel, Field, ListField, AutoDictField, snowflake, text, binary, enum, datetime
+    SlottedModel, Field, ListField, AutoDictField, snowflake, text, enum, datetime
 )
 from disco.types.user import User
 from disco.types.voice import VoiceState
@@ -269,9 +269,9 @@ class Guild(SlottedModel, Permissible):
     name : str
         Guild's name.
     icon : str
-        Guild's icon (as PNG binary data).
+        Guild's icon hash
     splash : str
-        Guild's splash image (as PNG binary data).
+        Guild's splash image hash
     region : str
         Voice region.
     afk_timeout : int
@@ -300,9 +300,9 @@ class Guild(SlottedModel, Permissible):
     afk_channel_id = Field(snowflake)
     embed_channel_id = Field(snowflake)
     name = Field(text)
-    icon = Field(binary)
-    splash = Field(binary)
-    region = Field(str)
+    icon = Field(text)
+    splash = Field(text)
+    region = Field(text)
     afk_timeout = Field(int)
     embed_enabled = Field(bool)
     verification_level = Field(enum(VerificationLevel))
diff --git a/disco/types/user.py b/disco/types/user.py
index 2777c5e..d6e5938 100644
--- a/disco/types/user.py
+++ b/disco/types/user.py
@@ -1,6 +1,6 @@
 from holster.enum import Enum
 
-from disco.types.base import SlottedModel, Field, snowflake, text, binary, with_equality, with_hash
+from disco.types.base import SlottedModel, Field, snowflake, text, with_equality, with_hash
 
 DefaultAvatars = Enum(
     BLURPLE=0,
@@ -14,11 +14,11 @@ DefaultAvatars = Enum(
 class User(SlottedModel, with_equality('id'), with_hash('id')):
     id = Field(snowflake)
     username = Field(text)
-    avatar = Field(binary)
-    discriminator = Field(str)
+    avatar = Field(text)
+    discriminator = Field(text)
     bot = Field(bool, default=False)
     verified = Field(bool)
-    email = Field(str)
+    email = Field(text)
 
     presence = Field(None)
 
diff --git a/tests/test_user.py b/tests/test_user.py
new file mode 100644
index 0000000..89eaca6
--- /dev/null
+++ b/tests/test_user.py
@@ -0,0 +1,22 @@
+from unittest import TestCase
+
+from disco.types.user import User, DefaultAvatars
+
+
+class TestChannel(TestCase):
+    def test_user_avatar(self):
+        u = User(
+            id=12345,
+            username='test123',
+            avatar='1234567890abcdefghijkl',
+            discriminator='1234',
+            bot=False)
+
+        self.assertEqual(
+            u.avatar_url, 'https://cdn.discordapp.com/avatars/12345/1234567890abcdefghijkl.webp?size=1024'
+        )
+
+    def test_user_default_avatar(self):
+        u = User(id=123456, discriminator='1234')
+        self.assertEqual(u.default_avatar, DefaultAvatars.RED)
+        self.assertEqual(u.avatar_url, 'https://cdn.discordapp.com/embed/avatars/4.png')