From 953617280ddae82c847c0db65ebfcc92e73b4682 Mon Sep 17 00:00:00 2001
From: Austin Hellyer <hello@austinhellyer.me>
Date: Thu, 17 Nov 2016 10:46:58 -0800
Subject: Decode discriminators as strings

While this will use a slightly higher amount of memory, it will be
easier for users to use.
---
 definitions/structs/user.yml | 3 +--
 src/model/guild.rs           | 9 ++-------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/definitions/structs/user.yml b/definitions/structs/user.yml
index c952047..d157ec4 100644
--- a/definitions/structs/user.yml
+++ b/definitions/structs/user.yml
@@ -11,8 +11,7 @@ fields:
     default: 'false'
     type: bool
   - name: discriminator
-    custom: parse_discriminator
-    type: u16
+    type: string
   - name: name
     from: username
     type: string
diff --git a/src/model/guild.rs b/src/model/guild.rs
index 557a851..538aa02 100644
--- a/src/model/guild.rs
+++ b/src/model/guild.rs
@@ -517,14 +517,9 @@ impl LiveGuild {
         let (name, discrim) = if let Some(pos) = hash_pos {
             let split = name.split_at(pos);
 
-            let discrim = match split.1.parse::<u16>() {
-                Ok(discrim) => discrim,
-                Err(_why) => return None,
-            };
-
-            (split.0, Some(discrim))
+            (split.0, Some(split.1))
         } else {
-            (&name[..], None::<u16>)
+            (&name[..], None)
         };
 
         self.members
-- 
cgit v1.2.3