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/cache.ml | 2 +- lib/client.mli | 4 +- 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 +-- lib/http/endpoints.ml | 1 + lib/http/http.mli | 112 ++++++++++++++++---------------- lib/models/channel/channel_t.ml | 2 +- lib/models/channel/channel_t.mli | 2 +- lib/models/channel/message/message.ml | 1 + lib/models/channel/message/reaction.mli | 2 +- lib/models/event_models.ml | 2 +- lib/models/guild/guild.mli | 8 +-- lib/models/guild/member.ml | 1 + lib/models/guild/role.ml | 1 + lib/models/id/guild_id.ml | 1 + lib/models/id/guild_id.mli | 6 +- lib/models/id/message_id.ml | 2 + lib/models/id/role_id.ml | 2 + lib/models/snowflake.ml | 2 +- 24 files changed, 102 insertions(+), 90 deletions(-) (limited to 'lib') diff --git a/lib/cache.ml b/lib/cache.ml index 50d431c..2571b34 100644 --- a/lib/cache.ml +++ b/lib/cache.ml @@ -1,5 +1,5 @@ -open Async open Core +open Async module ChannelMap = Map.Make(Channel_id_t) module GuildMap = Map.Make(Guild_id_t) diff --git a/lib/client.mli b/lib/client.mli index c5b5501..8b60090 100644 --- a/lib/client.mli +++ b/lib/client.mli @@ -29,10 +29,10 @@ type t = { val start : ?count:int -> ?compress:bool -> ?large:int -> string -> t Deferred.t (** Same as {!Sharder.set_status} where [client.sharder] is passed. *) -val set_status : status:Yojson.Safe.t -> t -> Sharder.Shard.shard list Deferred.t +val set_status : status:Yojson.Safe.json -> t -> Sharder.Shard.shard list Deferred.t (** Same as {!Sharder.set_status_with} where [client.sharder] is passed. *) -val set_status_with : f:(Sharder.Shard.shard -> Yojson.Safe.t) -> t -> Sharder.Shard.shard list Deferred.t +val set_status_with : f:(Sharder.Shard.shard -> Yojson.Safe.json) -> t -> Sharder.Shard.shard list Deferred.t (** Same as {!Sharder.request_guild_members} where [client.sharder] is passed. *) val request_guild_members : guild:Guild_id.t -> ?query:string -> ?limit:int -> t -> Sharder.Shard.shard list Deferred.t \ No newline at end of file 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 diff --git a/lib/http/endpoints.ml b/lib/http/endpoints.ml index 9263207..8a2faea 100644 --- a/lib/http/endpoints.ml +++ b/lib/http/endpoints.ml @@ -1,3 +1,4 @@ +open Core open Printf let gateway = "/gateway" diff --git a/lib/http/http.mli b/lib/http/http.mli index fe587c7..46d20ad 100644 --- a/lib/http/http.mli +++ b/lib/http/http.mli @@ -6,32 +6,32 @@ module Base : sig val base_url : string val process_url : string -> Uri.t - val process_request_body : Yojson.Safe.t -> Cohttp_async.Body.t + val process_request_body : Yojson.Safe.json -> Cohttp_async.Body.t val process_request_headers : unit -> Cohttp.Header.t val process_response : string -> Cohttp_async.Response.t * Cohttp_async.Body.t -> - Yojson.Safe.t Deferred.Or_error.t + Yojson.Safe.json Deferred.Or_error.t val request : - ?body:Yojson.Safe.t -> + ?body:Yojson.Safe.json -> ?query:(string * string) list -> [> `DELETE | `GET | `PATCH | `POST | `PUT ] -> string -> - Yojson.Safe.t Deferred.Or_error.t + Yojson.Safe.json Deferred.Or_error.t end -val get_gateway : unit -> Yojson.Safe.t Deferred.Or_error.t -val get_gateway_bot : unit -> Yojson.Safe.t Deferred.Or_error.t +val get_gateway : unit -> Yojson.Safe.json Deferred.Or_error.t +val get_gateway_bot : unit -> Yojson.Safe.json Deferred.Or_error.t val get_channel : int -> Channel_t.t Deferred.Or_error.t val modify_channel : - int -> Yojson.Safe.t -> Channel_t.t Deferred.Or_error.t + int -> Yojson.Safe.json -> Channel_t.t Deferred.Or_error.t val delete_channel : int -> Channel_t.t Deferred.Or_error.t val get_messages : int -> int -> string * int -> Message_t.t list Deferred.Or_error.t val get_message : int -> int -> Message_t.t Deferred.Or_error.t val create_message : - int -> Yojson.Safe.t -> Message_t.t Deferred.Or_error.t + int -> Yojson.Safe.json -> Message_t.t Deferred.Or_error.t val create_reaction : int -> int -> string -> unit Deferred.Or_error.t val delete_own_reaction : @@ -44,17 +44,17 @@ val delete_reactions : int -> int -> unit Deferred.Or_error.t val edit_message : int -> - int -> Yojson.Safe.t -> Message_t.t Deferred.Or_error.t + int -> Yojson.Safe.json -> Message_t.t Deferred.Or_error.t val delete_message : int -> int -> unit Deferred.Or_error.t val bulk_delete : - int -> Yojson.Safe.t -> unit Deferred.Or_error.t + int -> Yojson.Safe.json -> unit Deferred.Or_error.t val edit_channel_permissions : int -> - int -> Yojson.Safe.t -> unit Deferred.Or_error.t -val get_channel_invites : int -> Yojson.Safe.t Deferred.Or_error.t + int -> Yojson.Safe.json -> unit Deferred.Or_error.t +val get_channel_invites : int -> Yojson.Safe.json Deferred.Or_error.t val create_channel_invite : - int -> Yojson.Safe.t -> Yojson.Safe.t Deferred.Or_error.t + int -> Yojson.Safe.json -> Yojson.Safe.json Deferred.Or_error.t val delete_channel_permission : int -> int -> unit Deferred.Or_error.t val broadcast_typing : int -> unit Deferred.Or_error.t @@ -68,35 +68,35 @@ val group_recipient_remove : val get_emojis : int -> Emoji.t list Deferred.Or_error.t val get_emoji : int -> int -> Emoji.t Deferred.Or_error.t val create_emoji : - int -> Yojson.Safe.t -> Emoji.t Deferred.Or_error.t + int -> Yojson.Safe.json -> Emoji.t Deferred.Or_error.t val edit_emoji : int -> - int -> Yojson.Safe.t -> Emoji.t Deferred.Or_error.t + int -> Yojson.Safe.json -> Emoji.t Deferred.Or_error.t val delete_emoji : int -> int -> unit Deferred.Or_error.t val create_guild : - Yojson.Safe.t -> Guild_t.t Deferred.Or_error.t + Yojson.Safe.json -> Guild_t.t Deferred.Or_error.t val get_guild : int -> Guild_t.t Deferred.Or_error.t val edit_guild : - int -> Yojson.Safe.t -> Guild_t.t Deferred.Or_error.t + int -> Yojson.Safe.json -> Guild_t.t Deferred.Or_error.t val delete_guild : int -> unit Deferred.Or_error.t val get_guild_channels : int -> Channel_t.t list Deferred.Or_error.t val create_guild_channel : - int -> Yojson.Safe.t -> Channel_t.t Deferred.Or_error.t + int -> Yojson.Safe.json -> Channel_t.t Deferred.Or_error.t val modify_guild_channel_positions : - int -> Yojson.Safe.t -> unit Deferred.Or_error.t + int -> Yojson.Safe.json -> unit Deferred.Or_error.t val get_member : int -> int -> Member.t Deferred.Or_error.t val get_members : int -> Member.t list Deferred.Or_error.t val add_member : int -> - int -> Yojson.Safe.t -> Member.t Deferred.Or_error.t + int -> Yojson.Safe.json -> Member.t Deferred.Or_error.t val edit_member : int -> - int -> Yojson.Safe.t -> unit Deferred.Or_error.t + int -> Yojson.Safe.json -> unit Deferred.Or_error.t val remove_member : int -> - int -> Yojson.Safe.t -> unit Deferred.Or_error.t + int -> Yojson.Safe.json -> unit Deferred.Or_error.t val change_nickname : - int -> Yojson.Safe.t -> Yojson.Safe.t Deferred.Or_error.t + int -> Yojson.Safe.json -> Yojson.Safe.json Deferred.Or_error.t val add_member_role : int -> int -> int -> unit Deferred.Or_error.t val remove_member_role : @@ -105,18 +105,18 @@ val get_bans : int -> Ban.t list Deferred.Or_error.t val get_ban : int -> int -> Ban.t Deferred.Or_error.t val guild_ban_add : int -> - int -> Yojson.Safe.t -> unit Deferred.Or_error.t + int -> Yojson.Safe.json -> unit Deferred.Or_error.t val guild_ban_remove : int -> - int -> Yojson.Safe.t -> unit Deferred.Or_error.t + int -> Yojson.Safe.json -> unit Deferred.Or_error.t val get_roles : int -> Role_t.t list Deferred.Or_error.t val guild_role_add : - int -> Yojson.Safe.t -> Role_t.t Deferred.Or_error.t + int -> Yojson.Safe.json -> Role_t.t Deferred.Or_error.t val guild_roles_edit : - int -> Yojson.Safe.t -> Role_t.t list Deferred.Or_error.t + int -> Yojson.Safe.json -> Role_t.t list Deferred.Or_error.t val guild_role_edit : int -> - int -> Yojson.Safe.t -> Role_t.t Deferred.Or_error.t + int -> Yojson.Safe.json -> Role_t.t Deferred.Or_error.t val guild_role_remove : int -> int -> unit Deferred.Or_error.t val guild_prune_count : @@ -124,62 +124,62 @@ val guild_prune_count : val guild_prune_start : int -> int -> int Deferred.Or_error.t val get_guild_voice_regions : - int -> Yojson.Safe.t Deferred.Or_error.t -val get_guild_invites : int -> Yojson.Safe.t Deferred.Or_error.t -val get_integrations : int -> Yojson.Safe.t Deferred.Or_error.t + int -> Yojson.Safe.json Deferred.Or_error.t +val get_guild_invites : int -> Yojson.Safe.json Deferred.Or_error.t +val get_integrations : int -> Yojson.Safe.json Deferred.Or_error.t val add_integration : - int -> Yojson.Safe.t -> unit Deferred.Or_error.t + int -> Yojson.Safe.json -> unit Deferred.Or_error.t val edit_integration : int -> - int -> Yojson.Safe.t -> unit Deferred.Or_error.t + int -> Yojson.Safe.json -> unit Deferred.Or_error.t val delete_integration : int -> int -> unit Deferred.Or_error.t val sync_integration : int -> int -> unit Deferred.Or_error.t -val get_guild_embed : int -> Yojson.Safe.t Deferred.Or_error.t +val get_guild_embed : int -> Yojson.Safe.json Deferred.Or_error.t val edit_guild_embed : - int -> Yojson.Safe.t -> Yojson.Safe.t Deferred.Or_error.t -val get_vanity_url : int -> Yojson.Safe.t Deferred.Or_error.t -val get_invite : string -> Yojson.Safe.t Deferred.Or_error.t -val delete_invite : string -> Yojson.Safe.t Deferred.Or_error.t + int -> Yojson.Safe.json -> Yojson.Safe.json Deferred.Or_error.t +val get_vanity_url : int -> Yojson.Safe.json Deferred.Or_error.t +val get_invite : string -> Yojson.Safe.json Deferred.Or_error.t +val delete_invite : string -> Yojson.Safe.json Deferred.Or_error.t val get_current_user : unit -> User_t.t Deferred.Or_error.t val edit_current_user : - Yojson.Safe.t -> User_t.t Deferred.Or_error.t + Yojson.Safe.json -> User_t.t Deferred.Or_error.t val get_guilds : unit -> Guild_t.t list Deferred.Or_error.t val leave_guild : int -> unit Deferred.Or_error.t val get_private_channels : - unit -> Yojson.Safe.t Deferred.Or_error.t + unit -> Yojson.Safe.json Deferred.Or_error.t val create_dm : - Yojson.Safe.t -> Yojson.Safe.t Deferred.Or_error.t + Yojson.Safe.json -> Yojson.Safe.json Deferred.Or_error.t val create_group_dm : - Yojson.Safe.t -> Yojson.Safe.t Deferred.Or_error.t -val get_connections : unit -> Yojson.Safe.t Deferred.Or_error.t + Yojson.Safe.json -> Yojson.Safe.json Deferred.Or_error.t +val get_connections : unit -> Yojson.Safe.json Deferred.Or_error.t val get_user : int -> User_t.t Deferred.Or_error.t -val get_voice_regions : unit -> Yojson.Safe.t Deferred.Or_error.t +val get_voice_regions : unit -> Yojson.Safe.json Deferred.Or_error.t val create_webhook : - int -> Yojson.Safe.t -> Yojson.Safe.t Deferred.Or_error.t -val get_channel_webhooks : int -> Yojson.Safe.t Deferred.Or_error.t -val get_guild_webhooks : int -> Yojson.Safe.t Deferred.Or_error.t -val get_webhook : int -> Yojson.Safe.t Deferred.Or_error.t + int -> Yojson.Safe.json -> Yojson.Safe.json Deferred.Or_error.t +val get_channel_webhooks : int -> Yojson.Safe.json Deferred.Or_error.t +val get_guild_webhooks : int -> Yojson.Safe.json Deferred.Or_error.t +val get_webhook : int -> Yojson.Safe.json Deferred.Or_error.t val get_webhook_with_token : - int -> string -> Yojson.Safe.t Deferred.Or_error.t + int -> string -> Yojson.Safe.json Deferred.Or_error.t val edit_webhook : - int -> Yojson.Safe.t -> Yojson.Safe.t Deferred.Or_error.t + int -> Yojson.Safe.json -> Yojson.Safe.json Deferred.Or_error.t val edit_webhook_with_token : int -> - string -> Yojson.Safe.t -> Yojson.Safe.t Deferred.Or_error.t + string -> Yojson.Safe.json -> Yojson.Safe.json Deferred.Or_error.t val delete_webhook : int -> unit Deferred.Or_error.t val delete_webhook_with_token : int -> string -> unit Deferred.Or_error.t val execute_webhook : int -> - string -> Yojson.Safe.t -> Yojson.Safe.t Deferred.Or_error.t + string -> Yojson.Safe.json -> Yojson.Safe.json Deferred.Or_error.t val execute_slack_webhook : int -> - string -> Yojson.Safe.t -> Yojson.Safe.t Deferred.Or_error.t + string -> Yojson.Safe.json -> Yojson.Safe.json Deferred.Or_error.t val execute_git_webhook : int -> - string -> Yojson.Safe.t -> Yojson.Safe.t Deferred.Or_error.t + string -> Yojson.Safe.json -> Yojson.Safe.json Deferred.Or_error.t val get_audit_logs : - int -> Yojson.Safe.t -> Yojson.Safe.t Deferred.Or_error.t -val get_application_info : unit -> Yojson.Safe.t Deferred.Or_error.t \ No newline at end of file + int -> Yojson.Safe.json -> Yojson.Safe.json Deferred.Or_error.t +val get_application_info : unit -> Yojson.Safe.json Deferred.Or_error.t \ No newline at end of file diff --git a/lib/models/channel/channel_t.ml b/lib/models/channel/channel_t.ml index 8611d9c..bdc5b4b 100644 --- a/lib/models/channel/channel_t.ml +++ b/lib/models/channel/channel_t.ml @@ -1,6 +1,6 @@ open Core -exception Invalid_channel of Yojson.Safe.t +exception Invalid_channel of Yojson.Safe.json type group = { id: Channel_id_t.t; diff --git a/lib/models/channel/channel_t.mli b/lib/models/channel/channel_t.mli index 313939f..8b8cc77 100644 --- a/lib/models/channel/channel_t.mli +++ b/lib/models/channel/channel_t.mli @@ -1,4 +1,4 @@ -exception Invalid_channel of Yojson.Safe.t +exception Invalid_channel of Yojson.Safe.json (** Represents a Group channel object. *) type group = { diff --git a/lib/models/channel/message/message.ml b/lib/models/channel/message/message.ml index 43929d2..d3917e9 100644 --- a/lib/models/channel/message/message.ml +++ b/lib/models/channel/message/message.ml @@ -1,3 +1,4 @@ +open Core open Async include Message_t diff --git a/lib/models/channel/message/reaction.mli b/lib/models/channel/message/reaction.mli index 20ab436..38343cb 100644 --- a/lib/models/channel/message/reaction.mli +++ b/lib/models/channel/message/reaction.mli @@ -1,6 +1,6 @@ include module type of Reaction_t -(* val delete : Reaction_t.t -> Yojson.Safe.t Deferred.Or_error.t +(* val delete : Reaction_t.t -> Yojson.Safe.json Deferred.Or_error.t val get_users : Reaction_t.t -> int -> User_t.t list Deferred.Or_error.t val get_users_after : Reaction_t.t -> Snowflake.t -> int -> User_t.t list Deferred.Or_error.t val get_users_before : Reaction_t.t -> Snowflake.t -> int -> User_t.t list Deferred.Or_error.t *) \ No newline at end of file diff --git a/lib/models/event_models.ml b/lib/models/event_models.ml index 542572f..d03deec 100644 --- a/lib/models/event_models.ml +++ b/lib/models/event_models.ml @@ -635,7 +635,7 @@ end module Unknown = struct type t = { kind: string - ; value: Yojson.Safe.t + ; value: Yojson.Safe.json } let deserialize kind value = { kind; value; } diff --git a/lib/models/guild/guild.mli b/lib/models/guild/guild.mli index 1fbcf55..6840828 100644 --- a/lib/models/guild/guild.mli +++ b/lib/models/guild/guild.mli @@ -3,7 +3,7 @@ open Async include module type of Guild_t val ban_user : id:Snowflake.t -> ?reason:string -> ?days:int -> t -> unit Deferred.Or_error.t -val create : (string * Yojson.Safe.t) list -> t Deferred.Or_error.t +val create : (string * Yojson.Safe.json) list -> t Deferred.Or_error.t val create_emoji : name:string -> image:string -> t -> Emoji.t Deferred.Or_error.t val create_role : name:string -> @@ -18,12 +18,12 @@ val delete : t -> unit Deferred.Or_error.t val get_ban : id:Snowflake.t -> t -> Ban_t.t Deferred.Or_error.t val get_bans : t -> Ban_t.t list Deferred.Or_error.t val get_emoji : id:Snowflake.t -> t -> Emoji.t Deferred.Or_error.t -val get_invites : t -> Yojson.Safe.t Deferred.Or_error.t +val get_invites : t -> Yojson.Safe.json Deferred.Or_error.t val get_prune_count : days:int -> t -> int Deferred.Or_error.t -val get_webhooks : t -> Yojson.Safe.t Deferred.Or_error.t +val get_webhooks : t -> Yojson.Safe.json Deferred.Or_error.t val kick_user : id:Snowflake.t -> ?reason:string -> t -> unit Deferred.Or_error.t val leave : t -> unit Deferred.Or_error.t -val list_voice_regions : t -> Yojson.Safe.t Deferred.Or_error.t +val list_voice_regions : t -> Yojson.Safe.json Deferred.Or_error.t val prune : days:int -> t -> int Deferred.Or_error.t val request_members : t -> Member_t.t list Deferred.Or_error.t val set_afk_channel : id:Snowflake.t -> t -> Guild_t.t Deferred.Or_error.t diff --git a/lib/models/guild/member.ml b/lib/models/guild/member.ml index c5a7455..1215396 100644 --- a/lib/models/guild/member.ml +++ b/lib/models/guild/member.ml @@ -1,3 +1,4 @@ +open Core include Member_t let add_role ~(role:Role_t.t) member = diff --git a/lib/models/guild/role.ml b/lib/models/guild/role.ml index 55e5813..1063d44 100644 --- a/lib/models/guild/role.ml +++ b/lib/models/guild/role.ml @@ -1,3 +1,4 @@ +open Core include Role_t let edit_role ~body (role:t) = diff --git a/lib/models/id/guild_id.ml b/lib/models/id/guild_id.ml index 6b3385c..ca8208f 100644 --- a/lib/models/id/guild_id.ml +++ b/lib/models/id/guild_id.ml @@ -1,3 +1,4 @@ +open Core include Guild_id_t let ban_user ~id ?(reason="") ?(days=0) guild = diff --git a/lib/models/id/guild_id.mli b/lib/models/id/guild_id.mli index 11f34f7..bda5b4c 100644 --- a/lib/models/id/guild_id.mli +++ b/lib/models/id/guild_id.mli @@ -16,12 +16,12 @@ val delete : t -> unit Deferred.Or_error.t val get_ban : id:Snowflake.t -> t -> Ban_t.t Deferred.Or_error.t val get_bans : t -> Ban_t.t list Deferred.Or_error.t val get_emoji : id:Snowflake.t -> t -> Emoji.t Deferred.Or_error.t -val get_invites : t -> Yojson.Safe.t Deferred.Or_error.t +val get_invites : t -> Yojson.Safe.json Deferred.Or_error.t val get_prune_count : days:int -> t -> int Deferred.Or_error.t -val get_webhooks : t -> Yojson.Safe.t Deferred.Or_error.t +val get_webhooks : t -> Yojson.Safe.json Deferred.Or_error.t val kick_user : id:Snowflake.t -> ?reason:string -> t -> unit Deferred.Or_error.t val leave : t -> unit Deferred.Or_error.t -val list_voice_regions : t -> Yojson.Safe.t Deferred.Or_error.t +val list_voice_regions : t -> Yojson.Safe.json Deferred.Or_error.t val prune : days:int -> t -> int Deferred.Or_error.t val request_members : t -> Member_t.t list Deferred.Or_error.t val set_afk_channel : id:Snowflake.t -> t -> Guild_t.t Deferred.Or_error.t diff --git a/lib/models/id/message_id.ml b/lib/models/id/message_id.ml index 10bcb1d..3c45e16 100644 --- a/lib/models/id/message_id.ml +++ b/lib/models/id/message_id.ml @@ -1,3 +1,5 @@ +open Core + type t = [ `Message_id of Snowflake.t ] [@@deriving sexp] let of_yojson a : (t, string) result = diff --git a/lib/models/id/role_id.ml b/lib/models/id/role_id.ml index f055b1a..0bbf8be 100644 --- a/lib/models/id/role_id.ml +++ b/lib/models/id/role_id.ml @@ -1,3 +1,5 @@ +open Core + type t = [ `Role_id of Snowflake.t ] [@@deriving sexp] let of_yojson a : (t, string) result = diff --git a/lib/models/snowflake.ml b/lib/models/snowflake.ml index 2bf2281..92c692c 100644 --- a/lib/models/snowflake.ml +++ b/lib/models/snowflake.ml @@ -8,7 +8,7 @@ let of_yojson d = try Ok (of_yojson_exn d) with Yojson.Safe.Util.Type_error (why,_) -> Error why -let to_yojson s : Yojson.Safe.t = `String (Int.to_string s) +let to_yojson s : Yojson.Safe.json = `String (Int.to_string s) let timestamp snowflake = (snowflake lsr 22) + 1_420_070_400_000 -- cgit v1.2.3