Initial Lwt changes. Successfully compiles

4 files changed, 20 insertions, 6 deletions

diff --git a/lib/models/user/activity.ml b/lib/models/user/activity.ml
index 926c899..70706e7 100644
--- a/lib/models/user/activity.ml
+++ b/lib/models/user/activity.ml
@@ -1,4 +1,9 @@
-open Core
+let string_of_sexp = Base.String.t_of_sexp
+let sexp_of_string = Base.String.sexp_of_t
+let option_of_sexp = Base.Option.t_of_sexp
+let sexp_of_option = Base.Option.sexp_of_t
+let int_of_sexp    = Base.Int.t_of_sexp
+let sexp_of_int    = Base.Int.sexp_of_t
 
 type t = {
     name: string;
diff --git a/lib/models/user/presence.ml b/lib/models/user/presence.ml
index d8683b7..ba076fa 100644
--- a/lib/models/user/presence.ml
+++ b/lib/models/user/presence.ml
@@ -1,4 +1,9 @@
-open Core
+let string_of_sexp = Base.String.t_of_sexp
+let sexp_of_string = Base.String.sexp_of_t
+let option_of_sexp = Base.Option.t_of_sexp
+let sexp_of_option = Base.Option.sexp_of_t
+let list_of_sexp   = Base.List.t_of_sexp
+let sexp_of_list   = Base.List.sexp_of_t
 
 type t = {
     user: User_t.partial_user;
diff --git a/lib/models/user/user.ml b/lib/models/user/user.ml
index b8c3b25..4df2f1c 100644
--- a/lib/models/user/user.ml
+++ b/lib/models/user/user.ml
@@ -1,4 +1,3 @@
-open Core

 include User_t

 

 let tag user =

@@ -9,14 +8,14 @@ let mention user =
     Printf.sprintf "<@%d>" id

 

 let default_avatar user =

-    let avatar = Int.of_string user.discriminator % 5 in

+    let avatar = int_of_string user.discriminator mod 5 in

     Endpoints.cdn_default_avatar avatar

 

 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

+        let ext = if Base.String.is_substring ~substring:"a_" avatar

         then "gif"

         else "png" in

         Endpoints.cdn_avatar id avatar ext

diff --git a/lib/models/user/user_t.ml b/lib/models/user/user_t.ml
index b68808d..44f33fe 100644
--- a/lib/models/user/user_t.ml
+++ b/lib/models/user/user_t.ml
@@ -1,4 +1,9 @@
-open Core

+let string_of_sexp = Base.String.t_of_sexp

+let sexp_of_string = Base.String.sexp_of_t

+let option_of_sexp = Base.Option.t_of_sexp

+let sexp_of_option = Base.Option.sexp_of_t

+let bool_of_sexp   = Base.Bool.t_of_sexp

+let sexp_of_bool   = Base.Bool.sexp_of_t

 

 type partial_user = {

     id: User_id_t.t;