aboutsummaryrefslogtreecommitdiff
path: root/lib/models
diff options
context:
space:
mode:
authorAdelyn Breelove <[email protected]>2019-02-04 13:21:52 -0700
committerAdelyn Breelove <[email protected]>2019-02-04 13:21:52 -0700
commit62b7689d0af62daee569e7d8ab3c641af756e6ef (patch)
treefb0777298a29ffb1f92c79350681f1fe55248ae5 /lib/models
parentOpt to never force close unix fd before writer is flushed (diff)
downloaddisml-62b7689d0af62daee569e7d8ab3c641af756e6ef.tar.xz
disml-62b7689d0af62daee569e7d8ab3c641af756e6ef.zip
Update yojson to 1.6.0
Diffstat (limited to 'lib/models')
-rw-r--r--lib/models/channel/channel_t.ml2
-rw-r--r--lib/models/channel/channel_t.mli2
-rw-r--r--lib/models/channel/message/reaction.mli2
-rw-r--r--lib/models/event_models.ml2
-rw-r--r--lib/models/snowflake.ml2
5 files changed, 5 insertions, 5 deletions
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