Update yojson to 1.6.0

16 files changed, 88 insertions, 86 deletions

diff --git a/disml.opam b/disml.opam
index 808416c..e390c37 100644
--- a/disml.opam
+++ b/disml.opam
@@ -30,6 +30,7 @@ depends: [
   "websocket-async" {>= "2.12"}

   "decompress"

   "odoc" {with-doc & >= "1.3.0"}

+  "yojson" {>= "1.6.0"}

 ]

 build: [

   ["dune" "subst"] {pinned}

diff --git a/lib/client.mli b/lib/client.mli
index 0b855e8..991f8e3 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.json -> t -> Sharder.Shard.shard list Deferred.t

+val set_status : status:Yojson.Safe.t -> 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.json) -> t -> Sharder.Shard.shard list Deferred.t

+val set_status_with : f:(Sharder.Shard.shard -> Yojson.Safe.t) -> t -> Sharder.Shard.shard list Deferred.t

 

 (** Same as {!Sharder.request_guild_members} where [client.sharder] is passed. *)

 val request_guild_members : guild:Snowflake.t -> ?query:string -> ?limit:int -> t -> Sharder.Shard.shard list Deferred.t
\ No newline at end of file
diff --git a/lib/dispatch.ml b/lib/dispatch.ml
index 3103285..b4fc9d2 100644
--- a/lib/dispatch.ml
+++ b/lib/dispatch.ml
@@ -12,7 +12,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.json) -> ()) *)

+(* let integrations_update = ref (fun (_:Yojson.Safe.t) -> ()) *)

 let member_join = ref (fun (_:GuildMemberAdd.t) -> ())

 let member_leave = ref (fun (_:GuildMemberRemove.t) -> ())

 let member_update = ref (fun (_:GuildMemberUpdate.t) -> ())

@@ -30,7 +30,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.json) -> ()) *)

-(* let voice_server_update = ref (fun (_:Yojson.Safe.json) -> ()) *)

+(* let voice_state_update = ref (fun (_:Yojson.Safe.t) -> ()) *)

+(* let voice_server_update = ref (fun (_:Yojson.Safe.t) -> ()) *)

 let webhook_update = ref (fun (_:WebhookUpdate.t) -> ())

 let unknown = ref (fun (_:Unknown.t) -> ())
\ No newline at end of file
diff --git a/lib/dispatch.mli b/lib/dispatch.mli
index 36f3ece..18b9261 100644
--- a/lib/dispatch.mli
+++ b/lib/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.json -> unit) ref *)

+(* val integrations_update : (Yojson.Safe.t -> 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.json -> unit) ref *)

-(* val voice_server_update : (Yojson.Safe.json -> unit) ref *)
\ No newline at end of file
+(* val voice_state_update : (Yojson.Safe.t -> unit) ref *)

+(* val voice_server_update : (Yojson.Safe.t -> unit) ref *)
\ No newline at end of file
diff --git a/lib/dune b/lib/dune
index cf0ff7e..936b5e9 100644
--- a/lib/dune
+++ b/lib/dune
@@ -22,6 +22,7 @@
 	)

 	(libraries checkseum.ocaml core async_ssl cohttp-async decompress logs yojson websocket-async ppx_deriving_yojson.runtime)

 	(preprocess (pps ppx_sexp_conv ppx_deriving_yojson))

+	(flags (:standard -w -D)) ; Temporary solution for Yojson `json` type deprecation. Remove when ppx_deriving_yojson updates

 )

 

 (include_subdirs unqualified)

diff --git a/lib/event.ml b/lib/event.ml
index 3f1fa9f..65bb845 100644
--- a/lib/event.ml
+++ b/lib/event.ml
@@ -14,7 +14,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.json *)

+(* | GUILD_INTEGRATIONS_UPDATE of Yojson.Safe.t *)

 | GUILD_MEMBER_ADD of GuildMemberAdd.t

 | GUILD_MEMBER_REMOVE of GuildMemberRemove.t

 | GUILD_MEMBER_UPDATE of GuildMemberUpdate.t

@@ -32,8 +32,8 @@ type t =
 | PRESENCE_UPDATE of PresenceUpdate.t

 | TYPING_START of TypingStart.t

 | USER_UPDATE of UserUpdate.t

-(* | VOICE_STATE_UPDATE of Yojson.Safe.json *)

-(* | VOICE_SERVER_UPDATE of Yojson.Safe.json *)

+(* | VOICE_STATE_UPDATE of Yojson.Safe.t *)

+(* | VOICE_SERVER_UPDATE of Yojson.Safe.t *)

 | WEBHOOK_UPDATE of WebhookUpdate.t

 | UNKNOWN of Unknown.t

 

diff --git a/lib/event.mli b/lib/event.mli
index d4a539b..4db3c84 100644
--- a/lib/event.mli
+++ b/lib/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.json *)

+(* | GUILD_INTEGRATIONS_UPDATE of Yojson.Safe.t *)

 | 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.json *)

-(* | VOICE_SERVER_UPDATE of Yojson.Safe.json *)

+(* | VOICE_STATE_UPDATE of Yojson.Safe.t *)

+(* | VOICE_SERVER_UPDATE of Yojson.Safe.t *)

 | 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.json -> string -> t

+val event_of_yojson : contents:Yojson.Safe.t -> 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.json -> unit
\ No newline at end of file
+val handle_event : ev:string -> Yojson.Safe.t -> unit
\ No newline at end of file
diff --git a/lib/http.mli b/lib/http.mli
index a7aa4d0..0092d9b 100644
--- a/lib/http.mli
+++ b/lib/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.json -> Cohttp_async.Body.t
+    val process_request_body : Yojson.Safe.t -> 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.json Deferred.Or_error.t
+        Yojson.Safe.t Deferred.Or_error.t
 
     val request :
-        ?body:Yojson.Safe.json ->
+        ?body:Yojson.Safe.t ->
         ?query:(string * string) list ->
         [> `DELETE | `GET | `PATCH | `POST | `PUT ] ->
         string ->
-        Yojson.Safe.json Deferred.Or_error.t
+        Yojson.Safe.t Deferred.Or_error.t
 end
 
-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_gateway : unit -> Yojson.Safe.t Deferred.Or_error.t
+val get_gateway_bot : unit -> Yojson.Safe.t Deferred.Or_error.t
 val get_channel : int -> Channel_t.t Deferred.Or_error.t
 val modify_channel :
-    int -> Yojson.Safe.json -> Channel_t.t Deferred.Or_error.t
+    int -> Yojson.Safe.t -> 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.json -> Message_t.t Deferred.Or_error.t
+    int -> Yojson.Safe.t -> 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.json -> Message_t.t Deferred.Or_error.t
+    int -> Yojson.Safe.t -> Message_t.t Deferred.Or_error.t
 val delete_message :
     int -> int -> unit Deferred.Or_error.t
 val bulk_delete :
-    int -> Yojson.Safe.json -> unit Deferred.Or_error.t
+    int -> Yojson.Safe.t -> unit Deferred.Or_error.t
 val edit_channel_permissions :
     int ->
-    int -> Yojson.Safe.json -> unit Deferred.Or_error.t
-val get_channel_invites : int -> Yojson.Safe.json Deferred.Or_error.t
+    int -> Yojson.Safe.t -> unit Deferred.Or_error.t
+val get_channel_invites : int -> Yojson.Safe.t Deferred.Or_error.t
 val create_channel_invite :
-    int -> Yojson.Safe.json -> Yojson.Safe.json Deferred.Or_error.t
+    int -> Yojson.Safe.t -> Yojson.Safe.t 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.json -> Emoji.t Deferred.Or_error.t
+    int -> Yojson.Safe.t -> Emoji.t Deferred.Or_error.t
 val edit_emoji :
     int ->
-    int -> Yojson.Safe.json -> Emoji.t Deferred.Or_error.t
+    int -> Yojson.Safe.t -> Emoji.t Deferred.Or_error.t
 val delete_emoji : int -> int -> unit Deferred.Or_error.t
 val create_guild :
-    Yojson.Safe.json -> Guild_t.t Deferred.Or_error.t
+    Yojson.Safe.t -> Guild_t.t Deferred.Or_error.t
 val get_guild : int -> Guild_t.t Deferred.Or_error.t
 val edit_guild :
-    int -> Yojson.Safe.json -> Guild_t.t Deferred.Or_error.t
+    int -> Yojson.Safe.t -> 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.json -> Channel_t.t Deferred.Or_error.t
+    int -> Yojson.Safe.t -> Channel_t.t Deferred.Or_error.t
 val modify_guild_channel_positions :
-    int -> Yojson.Safe.json -> unit Deferred.Or_error.t
+    int -> Yojson.Safe.t -> 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.json -> Member.t Deferred.Or_error.t
+    int -> Yojson.Safe.t -> Member.t Deferred.Or_error.t
 val edit_member :
     int ->
-    int -> Yojson.Safe.json -> unit Deferred.Or_error.t
+    int -> Yojson.Safe.t -> unit Deferred.Or_error.t
 val remove_member :
     int ->
-    int -> Yojson.Safe.json -> unit Deferred.Or_error.t
+    int -> Yojson.Safe.t -> unit Deferred.Or_error.t
 val change_nickname :
-    int -> Yojson.Safe.json -> Yojson.Safe.json Deferred.Or_error.t
+    int -> Yojson.Safe.t -> Yojson.Safe.t 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.json -> unit Deferred.Or_error.t
+    int -> Yojson.Safe.t -> unit Deferred.Or_error.t
 val guild_ban_remove :
     int ->
-    int -> Yojson.Safe.json -> unit Deferred.Or_error.t
+    int -> Yojson.Safe.t -> unit Deferred.Or_error.t
 val get_roles : int -> Role_t.t list Deferred.Or_error.t
 val guild_role_add :
-    int -> Yojson.Safe.json -> Role_t.t Deferred.Or_error.t
+    int -> Yojson.Safe.t -> Role_t.t Deferred.Or_error.t
 val guild_roles_edit :
-    int -> Yojson.Safe.json -> Role_t.t list Deferred.Or_error.t
+    int -> Yojson.Safe.t -> Role_t.t list Deferred.Or_error.t
 val guild_role_edit :
     int ->
-    int -> Yojson.Safe.json -> Role_t.t Deferred.Or_error.t
+    int -> Yojson.Safe.t -> 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.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
+    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
 val add_integration :
-    int -> Yojson.Safe.json -> unit Deferred.Or_error.t
+    int -> Yojson.Safe.t -> unit Deferred.Or_error.t
 val edit_integration :
     int ->
-    int -> Yojson.Safe.json -> unit Deferred.Or_error.t
+    int -> Yojson.Safe.t -> 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.json Deferred.Or_error.t
+val get_guild_embed : int -> Yojson.Safe.t Deferred.Or_error.t
 val edit_guild_embed :
-    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
+    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
 val get_current_user : unit -> User_t.t Deferred.Or_error.t
 val edit_current_user :
-    Yojson.Safe.json -> User_t.t Deferred.Or_error.t
+    Yojson.Safe.t -> 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.json Deferred.Or_error.t
+    unit -> Yojson.Safe.t Deferred.Or_error.t
 val create_dm :
-    Yojson.Safe.json -> Yojson.Safe.json Deferred.Or_error.t
+    Yojson.Safe.t -> Yojson.Safe.t Deferred.Or_error.t
 val create_group_dm :
-    Yojson.Safe.json -> Yojson.Safe.json Deferred.Or_error.t
-val get_connections : unit -> Yojson.Safe.json Deferred.Or_error.t
+    Yojson.Safe.t -> Yojson.Safe.t Deferred.Or_error.t
+val get_connections : unit -> Yojson.Safe.t Deferred.Or_error.t
 val get_user : int -> User_t.t Deferred.Or_error.t
-val get_voice_regions : unit -> Yojson.Safe.json Deferred.Or_error.t
+val get_voice_regions : unit -> Yojson.Safe.t Deferred.Or_error.t
 val create_webhook :
-    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
+    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
 val get_webhook_with_token :
-    int -> string -> Yojson.Safe.json Deferred.Or_error.t
+    int -> string -> Yojson.Safe.t Deferred.Or_error.t
 val edit_webhook :
-    int -> Yojson.Safe.json -> Yojson.Safe.json Deferred.Or_error.t
+    int -> Yojson.Safe.t -> Yojson.Safe.t Deferred.Or_error.t
 val edit_webhook_with_token :
     int ->
-    string -> Yojson.Safe.json -> Yojson.Safe.json Deferred.Or_error.t
+    string -> Yojson.Safe.t -> Yojson.Safe.t 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.json -> Yojson.Safe.json Deferred.Or_error.t
+    string -> Yojson.Safe.t -> Yojson.Safe.t Deferred.Or_error.t
 val execute_slack_webhook :
     int ->
-    string -> Yojson.Safe.json -> Yojson.Safe.json Deferred.Or_error.t
+    string -> Yojson.Safe.t -> Yojson.Safe.t Deferred.Or_error.t
 val execute_git_webhook :
     int ->
-    string -> Yojson.Safe.json -> Yojson.Safe.json Deferred.Or_error.t
+    string -> Yojson.Safe.t -> Yojson.Safe.t Deferred.Or_error.t
 val get_audit_logs :
-    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
+    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
diff --git a/lib/models/channel/channel_t.ml b/lib/models/channel/channel_t.ml
index b02fa31..1705bdf 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 711b319..30c90a5 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 4b27ec5..43717ee 100644
--- a/lib/models/event_models.ml
+++ b/lib/models/event_models.ml
@@ -340,7 +340,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/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

 

diff --git a/lib/s.ml b/lib/s.ml
index 2bd2703..8deb334 100644
--- a/lib/s.ml
+++ b/lib/s.ml
@@ -71,12 +71,12 @@ module type GuildImpl = sig
     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

@@ -89,5 +89,5 @@ end
 module type UserImpl = sig

     type t

     (* val private_channel : t -> Channel_t.t *)

-    (* val send : t -> Yojson.Safe.json Deferred.Or_error.t *)

+    (* val send : t -> Yojson.Safe.t Deferred.Or_error.t *)

 end
\ No newline at end of file
diff --git a/lib/sharder.ml b/lib/sharder.ml
index 4e6cc46..c33504f 100644
--- a/lib/sharder.ml
+++ b/lib/sharder.ml
@@ -101,7 +101,7 @@ module Shard = struct
             session = session;

         }

 

-    let set_status ~(status:Yojson.Safe.json) shard =

+    let set_status ~(status:Yojson.Safe.t) shard =

         let payload = match status with

         | `Assoc ["name", `String name; "type", `Int t]

         | `Assoc ["type", `Int t; "name", `String name] ->

diff --git a/lib/sharder.mli b/lib/sharder.mli
index f5002ee..53ab280 100644
--- a/lib/sharder.mli
+++ b/lib/sharder.mli
@@ -44,7 +44,7 @@ module Shard : sig
 

     (** Set the status of the shard. *)

     val set_status :

-        status:Yojson.Safe.json ->

+        status:Yojson.Safe.t ->

         shard ->

         shard Deferred.t

 

@@ -69,13 +69,13 @@ end
 

 (** Calls {!Shard.set_status} for each shard registered with the sharder. *)

 val set_status :

-    status:Yojson.Safe.json ->

+    status:Yojson.Safe.t ->

     t ->

     Shard.shard list Deferred.t

 

-(** Like {!set_status} but takes a function with a {{!Shard.shard}shard} as its parameter and {{!Yojson.Safe.json}json} for its return. *)

+(** Like {!set_status} but takes a function with a {{!Shard.shard}shard} as its parameter and {{!Yojson.Safe.t}json} for its return. *)

 val set_status_with :

-    f:(Shard.shard -> Yojson.Safe.json) ->

+    f:(Shard.shard -> Yojson.Safe.t) ->

     t ->

     Shard.shard list Deferred.t