From b245933103d84a4320a9b21f0faaf84a11a2886b Mon Sep 17 00:00:00 2001 From: Adelyn Breedlove Date: Tue, 12 Feb 2019 19:49:33 +0000 Subject: Fix opam dependencies and revert changes --- lib/gateway/dispatch.ml | 7 ++++--- lib/gateway/dispatch.mli | 6 +++--- lib/gateway/event.ml | 6 +++--- lib/gateway/event.mli | 10 +++++----- lib/gateway/opcode.ml | 2 ++ lib/gateway/sharder.ml | 2 +- lib/gateway/sharder.mli | 8 ++++---- 7 files changed, 22 insertions(+), 19 deletions(-) (limited to 'lib/gateway') diff --git a/lib/gateway/dispatch.ml b/lib/gateway/dispatch.ml index b4fc9d2..4a712d8 100644 --- a/lib/gateway/dispatch.ml +++ b/lib/gateway/dispatch.ml @@ -1,3 +1,4 @@ +open Core open Event_models let ready = ref (fun (_:Ready.t) -> ()) @@ -12,7 +13,7 @@ let guild_delete = ref (fun (_:GuildDelete.t) -> ()) let member_ban = ref (fun (_:GuildBanAdd.t) -> ()) let member_unban = ref (fun (_:GuildBanRemove.t) -> ()) let guild_emojis_update = ref (fun (_:GuildEmojisUpdate.t) -> ()) -(* let integrations_update = ref (fun (_:Yojson.Safe.t) -> ()) *) +(* let integrations_update = ref (fun (_:Yojson.Safe.json) -> ()) *) let member_join = ref (fun (_:GuildMemberAdd.t) -> ()) let member_leave = ref (fun (_:GuildMemberRemove.t) -> ()) let member_update = ref (fun (_:GuildMemberUpdate.t) -> ()) @@ -30,7 +31,7 @@ let reaction_remove_all = ref (fun (_:ReactionRemoveAll.t) -> ()) let presence_update = ref (fun (_:PresenceUpdate.t) -> ()) let typing_start = ref (fun (_:TypingStart.t) -> ()) let user_update = ref (fun (_:UserUpdate.t) -> ()) -(* let voice_state_update = ref (fun (_:Yojson.Safe.t) -> ()) *) -(* let voice_server_update = ref (fun (_:Yojson.Safe.t) -> ()) *) +(* let voice_state_update = ref (fun (_:Yojson.Safe.json) -> ()) *) +(* let voice_server_update = ref (fun (_:Yojson.Safe.json) -> ()) *) let webhook_update = ref (fun (_:WebhookUpdate.t) -> ()) let unknown = ref (fun (_:Unknown.t) -> ()) \ No newline at end of file diff --git a/lib/gateway/dispatch.mli b/lib/gateway/dispatch.mli index 18b9261..36f3ece 100644 --- a/lib/gateway/dispatch.mli +++ b/lib/gateway/dispatch.mli @@ -56,7 +56,7 @@ val member_unban : (GuildBanRemove.t -> unit) ref val guild_emojis_update : (GuildEmojisUpdate.t -> unit) ref (** Dispatched when a guild's integrations are updated. *) -(* val integrations_update : (Yojson.Safe.t -> unit) ref *) +(* val integrations_update : (Yojson.Safe.json -> unit) ref *) (** Dispatched when a member joins a guild. *) val member_join : (GuildMemberAdd.t -> unit) ref @@ -116,5 +116,5 @@ val webhook_update : (WebhookUpdate.t -> unit) ref val unknown : (Unknown.t -> unit) ref (**/**) -(* val voice_state_update : (Yojson.Safe.t -> unit) ref *) -(* val voice_server_update : (Yojson.Safe.t -> unit) ref *) \ No newline at end of file +(* val voice_state_update : (Yojson.Safe.json -> unit) ref *) +(* val voice_server_update : (Yojson.Safe.json -> unit) ref *) \ No newline at end of file diff --git a/lib/gateway/event.ml b/lib/gateway/event.ml index 88dd50d..09671d1 100644 --- a/lib/gateway/event.ml +++ b/lib/gateway/event.ml @@ -15,7 +15,7 @@ type t = | GUILD_BAN_ADD of GuildBanAdd.t | GUILD_BAN_REMOVE of GuildBanRemove.t | GUILD_EMOJIS_UPDATE of GuildEmojisUpdate.t -(* | GUILD_INTEGRATIONS_UPDATE of Yojson.Safe.t *) +(* | GUILD_INTEGRATIONS_UPDATE of Yojson.Safe.json *) | GUILD_MEMBER_ADD of GuildMemberAdd.t | GUILD_MEMBER_REMOVE of GuildMemberRemove.t | GUILD_MEMBER_UPDATE of GuildMemberUpdate.t @@ -33,8 +33,8 @@ type t = | PRESENCE_UPDATE of PresenceUpdate.t | TYPING_START of TypingStart.t | USER_UPDATE of UserUpdate.t -(* | VOICE_STATE_UPDATE of Yojson.Safe.t *) -(* | VOICE_SERVER_UPDATE of Yojson.Safe.t *) +(* | VOICE_STATE_UPDATE of Yojson.Safe.json *) +(* | VOICE_SERVER_UPDATE of Yojson.Safe.json *) | WEBHOOK_UPDATE of WebhookUpdate.t | UNKNOWN of Unknown.t diff --git a/lib/gateway/event.mli b/lib/gateway/event.mli index 4db3c84..d4a539b 100644 --- a/lib/gateway/event.mli +++ b/lib/gateway/event.mli @@ -16,7 +16,7 @@ type t = | GUILD_BAN_ADD of GuildBanAdd.t | GUILD_BAN_REMOVE of GuildBanRemove.t | GUILD_EMOJIS_UPDATE of GuildEmojisUpdate.t -(* | GUILD_INTEGRATIONS_UPDATE of Yojson.Safe.t *) +(* | GUILD_INTEGRATIONS_UPDATE of Yojson.Safe.json *) | GUILD_MEMBER_ADD of GuildMemberAdd.t | GUILD_MEMBER_REMOVE of GuildMemberRemove.t | GUILD_MEMBER_UPDATE of GuildMemberUpdate.t @@ -34,16 +34,16 @@ type t = | PRESENCE_UPDATE of PresenceUpdate.t | TYPING_START of TypingStart.t | USER_UPDATE of UserUpdate.t -(* | VOICE_STATE_UPDATE of Yojson.Safe.t *) -(* | VOICE_SERVER_UPDATE of Yojson.Safe.t *) +(* | VOICE_STATE_UPDATE of Yojson.Safe.json *) +(* | VOICE_SERVER_UPDATE of Yojson.Safe.json *) | WEBHOOK_UPDATE of WebhookUpdate.t | UNKNOWN of Unknown.t (** Used to convert an event string and payload into a t wrapper type. *) -val event_of_yojson : contents:Yojson.Safe.t -> string -> t +val event_of_yojson : contents:Yojson.Safe.json -> string -> t (** Sends the event to the registered handler. *) val dispatch : t -> unit (** Wrapper to other functions. This is called from the shards. *) -val handle_event : ev:string -> Yojson.Safe.t -> unit \ No newline at end of file +val handle_event : ev:string -> Yojson.Safe.json -> unit \ No newline at end of file diff --git a/lib/gateway/opcode.ml b/lib/gateway/opcode.ml index 32ab5b4..e2f44aa 100644 --- a/lib/gateway/opcode.ml +++ b/lib/gateway/opcode.ml @@ -1,3 +1,5 @@ +open Core + type t = | DISPATCH | HEARTBEAT diff --git a/lib/gateway/sharder.ml b/lib/gateway/sharder.ml index 9fcb10d..1929d15 100644 --- a/lib/gateway/sharder.ml +++ b/lib/gateway/sharder.ml @@ -107,7 +107,7 @@ module Shard = struct ; session = session } - let set_status ~(status:Yojson.Safe.t) shard = + let set_status ~(status:Yojson.Safe.json) shard = let payload = match status with | `Assoc ["name", `String name; "type", `Int t] | `Assoc ["type", `Int t; "name", `String name] -> diff --git a/lib/gateway/sharder.mli b/lib/gateway/sharder.mli index a5f18e6..8ee288b 100644 --- a/lib/gateway/sharder.mli +++ b/lib/gateway/sharder.mli @@ -48,7 +48,7 @@ module Shard : sig (** Set the status of the shard. *) val set_status : - status:Yojson.Safe.t -> + status:Yojson.Safe.json -> shard -> shard Deferred.t @@ -78,13 +78,13 @@ end (** Calls {!Shard.set_status} for each shard registered with the sharder. *) val set_status : - status:Yojson.Safe.t -> + status:Yojson.Safe.json -> t -> Shard.shard list Deferred.t -(** Like {!set_status} but takes a function with a {{!Shard.shard}shard} as its parameter and {{!Yojson.Safe.t}json} for its return. *) +(** Like {!set_status} but takes a function with a {{!Shard.shard}shard} as its parameter and {{!Yojson.Safe.json}json} for its return. *) val set_status_with : - f:(Shard.shard -> Yojson.Safe.t) -> + f:(Shard.shard -> Yojson.Safe.json) -> t -> Shard.shard list Deferred.t -- cgit v1.2.3