From b2f081fff12093a7d3434859ebd621608dde6c7d Mon Sep 17 00:00:00 2001 From: Matias Goldfeld Date: Sun, 7 Feb 2021 20:21:47 -0500 Subject: Reverted earlier changes for good --- lib/models/channel/message/attachment.ml | 2 +- lib/models/channel/message/attachment.mli | 2 +- lib/models/channel/message/embed.ml | 14 +++++++------- lib/models/channel/message/embed.mli | 14 +++++++------- lib/models/channel/message/message.ml | 10 +++++----- lib/models/channel/message/message_t.ml | 2 +- lib/models/channel/message/message_t.mli | 2 +- lib/models/channel/message/reaction_t.ml | 4 ++-- lib/models/channel/message/reaction_t.mli | 4 ++-- 9 files changed, 27 insertions(+), 27 deletions(-) (limited to 'lib/models/channel/message') diff --git a/lib/models/channel/message/attachment.ml b/lib/models/channel/message/attachment.ml index cf52078..d720a81 100644 --- a/lib/models/channel/message/attachment.ml +++ b/lib/models/channel/message/attachment.ml @@ -8,4 +8,4 @@ type t = { proxy_url: string; height: int [@default -1]; width: int [@default -1]; -} [@@deriving sexp, yojson] \ No newline at end of file +} [@@deriving sexp, yojson { strict = false; exn = true }] \ No newline at end of file diff --git a/lib/models/channel/message/attachment.mli b/lib/models/channel/message/attachment.mli index f935471..56006dc 100644 --- a/lib/models/channel/message/attachment.mli +++ b/lib/models/channel/message/attachment.mli @@ -6,4 +6,4 @@ type t = { proxy_url: string; height: int; width: int; -} [@@deriving sexp, yojson] \ No newline at end of file +} [@@deriving sexp, yojson { exn = true }] \ No newline at end of file diff --git a/lib/models/channel/message/embed.ml b/lib/models/channel/message/embed.ml index e7ebbcc..0dd7343 100644 --- a/lib/models/channel/message/embed.ml +++ b/lib/models/channel/message/embed.ml @@ -4,38 +4,38 @@ type footer = { text: string; icon_url: string option [@default None]; proxy_icon_url: string option [@default None]; -} [@@deriving sexp, yojson] +} [@@deriving sexp, yojson { strict = false; exn = true }] type image = { url: string option [@default None]; proxy_url: string option [@default None]; height: int option [@default None]; width: int option [@default None]; -} [@@deriving sexp, yojson] +} [@@deriving sexp, yojson { strict = false; exn = true }] type video = { url: string option [@default None]; height: int option [@default None]; width: int option [@default None]; -} [@@deriving sexp, yojson] +} [@@deriving sexp, yojson { strict = false; exn = true }] type provider = { name: string option [@default None]; url: string option [@default None]; -} [@@deriving sexp, yojson] +} [@@deriving sexp, yojson { strict = false; exn = true }] type author = { name: string option [@default None]; url: string option [@default None]; icon_url: string option [@default None]; proxy_icon_url: string option [@default None]; -} [@@deriving sexp, yojson] +} [@@deriving sexp, yojson { strict = false; exn = true }] type field = { name: string; value: string; inline: bool [@default false]; -} [@@deriving sexp, yojson] +} [@@deriving sexp, yojson { strict = false; exn = true }] type t = { title: string option [@default None]; @@ -51,7 +51,7 @@ type t = { provider: provider option [@default None]; author: author option [@default None]; fields: field list [@default []]; -} [@@deriving sexp, yojson] +} [@@deriving sexp, yojson { strict = false; exn = true }] let default = { title = None; diff --git a/lib/models/channel/message/embed.mli b/lib/models/channel/message/embed.mli index 17fea52..fb86c94 100644 --- a/lib/models/channel/message/embed.mli +++ b/lib/models/channel/message/embed.mli @@ -3,7 +3,7 @@ type footer = { text: string; icon_url: string option; proxy_icon_url: string option; -} [@@deriving sexp, yojson] +} [@@deriving sexp, yojson { exn = true }] (** An image object belonging to an embed. *) type image = { @@ -11,20 +11,20 @@ type image = { proxy_url: string option; height: int option; width: int option; -} [@@deriving sexp, yojson] +} [@@deriving sexp, yojson { exn = true }] (** A video object belonging to an embed. *) type video = { url: string option; height: int option; width: int option; -} [@@deriving sexp, yojson] +} [@@deriving sexp, yojson { exn = true }] (** A provider object belonging to an embed. *) type provider = { name: string option; url: string option; -} [@@deriving sexp, yojson] +} [@@deriving sexp, yojson { exn = true }] (** An author object belonging to an embed. *) type author = { @@ -32,14 +32,14 @@ type author = { url: string option; icon_url: string option; proxy_icon_url: string option; -} [@@deriving sexp, yojson] +} [@@deriving sexp, yojson { exn = true }] (** A field object belonging to an embed. *) type field = { name: string; value: string; inline: bool; -} [@@deriving sexp, yojson] +} [@@deriving sexp, yojson { exn = true }] (** An embed object. See this {{:https://leovoel.github.io/embed-visualizer/}embed visualiser} if you need help understanding each component. *) type t = { @@ -56,7 +56,7 @@ type t = { provider: provider option; author: author option; fields: field list [@default []]; -} [@@deriving sexp, yojson] +} [@@deriving sexp, yojson { strict = false; exn = true }] (** An embed where all values are empty. *) val default : t diff --git a/lib/models/channel/message/message.ml b/lib/models/channel/message/message.ml index 2aaa0da..7f03638 100644 --- a/lib/models/channel/message/message.ml +++ b/lib/models/channel/message/message.ml @@ -6,7 +6,7 @@ let add_reaction msg (emoji:Emoji.t) = let `Message_id id = msg.id in let `Channel_id channel_id = msg.channel_id in let e = match emoji.id with - | Some i -> Printf.sprintf "%s:%Ld" emoji.name i + | Some i -> Printf.sprintf "%s:%d" emoji.name i | None -> emoji.name in Http.create_reaction channel_id id e @@ -15,9 +15,9 @@ let add_reaction msg (emoji:Emoji.t) = let remove_reaction msg (emoji:Emoji.t) (user:User_t.t) = let `Message_id id = msg.id in let `Channel_id channel_id = msg.channel_id in - let user_id = User_id.get_id user.id in + let `User_id user_id = user.id in let e = match emoji.id with - | Some i -> Printf.sprintf "%s:%Ld" emoji.name i + | Some i -> Printf.sprintf "%s:%d" emoji.name i | None -> emoji.name in Http.delete_reaction channel_id id e user_id @@ -57,13 +57,13 @@ let reply_with ?embed ?content ?files ?tts ?(reply_mention=false) msg = let set_content msg cont = let `Message_id id = msg.id in let `Channel_id channel_id = msg.channel_id in - yojson_of_t { msg with content = cont; } + to_yojson { msg with content = cont; } |> Http.edit_message channel_id id let set_embed msg embed = let `Message_id id = msg.id in let `Channel_id channel_id = msg.channel_id in - yojson_of_t { msg with embeds = [embed]; } + to_yojson { msg with embeds = [embed]; } |> Http.edit_message channel_id id diff --git a/lib/models/channel/message/message_t.ml b/lib/models/channel/message/message_t.ml index 0f8e08e..31fc88c 100644 --- a/lib/models/channel/message/message_t.ml +++ b/lib/models/channel/message/message_t.ml @@ -20,4 +20,4 @@ type t = { pinned: bool; webhook_id: Snowflake.t option [@default None]; kind: int [@key "type"]; -} [@@deriving sexp, yojson] \ No newline at end of file +} [@@deriving sexp, yojson { strict = false; exn = true }] \ No newline at end of file diff --git a/lib/models/channel/message/message_t.mli b/lib/models/channel/message/message_t.mli index ba8c62a..907565c 100644 --- a/lib/models/channel/message/message_t.mli +++ b/lib/models/channel/message/message_t.mli @@ -19,4 +19,4 @@ type t = { pinned: bool; (** Whether the message is pinned. *) webhook_id: Snowflake.t option; (** The webhook ID, if the message was sent by a webhook. *) kind: int; (** See {{:https://discordapp.com/developers/docs/resources/channel#message-object-message-types}the discord docs} for message type enumeration. *) -} [@@deriving sexp, yojson] \ No newline at end of file +} [@@deriving sexp, yojson { exn = true }] \ No newline at end of file diff --git a/lib/models/channel/message/reaction_t.ml b/lib/models/channel/message/reaction_t.ml index b072b01..e8ec5a0 100644 --- a/lib/models/channel/message/reaction_t.ml +++ b/lib/models/channel/message/reaction_t.ml @@ -6,9 +6,9 @@ type reaction_event = { message_id: Message_id.t; guild_id: Guild_id_t.t option [@default None]; emoji: Emoji.partial_emoji; -} [@@deriving sexp, yojson] +} [@@deriving sexp, yojson { exn = true }] type t = { count: int; emoji: Emoji.t; -} [@@deriving sexp, yojson] \ No newline at end of file +} [@@deriving sexp, yojson { strict = false; exn = true }] \ No newline at end of file diff --git a/lib/models/channel/message/reaction_t.mli b/lib/models/channel/message/reaction_t.mli index ace8f55..f9b2a98 100644 --- a/lib/models/channel/message/reaction_t.mli +++ b/lib/models/channel/message/reaction_t.mli @@ -5,10 +5,10 @@ type reaction_event = { message_id: Message_id.t; guild_id: Guild_id_t.t option; emoji: Emoji.partial_emoji; -} [@@deriving sexp, yojson] +} [@@deriving sexp, yojson { exn = true }] (** Represents a number of emojis used as a reaction on a message. *) type t = { count: int; emoji: Emoji.t; -} [@@deriving sexp, yojson] \ No newline at end of file +} [@@deriving sexp, yojson { exn = true }] \ No newline at end of file -- cgit v1.2.3