From b9ee77f8153090e9d47e73ab195540d10720c7b6 Mon Sep 17 00:00:00 2001 From: Adelyn Breelove Date: Thu, 10 Jan 2019 13:12:49 -0700 Subject: AAAAAAAAAAAAAAAAAAAAAAAA --- lib/models/message_t.ml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 lib/models/message_t.ml (limited to 'lib/models/message_t.ml') diff --git a/lib/models/message_t.ml b/lib/models/message_t.ml new file mode 100644 index 0000000..7ef09e9 --- /dev/null +++ b/lib/models/message_t.ml @@ -0,0 +1,21 @@ +type t = { + id: Snowflake.t; + author: User_t.t; + channel_id: Snowflake.t; + member: Member_t.partial_member option [@default None]; + guild_id: Snowflake.t option [@default None]; + content: string; + timestamp: string; + editedimestamp: string option [@default None]; + tts: bool; + mention_everyone: bool; + mentions: Snowflake.t list; + role_mentions: Snowflake.t list [@default []]; + attachments: Attachment.t list; + embeds: Embed.t list; + reactions: Snowflake.t list [@default []]; + nonce: Snowflake.t option [@default None]; + pinned: bool; + webhook_id: Snowflake.t option [@default None]; + kind: int [@key "type"]; +} [@@deriving yojson] \ No newline at end of file -- cgit v1.2.3 From b7f8f0de01c5014703376d7204b62d8e47c9179a Mon Sep 17 00:00:00 2001 From: Adelyn Breelove Date: Thu, 10 Jan 2019 16:15:20 -0700 Subject: Fix some deserializing bits --- lib/models/message_t.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/models/message_t.ml') diff --git a/lib/models/message_t.ml b/lib/models/message_t.ml index 7ef09e9..b8aa204 100644 --- a/lib/models/message_t.ml +++ b/lib/models/message_t.ml @@ -18,4 +18,4 @@ type t = { pinned: bool; webhook_id: Snowflake.t option [@default None]; kind: int [@key "type"]; -} [@@deriving yojson] \ No newline at end of file +} [@@deriving yojson { strict = false}] \ No newline at end of file -- cgit v1.2.3 From cba1fa3ab1b085600f3a73dae62682d21d112afb Mon Sep 17 00:00:00 2001 From: Adelyn Breelove Date: Fri, 11 Jan 2019 12:44:22 -0700 Subject: More deserialization fixes --- lib/models/message_t.ml | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) (limited to 'lib/models/message_t.ml') diff --git a/lib/models/message_t.ml b/lib/models/message_t.ml index b8aa204..f793223 100644 --- a/lib/models/message_t.ml +++ b/lib/models/message_t.ml @@ -1,3 +1,25 @@ +type message_update = { + id: Snowflake.t; + author: User_t.t option [@default None]; + channel_id: Snowflake.t; + member: Member_t.partial_member option [@default None]; + guild_id: Snowflake.t option [@default None]; + content: string option [@default None]; + timestamp: string option [@default None]; + editedimestamp: string option [@default None]; + tts: bool option [@default None]; + mention_everyone: bool option [@default None]; + mentions: Snowflake.t list [@default []]; + role_mentions: Snowflake.t list [@default []]; + attachments: Attachment.t list [@default []]; + embeds: Embed.t list [@default []]; + reactions: Snowflake.t list [@default []]; + nonce: Snowflake.t option [@default None]; + pinned: bool option [@default None]; + webhook_id: Snowflake.t option [@default None]; + kind: int option [@default None][@key "type"]; +} [@@deriving yojson { strict = false}] + type t = { id: Snowflake.t; author: User_t.t; @@ -9,10 +31,10 @@ type t = { editedimestamp: string option [@default None]; tts: bool; mention_everyone: bool; - mentions: Snowflake.t list; - role_mentions: Snowflake.t list [@default []]; - attachments: Attachment.t list; - embeds: Embed.t list; + (* mentions: Snowflake.t list [@default []]; *) + (* role_mentions: Snowflake.t list [@default []]; *) + attachments: Attachment.t list [@default []]; + embeds: Embed.t list [@default []]; reactions: Snowflake.t list [@default []]; nonce: Snowflake.t option [@default None]; pinned: bool; -- cgit v1.2.3 From c5bfc108ca6a1e7a21492b4318de78a74ed801f9 Mon Sep 17 00:00:00 2001 From: Adelyn Breedlove Date: Sun, 13 Jan 2019 16:51:04 -0700 Subject: Add deriving sexp to models --- lib/models/message_t.ml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'lib/models/message_t.ml') diff --git a/lib/models/message_t.ml b/lib/models/message_t.ml index f793223..c4253d5 100644 --- a/lib/models/message_t.ml +++ b/lib/models/message_t.ml @@ -1,3 +1,5 @@ +open Core + type message_update = { id: Snowflake.t; author: User_t.t option [@default None]; @@ -18,7 +20,7 @@ type message_update = { pinned: bool option [@default None]; webhook_id: Snowflake.t option [@default None]; kind: int option [@default None][@key "type"]; -} [@@deriving yojson { strict = false}] +} [@@deriving sexp, yojson { strict = false}] type t = { id: Snowflake.t; @@ -40,4 +42,4 @@ type t = { pinned: bool; webhook_id: Snowflake.t option [@default None]; kind: int [@key "type"]; -} [@@deriving yojson { strict = false}] \ No newline at end of file +} [@@deriving sexp, yojson { strict = false}] \ No newline at end of file -- cgit v1.2.3