aboutsummaryrefslogtreecommitdiff
path: root/lib/models/user.ml
diff options
context:
space:
mode:
authorAdelyn Breedlove <[email protected]>2019-01-13 23:52:45 +0000
committerAdelyn Breedlove <[email protected]>2019-01-13 23:52:45 +0000
commitd95f0342f9cf2280b5d9794ab638c16a59c02a69 (patch)
tree191164d198c07cf388d9aae8a54013e5613c272c /lib/models/user.ml
parentMerge branch 'dev' into 'master' (diff)
parentAdd deriving sexp to models (diff)
downloaddisml-d95f0342f9cf2280b5d9794ab638c16a59c02a69.tar.xz
disml-d95f0342f9cf2280b5d9794ab638c16a59c02a69.zip
Merge branch 'switch-to-deriving_yojson' into 'master'
Switch to deriving yojson See merge request Mishio595/disml!12
Diffstat (limited to 'lib/models/user.ml')
-rw-r--r--lib/models/user.ml10
1 files changed, 4 insertions, 6 deletions
diff --git a/lib/models/user.ml b/lib/models/user.ml
index cd91a39..8edcea1 100644
--- a/lib/models/user.ml
+++ b/lib/models/user.ml
@@ -1,17 +1,15 @@
module Make(Http : S.Http) = struct
open Core
- open User_t
-
- type t = User_t.t
+ include User_t
let tag user =
- Printf.sprintf "%s#%d" user.username user.discriminator
+ Printf.sprintf "%s#%s" user.username user.discriminator
- let mention (user:User_t.t) =
+ let mention user =
Printf.sprintf "<@%d>" user.id
let default_avatar user =
- let avatar = user.discriminator % 5 in
+ let avatar = Int.of_string user.discriminator % 5 in
Endpoints.cdn_default_avatar avatar
let face user = match user.avatar with