Update types :)

10 files changed, 12 insertions, 15 deletions

diff --git a/lib/models/channel/channel_t.ml b/lib/models/channel/channel_t.ml
index bdc5b4b..8611d9c 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.json

+exception Invalid_channel of Yojson.Safe.t

 

 type group = {

     id: Channel_id_t.t;

diff --git a/lib/models/channel/channel_t.mli b/lib/models/channel/channel_t.mli
index 8b8cc77..313939f 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.json

+exception Invalid_channel of Yojson.Safe.t

 

 (** Represents a Group channel object. *)

 type group = {

diff --git a/lib/models/channel/message/reaction.mli b/lib/models/channel/message/reaction.mli
index 38343cb..20ab436 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.json Deferred.Or_error.t
+(* val delete : Reaction_t.t -> Yojson.Safe.t 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 d03deec..542572f 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.json

+    ; value: Yojson.Safe.t

     }

 

     let deserialize kind value = { kind; value; } 

diff --git a/lib/models/guild/guild.mli b/lib/models/guild/guild.mli
index 6840828..1fbcf55 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.json) list -> t Deferred.Or_error.t

+val create : (string * Yojson.Safe.t) 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.json Deferred.Or_error.t

+val get_invites : t -> Yojson.Safe.t Deferred.Or_error.t

 val get_prune_count : days:int -> t -> int Deferred.Or_error.t

-val get_webhooks : t -> Yojson.Safe.json Deferred.Or_error.t

+val get_webhooks : t -> Yojson.Safe.t 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.json Deferred.Or_error.t

+val list_voice_regions : t -> Yojson.Safe.t 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 1215396..c5a7455 100644
--- a/lib/models/guild/member.ml
+++ b/lib/models/guild/member.ml
@@ -1,4 +1,3 @@
-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 1063d44..55e5813 100644
--- a/lib/models/guild/role.ml
+++ b/lib/models/guild/role.ml
@@ -1,4 +1,3 @@
-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 ca8208f..6b3385c 100644
--- a/lib/models/id/guild_id.ml
+++ b/lib/models/id/guild_id.ml
@@ -1,4 +1,3 @@
-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 bda5b4c..11f34f7 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.json Deferred.Or_error.t

+val get_invites : t -> Yojson.Safe.t Deferred.Or_error.t

 val get_prune_count : days:int -> t -> int Deferred.Or_error.t

-val get_webhooks : t -> Yojson.Safe.json Deferred.Or_error.t

+val get_webhooks : t -> Yojson.Safe.t 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.json Deferred.Or_error.t

+val list_voice_regions : t -> Yojson.Safe.t 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/snowflake.ml b/lib/models/snowflake.ml
index 92c692c..2bf2281 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.json = `String (Int.to_string s)

+let to_yojson s : Yojson.Safe.t = `String (Int.to_string s)

 

 let timestamp snowflake = (snowflake lsr 22) + 1_420_070_400_000