From 6354dbd89d354e5e2499b4c2bea5d5fa95e020df Mon Sep 17 00:00:00 2001
From: Adelyn Breedlove <tenseiken595@gmail.com>
Date: Wed, 16 Jan 2019 23:36:59 -0700
Subject: eliminate all functors in favour of a simpler approach

---
 lib/models/user.ml | 34 ++++++++++++++++------------------
 1 file changed, 16 insertions(+), 18 deletions(-)

(limited to 'lib/models/user.ml')

diff --git a/lib/models/user.ml b/lib/models/user.ml
index 8edcea1..bd6583c 100644
--- a/lib/models/user.ml
+++ b/lib/models/user.ml
@@ -1,22 +1,20 @@
-module Make(Http : S.Http) = struct
-    open Core
-    include User_t
+open Core
+include User_t
 
-    let tag user =
-        Printf.sprintf "%s#%s" user.username user.discriminator
+let tag user =
+    Printf.sprintf "%s#%s" user.username user.discriminator
 
-    let mention user =
-        Printf.sprintf "<@%d>" user.id
+let mention user =
+    Printf.sprintf "<@%d>" user.id
 
-    let default_avatar user =
-        let avatar = Int.of_string user.discriminator % 5 in
-        Endpoints.cdn_default_avatar avatar
+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
-        | Some avatar ->
-            let ext = if String.is_substring ~substring:"a_" avatar
-            then "gif"
-            else "png" in
-            Endpoints.cdn_avatar user.id avatar ext
-        | None -> default_avatar user
-end
\ No newline at end of file
+let face user = 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
+    | None -> default_avatar user
\ No newline at end of file
-- 
cgit v1.2.3