Merge branch 'dev' of https://gitlab.com/Mishio595/disml into dev

1 files changed, 58 insertions, 58 deletions

diff --git a/lib/dispatch.ml b/lib/dispatch.ml
index 65c84ef..a4341e1 100644
--- a/lib/dispatch.ml
+++ b/lib/dispatch.ml
@@ -6,32 +6,32 @@ module Make(H : S.Handler) : S.Dispatch = struct
     | READY of Yojson.Safe.json
     | RESUMED of Yojson.Safe.json
     | INVALID_SESSION of Yojson.Safe.json
-    | CHANNEL_CREATE of Channel.t
-    | CHANNEL_UPDATE of Channel.t
-    | CHANNEL_DELETE of Channel.t
+    | CHANNEL_CREATE of Channel_t.t
+    | CHANNEL_UPDATE of Channel_t.t
+    | CHANNEL_DELETE of Channel_t.t
     | CHANNEL_PINS_UPDATE of Yojson.Safe.json
-    | GUILD_CREATE of Guild.t
-    | GUILD_UPDATE of Guild.t
-    | GUILD_DELETE of Guild.t
-    | GUILD_BAN_ADD of Ban.t
-    | GUILD_BAN_REMOVE of Ban.t
+    | GUILD_CREATE of Guild_t.t
+    | GUILD_UPDATE of Guild_t.t
+    | GUILD_DELETE of Guild_t.t
+    | GUILD_BAN_ADD of Ban_t.t
+    | GUILD_BAN_REMOVE of Ban_t.t
     | GUILD_EMOJIS_UPDATE of Yojson.Safe.json
     | GUILD_INTEGRATIONS_UPDATE of Yojson.Safe.json
-    | GUILD_MEMBER_ADD of Member.t
-    | GUILD_MEMBER_REMOVE of Member.t
-    | GUILD_MEMBER_UPDATE of Member.t
-    | GUILD_MEMBERS_CHUNK of Member.t list
-    | GUILD_ROLE_CREATE of Role.t (* * Guild.t *)
-    | GUILD_ROLE_UPDATE of Role.t (* * Guild.t *)
-    | GUILD_ROLE_DELETE of Role.t (* * Guild.t *)
-    | MESSAGE_CREATE of Message.t
-    | MESSAGE_UPDATE of Message.t
-    | MESSAGE_DELETE of Message.t
-    | MESSAGE_BULK_DELETE of Message.t list
-    | MESSAGE_REACTION_ADD of (* Message.t * *) Reaction.t
-    | MESSAGE_REACTION_REMOVE of (* Message.t * *) Reaction.t
-    | MESSAGE_REACTION_REMOVE_ALL of (* Message.t * *) Reaction.t list
-    | PRESENCE_UPDATE of Presence.t
+    | GUILD_MEMBER_ADD of Member_t.t
+    | GUILD_MEMBER_REMOVE of Member_t.t
+    | GUILD_MEMBER_UPDATE of Member_t.t
+    | GUILD_MEMBERS_CHUNK of Member_t.t list
+    | GUILD_ROLE_CREATE of Role_t.t (* * Guild.t *)
+    | GUILD_ROLE_UPDATE of Role_t.t (* * Guild.t *)
+    | GUILD_ROLE_DELETE of Role_t.t (* * Guild.t *)
+    | MESSAGE_CREATE of Message_t.t
+    | MESSAGE_UPDATE of Message_t.t
+    | MESSAGE_DELETE of Message_t.t
+    | MESSAGE_BULK_DELETE of Message_t.t list
+    | MESSAGE_REACTION_ADD of (* Message.t * *) Reaction_t.t
+    | MESSAGE_REACTION_REMOVE of (* Message.t * *) Reaction_t.t
+    | MESSAGE_REACTION_REMOVE_ALL of (* Message.t * *) Reaction_t.t list
+    | PRESENCE_UPDATE of Presence_t.t
     | TYPING_START of Yojson.Safe.json
     | USER_UPDATE of Yojson.Safe.json
     | VOICE_STATE_UPDATE of Yojson.Safe.json
@@ -41,41 +41,41 @@ module Make(H : S.Handler) : S.Dispatch = struct
     exception Invalid_event of string
 
     let event_of_string ~contents t = match t with
-        | "HELLO" -> HELLO contents
-        | "READY" -> READY contents
-        | "RESUMED" -> RESUMED contents
-        | "INVALID_SESSION" -> INVALID_SESSION contents
-        | "CHANNEL_CREATE" -> CHANNEL_CREATE (Channel.of_yojson_exn contents)
-        | "CHANNEL_UPDATE" -> CHANNEL_UPDATE (Channel.of_yojson_exn contents)
-        | "CHANNEL_DELETE" -> CHANNEL_DELETE (Channel.of_yojson_exn contents)
-        | "CHANNEL_PINS_UPDATE" -> CHANNEL_PINS_UPDATE contents
-        | "GUILD_CREATE" -> GUILD_CREATE (Guild.of_yojson_exn contents)
-        | "GUILD_UPDATE" -> GUILD_UPDATE (Guild.of_yojson_exn contents)
-        | "GUILD_DELETE" -> GUILD_DELETE (Guild.of_yojson_exn contents)
-        | "GUILD_BAN_ADD" -> GUILD_BAN_ADD (Ban.of_yojson_exn contents)
-        | "GUILD_BAN_REMOVE" -> GUILD_BAN_REMOVE (Ban.of_yojson_exn contents)
-        | "GUILD_EMOJIS_UPDATE" -> GUILD_EMOJIS_UPDATE contents
-        | "GUILD_INTEGRATIONS_UPDATE" -> GUILD_INTEGRATIONS_UPDATE contents
-        | "GUILD_MEMBER_ADD" -> GUILD_MEMBER_ADD (Member.of_yojson_exn contents)
-        | "GUILD_MEMBER_REMOVE" -> GUILD_MEMBER_REMOVE (Member.of_yojson_exn contents)
-        | "GUILD_MEMBER_UPDATE" -> GUILD_MEMBER_UPDATE (Member.of_yojson_exn contents)
-        | "GUILD_MEMBERS_CHUNK" -> GUILD_MEMBERS_CHUNK (Yojson.Safe.Util.to_list contents |> List.map ~f:(fun m -> Member.of_yojson_exn m))
-        | "GUILD_ROLE_CREATE" -> GUILD_ROLE_CREATE (Role.of_yojson_exn contents)
-        | "GUILD_ROLE_UPDATE" -> GUILD_ROLE_UPDATE (Role.of_yojson_exn contents)
-        | "GUILD_ROLE_DELETE" -> GUILD_ROLE_DELETE (Role.of_yojson_exn contents)
-        | "MESSAGE_CREATE" -> MESSAGE_CREATE (Message.of_yojson_exn contents)
-        | "MESSAGE_UPDATE" -> MESSAGE_UPDATE (Message.of_yojson_exn contents)
-        | "MESSAGE_DELETE" -> MESSAGE_DELETE (Message.of_yojson_exn contents)
-        | "MESSAGE_BULK_DELETE" -> MESSAGE_BULK_DELETE (Yojson.Safe.Util.to_list contents |> List.map ~f:(fun m -> Message.of_yojson_exn m))
-        | "MESSAGE_REACTION_ADD" -> MESSAGE_REACTION_ADD (Reaction.of_yojson_exn contents)
-        | "MESSAGE_REACTION_REMOVE" -> MESSAGE_REACTION_REMOVE (Reaction.of_yojson_exn contents)
-        | "MESSAGE_REACTION_REMOVE_ALL" -> MESSAGE_REACTION_REMOVE_ALL (Yojson.Safe.Util.to_list contents |> List.map ~f:(fun r -> Reaction.of_yojson_exn r))
-        | "PRESENCE_UPDATE" -> PRESENCE_UPDATE (Presence.of_yojson_exn contents)
-        | "TYPING_START" -> TYPING_START contents
-        | "USER_UPDATE" -> USER_UPDATE contents
-        | "VOICE_STATE_UPDATE" -> VOICE_STATE_UPDATE contents
-        | "VOICE_SERVER_UPDATE" -> VOICE_SERVER_UPDATE contents
-        | "WEBHOOKS_UPDATE" -> WEBHOOKS_UPDATE contents
+        | "HELLO" -> HELLO (Yojson.Safe.from_string contents)
+        | "READY" -> READY (Yojson.Safe.from_string contents)
+        | "RESUMED" -> RESUMED (Yojson.Safe.from_string contents)
+        | "INVALID_SESSION" -> INVALID_SESSION (Yojson.Safe.from_string contents)
+        | "CHANNEL_CREATE" -> CHANNEL_CREATE (Channel_j.t_of_string contents)
+        | "CHANNEL_UPDATE" -> CHANNEL_UPDATE (Channel_j.t_of_string contents)
+        | "CHANNEL_DELETE" -> CHANNEL_DELETE (Channel_j.t_of_string contents)
+        | "CHANNEL_PINS_UPDATE" -> CHANNEL_PINS_UPDATE (Yojson.Safe.from_string contents)
+        | "GUILD_CREATE" -> GUILD_CREATE (Guild_j.t_of_string contents)
+        | "GUILD_UPDATE" -> GUILD_UPDATE (Guild_j.t_of_string contents)
+        | "GUILD_DELETE" -> GUILD_DELETE (Guild_j.t_of_string contents)
+        | "GUILD_BAN_ADD" -> GUILD_BAN_ADD (Ban_j.t_of_string contents)
+        | "GUILD_BAN_REMOVE" -> GUILD_BAN_REMOVE (Ban_j.t_of_string contents)
+        | "GUILD_EMOJIS_UPDATE" -> GUILD_EMOJIS_UPDATE (Yojson.Safe.from_string contents)
+        | "GUILD_INTEGRATIONS_UPDATE" -> GUILD_INTEGRATIONS_UPDATE (Yojson.Safe.from_string contents)
+        | "GUILD_MEMBER_ADD" -> GUILD_MEMBER_ADD (Member_j.t_of_string contents)
+        | "GUILD_MEMBER_REMOVE" -> GUILD_MEMBER_REMOVE (Member_j.t_of_string contents)
+        | "GUILD_MEMBER_UPDATE" -> GUILD_MEMBER_UPDATE (Member_j.t_of_string contents)
+        | "GUILD_MEMBERS_CHUNK" -> GUILD_MEMBERS_CHUNK (Yojson.Safe.(from_string contents |> Util.to_list) |> List.map ~f:(fun m -> Yojson.Safe.to_string m |> Member_j.t_of_string))
+        | "GUILD_ROLE_CREATE" -> GUILD_ROLE_CREATE (Role_j.t_of_string contents)
+        | "GUILD_ROLE_UPDATE" -> GUILD_ROLE_UPDATE (Role_j.t_of_string contents)
+        | "GUILD_ROLE_DELETE" -> GUILD_ROLE_DELETE (Role_j.t_of_string contents)
+        | "MESSAGE_CREATE" -> MESSAGE_CREATE (Message_j.t_of_string contents)
+        | "MESSAGE_UPDATE" -> MESSAGE_UPDATE (Message_j.t_of_string contents)
+        | "MESSAGE_DELETE" -> MESSAGE_DELETE (Message_j.t_of_string contents)
+        | "MESSAGE_BULK_DELETE" -> MESSAGE_BULK_DELETE (Yojson.Safe.(from_string contents |> Util.to_list) |> List.map ~f:(fun m -> Yojson.Safe.to_string m |> Message_j.t_of_string))
+        | "MESSAGE_REACTION_ADD" -> MESSAGE_REACTION_ADD (Reaction_j.t_of_string contents)
+        | "MESSAGE_REACTION_REMOVE" -> MESSAGE_REACTION_REMOVE (Reaction_j.t_of_string contents)
+        | "MESSAGE_REACTION_REMOVE_ALL" -> MESSAGE_REACTION_REMOVE_ALL (Yojson.Safe.(from_string contents |> Util.to_list) |> List.map ~f:(fun m -> Yojson.Safe.to_string m |> Reaction_j.t_of_string))
+        | "PRESENCE_UPDATE" -> PRESENCE_UPDATE (Presence_j.t_of_string contents)
+        | "TYPING_START" -> TYPING_START (Yojson.Safe.from_string contents)
+        | "USER_UPDATE" -> USER_UPDATE (Yojson.Safe.from_string contents)
+        | "VOICE_STATE_UPDATE" -> VOICE_STATE_UPDATE (Yojson.Safe.from_string contents)
+        | "VOICE_SERVER_UPDATE" -> VOICE_SERVER_UPDATE (Yojson.Safe.from_string contents)
+        | "WEBHOOKS_UPDATE" -> WEBHOOKS_UPDATE (Yojson.Safe.from_string contents)
         | s -> raise (Invalid_event s)
 
     let dispatch ~ev contents =