aboutsummaryrefslogtreecommitdiff
path: root/lib/models/id
diff options
context:
space:
mode:
Diffstat (limited to 'lib/models/id')
-rw-r--r--lib/models/id/channel_id.ml4
-rw-r--r--lib/models/id/channel_id_t.ml10
-rw-r--r--lib/models/id/channel_id_t.mli2
-rw-r--r--lib/models/id/guild_id_t.ml10
-rw-r--r--lib/models/id/guild_id_t.mli2
-rw-r--r--lib/models/id/message_id.ml12
-rw-r--r--lib/models/id/message_id.mli2
-rw-r--r--lib/models/id/role_id.ml12
-rw-r--r--lib/models/id/role_id.mli2
-rw-r--r--lib/models/id/user_id_t.ml14
-rw-r--r--lib/models/id/user_id_t.mli2
11 files changed, 14 insertions, 58 deletions
diff --git a/lib/models/id/channel_id.ml b/lib/models/id/channel_id.ml
index 7c62d84..6c08711 100644
--- a/lib/models/id/channel_id.ml
+++ b/lib/models/id/channel_id.ml
@@ -6,7 +6,7 @@ exception No_message_found
let send_message ?embed ?content ?files ?(tts=false) ?reply ch =
let embed = match embed with
- | Some e -> Embed.to_yojson e
+ | Some e -> Embed.yojson_of_t e
| None -> `Null in
let content = match content with
| Some c -> `String c
@@ -15,7 +15,7 @@ let send_message ?embed ?content ?files ?(tts=false) ?reply ch =
| `Null, `Null -> raise Invalid_message
| _ -> () in
let message_reference = match reply with
- | Some m -> `Assoc [("message_id", Message_id.to_yojson m)]
+ | Some m -> `Assoc [("message_id", Message_id.yojson_of_t m)]
| None -> `Null in
Http.create_message ?files (get_id ch) (`Assoc [
("embed", embed);
diff --git a/lib/models/id/channel_id_t.ml b/lib/models/id/channel_id_t.ml
index c6b80ec..74588b1 100644
--- a/lib/models/id/channel_id_t.ml
+++ b/lib/models/id/channel_id_t.ml
@@ -1,15 +1,7 @@
open Core
-type t = [ `Channel_id of Snowflake.t ] [@@deriving sexp]
+type t = [ `Channel_id of Snowflake.t ] [@@deriving sexp, yojson]
let compare (`Channel_id t) (`Channel_id t') = Int64.compare t t'
-let of_yojson a : (t, string) result =
- match Snowflake.of_yojson a with
- | Ok id -> Ok (`Channel_id id)
- | Error err -> Error err
-
-let of_yojson_exn a : t = `Channel_id (Snowflake.of_yojson_exn a)
-let to_yojson (`Channel_id id) = (Snowflake.to_yojson id)
-
let get_id (`Channel_id id) = id \ No newline at end of file
diff --git a/lib/models/id/channel_id_t.mli b/lib/models/id/channel_id_t.mli
index 72324a7..851fa8f 100644
--- a/lib/models/id/channel_id_t.mli
+++ b/lib/models/id/channel_id_t.mli
@@ -1,4 +1,4 @@
-type t = [ `Channel_id of Snowflake.t ] [@@deriving sexp, yojson { exn = true }]
+type t = [ `Channel_id of Snowflake.t ] [@@deriving sexp, yojson]
val compare : t -> t -> int
val get_id : t -> Snowflake.t \ No newline at end of file
diff --git a/lib/models/id/guild_id_t.ml b/lib/models/id/guild_id_t.ml
index b2fd202..6fc3777 100644
--- a/lib/models/id/guild_id_t.ml
+++ b/lib/models/id/guild_id_t.ml
@@ -1,15 +1,7 @@
open Core
-type t = [ `Guild_id of Snowflake.t ] [@@deriving sexp]
+type t = [ `Guild_id of Snowflake.t ] [@@deriving sexp, yojson]
let compare (`Guild_id t) (`Guild_id t') = Int64.compare t t'
-let of_yojson a : (t, string) result =
- match Snowflake.of_yojson a with
- | Ok id -> Ok (`Guild_id id)
- | Error err -> Error err
-
-let of_yojson_exn a : t = `Guild_id (Snowflake.of_yojson_exn a)
-let to_yojson (`Guild_id id) = (Snowflake.to_yojson id)
-
let get_id (`Guild_id id) = id \ No newline at end of file
diff --git a/lib/models/id/guild_id_t.mli b/lib/models/id/guild_id_t.mli
index f4d415a..17bd951 100644
--- a/lib/models/id/guild_id_t.mli
+++ b/lib/models/id/guild_id_t.mli
@@ -1,4 +1,4 @@
-type t = [ `Guild_id of Snowflake.t ] [@@deriving sexp, yojson { exn = true }]
+type t = [ `Guild_id of Snowflake.t ] [@@deriving sexp, yojson]
val compare : t -> t -> int
val get_id : t -> Snowflake.t \ No newline at end of file
diff --git a/lib/models/id/message_id.ml b/lib/models/id/message_id.ml
index 3c45e16..0de01f0 100644
--- a/lib/models/id/message_id.ml
+++ b/lib/models/id/message_id.ml
@@ -1,13 +1,3 @@
-open Core
-
-type t = [ `Message_id of Snowflake.t ] [@@deriving sexp]
-
-let of_yojson a : (t, string) result =
- match Snowflake.of_yojson a with
- | Ok id -> Ok (`Message_id id)
- | Error err -> Error err
-
-let of_yojson_exn a : t = `Message_id (Snowflake.of_yojson_exn a)
-let to_yojson (`Message_id id) = (Snowflake.to_yojson id)
+type t = [ `Message_id of Snowflake.t ] [@@deriving sexp, yojson]
let get_id (`Message_id id) = id \ No newline at end of file
diff --git a/lib/models/id/message_id.mli b/lib/models/id/message_id.mli
index 77a228a..90107b5 100644
--- a/lib/models/id/message_id.mli
+++ b/lib/models/id/message_id.mli
@@ -1,3 +1,3 @@
-type t = [ `Message_id of Snowflake.t ] [@@deriving sexp, yojson { exn = true }]
+type t = [ `Message_id of Snowflake.t ] [@@deriving sexp, yojson]
val get_id : t -> Snowflake.t \ No newline at end of file
diff --git a/lib/models/id/role_id.ml b/lib/models/id/role_id.ml
index 0bbf8be..a86253c 100644
--- a/lib/models/id/role_id.ml
+++ b/lib/models/id/role_id.ml
@@ -1,13 +1,3 @@
-open Core
-
-type t = [ `Role_id of Snowflake.t ] [@@deriving sexp]
-
-let of_yojson a : (t, string) result =
- match Snowflake.of_yojson a with
- | Ok id -> Ok (`Role_id id)
- | Error err -> Error err
-
-let of_yojson_exn a : t = `Role_id (Snowflake.of_yojson_exn a)
-let to_yojson (`Role_id id) = (Snowflake.to_yojson id)
+type t = [ `Role_id of Snowflake.t ] [@@deriving sexp, yojson]
let get_id (`Role_id id) = id \ No newline at end of file
diff --git a/lib/models/id/role_id.mli b/lib/models/id/role_id.mli
index e28e300..701e4a9 100644
--- a/lib/models/id/role_id.mli
+++ b/lib/models/id/role_id.mli
@@ -1,3 +1,3 @@
-type t = [ `Role_id of Snowflake.t ] [@@deriving sexp, yojson { exn = true }]
+type t = [ `Role_id of Snowflake.t ] [@@deriving sexp, yojson]
val get_id : t -> Snowflake.t \ No newline at end of file
diff --git a/lib/models/id/user_id_t.ml b/lib/models/id/user_id_t.ml
index 214fa14..fab0f00 100644
--- a/lib/models/id/user_id_t.ml
+++ b/lib/models/id/user_id_t.ml
@@ -1,15 +1,7 @@
open Core
-type t = [ `User_id of Snowflake.t ] [@@deriving sexp]
+type t = Snowflake.t [@@deriving sexp, yojson]
-let compare (`User_id t) (`User_id t') = Int64.compare t t'
+let compare t t' = Int64.compare t t'
-let of_yojson a : (t, string) result =
- match Snowflake.of_yojson a with
- | Ok id -> Ok (`User_id id)
- | Error err -> Error err
-
-let of_yojson_exn a : t = `User_id (Snowflake.of_yojson_exn a)
-let to_yojson (`User_id id) = (Snowflake.to_yojson id)
-
-let get_id (`User_id id) = id \ No newline at end of file
+let get_id id = id \ No newline at end of file
diff --git a/lib/models/id/user_id_t.mli b/lib/models/id/user_id_t.mli
index e728b00..1bac390 100644
--- a/lib/models/id/user_id_t.mli
+++ b/lib/models/id/user_id_t.mli
@@ -1,4 +1,4 @@
-type t = [ `User_id of Snowflake.t ] [@@deriving sexp, yojson { exn = true }]
+type t = Snowflake.t [@@deriving sexp, yojson]
val compare : t -> t -> int
val get_id : t -> Snowflake.t \ No newline at end of file
generated by cgit v1.2.3 (git 2.25.1) at 2026-03-11 03:29:07 +0000