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/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 +- 13 files changed, 20 insertions(+), 12 deletions(-) (limited to 'lib/models') 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