AAAAAAAAAAAAAAAAAAAAAAAA

1 files changed, 27 insertions, 42 deletions

diff --git a/lib/models/guild.ml b/lib/models/guild.ml
index 733fc9f..60652df 100644
--- a/lib/models/guild.ml
+++ b/lib/models/guild.ml
@@ -1,9 +1,7 @@
 module Make(Http : S.Http) = struct
     open Core
     open Async
-    open Guild_t
-
-    type t = Guild_t.t
+    include Guild_t
 
     let ban_user ~id ?(reason="") ?(days=0) guild =
         Http.guild_ban_add guild.id id (`Assoc [
@@ -16,7 +14,7 @@ module Make(Http : S.Http) = struct
             ("name", `String name);
             ("image", `String image);
             ("roles", `List []);
-        ]) >>| Result.map ~f:Emoji_j.t_of_string
+        ]) >>| Result.map ~f:Emoji.of_yojson_exn
 
     let create_role ~name ?colour ?permissions ?hoist ?mentionable guild =
         let payload = ("name", `String name) :: [] in
@@ -33,10 +31,8 @@ module Make(Http : S.Http) = struct
         | Some m -> ("mentionable", `Bool m) :: payload
         | None -> payload
         in Http.guild_role_add guild.id (`Assoc payload)
-         >>| Result.map ~f:(fun r ->
-            Role_j.role_of_string r 
-            |> Event.wrap_role ~guild_id:guild.id)
-    
+            >>| Result.map ~f:(fun r -> Role_t.role_of_yojson_exn r |> Role_t.wrap ~guild_id:guild.id)
+
     let create_channel ~mode ~name guild =
         let kind = match mode with
         | `Text -> 0
@@ -45,29 +41,26 @@ module Make(Http : S.Http) = struct
         in Http.create_guild_channel guild.id (`Assoc [
             ("name", `String name);
             ("type", `Int kind);
-        ]) >>| Result.map ~f:Channel_j.t_of_string
-    
+        ]) >>| Result.map ~f:Channel_t.of_yojson_exn
+
     let delete guild = 
         Http.delete_guild guild.id >>| Result.map ~f:ignore
 
     let get_ban ~id guild =
-        Http.get_ban guild.id id >>| Result.map ~f:Ban_j.t_of_string
-    
+        Http.get_ban guild.id id >>| Result.map ~f:Ban_t.of_yojson_exn
+
     let get_bans guild =
         Http.get_bans guild.id >>| Result.map ~f:(fun bans ->
-            Yojson.Safe.from_string bans
-            |> Yojson.Safe.Util.to_list
-            |> List.map ~f:(fun ban ->
-                Yojson.Safe.to_string ban
-                |> Ban_j.t_of_string))
+        Yojson.Safe.Util.to_list bans
+        |> List.map ~f:Ban_t.of_yojson_exn)
 
     let get_channel ~id guild =
-        match List.find ~f:(fun c -> c.id = id) guild.channels with
-        | Some c -> Channel_j.(string_of_channel_wrapper c |> t_of_string) |> Deferred.Or_error.return
-        | None -> Http.get_channel id >>| Result.map ~f:Event.wrap_channel
-    
+        match List.find ~f:(fun c -> Channel_t.get_id c = id) guild.channels with
+        | Some c -> Deferred.Or_error.return c
+        | None -> Http.get_channel id >>| Result.map ~f:(fun c -> Channel_t.(channel_wrapper_of_yojson_exn c |> wrap))
+
     let get_emoji ~id guild =
-        Http.get_emoji guild.id id >>| Result.map ~f:Emoji_j.t_of_string
+        Http.get_emoji guild.id id >>| Result.map ~f:Emoji.of_yojson_exn
 
     (* TODO add invite abstraction? *)
     let get_invites guild =
@@ -76,19 +69,16 @@ module Make(Http : S.Http) = struct
     let get_member ~id guild =
         match List.find ~f:(fun m -> m.user.id = id) guild.members with
         | Some m -> Deferred.Or_error.return m
-        | None -> Http.get_member guild.id id >>| Result.map ~f:Member_j.member_of_string
+        | None -> Http.get_member guild.id id >>| Result.map ~f:Member_t.of_yojson_exn
 
     let get_prune_count ~days guild =
         Http.guild_prune_count guild.id days >>| Result.map ~f:(fun prune ->
-            Yojson.Safe.(from_string prune
-            |> Util.member "pruned"
-            |> Util.to_int))
+        Yojson.Safe.Util.(member "pruned" prune |> to_int))
 
     (* TODO add HTTP fallback *)
     let get_role ~id guild =
-        let role = List.find ~f:(fun r -> r.id = id) guild.roles in
-        Option.(role >>| Event.wrap_role ~guild_id:guild.id)
-    
+        List.find ~f:(fun r -> r.id = id) guild.roles
+
     (* TODO add webhook abstraction? *)
     let get_webhooks guild =
         Http.get_guild_webhooks guild.id
@@ -108,33 +98,28 @@ module Make(Http : S.Http) = struct
 
     let prune ~days guild =
         Http.guild_prune_start guild.id days >>| Result.map ~f:(fun prune ->
-            Yojson.Safe.(from_string prune
-            |> Util.member "pruned"
-            |> Util.to_int))
-    
+        Yojson.Safe.Util.(member "pruned" prune |> to_int))
+
     let request_members guild =
         Http.get_members guild.id >>| Result.map ~f:(fun members ->
-            Yojson.Safe.from_string members
-            |> Yojson.Safe.Util.to_list
-            |> List.map ~f:(fun ban ->
-                Yojson.Safe.to_string ban
-                |> Member_j.t_of_string))
+        Yojson.Safe.Util.to_list members
+        |> List.map ~f:Member_t.of_yojson_exn)
 
     let set_afk_channel ~id guild = Http.edit_guild guild.id (`Assoc [
         ("afk_channel_id", `Int id);
-    ]) >>| Result.map ~f:Guild_j.t_of_string
+        ]) >>| Result.map ~f:of_yojson_exn
 
     let set_afk_timeout ~timeout guild = Http.edit_guild guild.id (`Assoc [
         ("afk_timeout", `Int timeout);
-    ]) >>| Result.map ~f:Guild_j.t_of_string
+        ]) >>| Result.map ~f:of_yojson_exn
 
     let set_name ~name guild = Http.edit_guild guild.id (`Assoc [
         ("name", `String name);
-    ]) >>| Result.map ~f:Guild_j.t_of_string
+        ]) >>| Result.map ~f:of_yojson_exn
 
     let set_icon ~icon guild = Http.edit_guild guild.id (`Assoc [
         ("icon", `String icon);
-    ]) >>| Result.map ~f:Guild_j.t_of_string
+        ]) >>| Result.map ~f:of_yojson_exn
 
     let unban_user ~id ?reason guild =
         let payload = match reason with