Switch to ID abstractions internally

3 files changed, 10 insertions, 7 deletions

diff --git a/lib/models/user/user.ml b/lib/models/user/user.ml
index bd6583c..de7ce01 100644
--- a/lib/models/user/user.ml
+++ b/lib/models/user/user.ml
@@ -5,16 +5,19 @@ let tag user =
     Printf.sprintf "%s#%s" user.username user.discriminator
 
 let mention user =
-    Printf.sprintf "<@%d>" user.id
+    let `User_id id = user.id in
+    Printf.sprintf "<@%d>" id
 
 let default_avatar user =
     let avatar = Int.of_string user.discriminator % 5 in
     Endpoints.cdn_default_avatar avatar
 
-let face user = match user.avatar with
+let face user =
+    let `User_id id = user.id in
+    match user.avatar with
     | Some avatar ->
         let ext = if String.is_substring ~substring:"a_" avatar
         then "gif"
         else "png" in
-        Endpoints.cdn_avatar user.id avatar ext
+        Endpoints.cdn_avatar id avatar ext
     | None -> default_avatar user
\ No newline at end of file
diff --git a/lib/models/user/user_t.ml b/lib/models/user/user_t.ml
index 52dbaf4..89a6895 100644
--- a/lib/models/user/user_t.ml
+++ b/lib/models/user/user_t.ml
@@ -1,11 +1,11 @@
 open Core
 
 type partial_user = {
-    id: Snowflake.t;
+    id: User_id_t.t;
 } [@@deriving sexp, yojson { strict = false}]
 
 type t = {
-    id: Snowflake.t;
+    id: User_id_t.t;
     username: string;
     discriminator: string;
     avatar: string option [@default None];
diff --git a/lib/models/user/user_t.mli b/lib/models/user/user_t.mli
index 50e9059..b0228f9 100644
--- a/lib/models/user/user_t.mli
+++ b/lib/models/user/user_t.mli
@@ -1,9 +1,9 @@
 type partial_user = {
-    id: Snowflake.t;
+    id: User_id_t.t;
 } [@@deriving sexp, yojson]
 
 type t = {
-    id: Snowflake.t;
+    id: User_id_t.t;
     username: string;
     discriminator: string;
     avatar: string option;