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/emoji.ml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'lib/models/emoji.ml') diff --git a/lib/models/emoji.ml b/lib/models/emoji.ml index ece5bcd..5e21b37 100644 --- a/lib/models/emoji.ml +++ b/lib/models/emoji.ml @@ -1,3 +1,9 @@ -module Make(Http : S.Http) = struct - type t = Emoji_t.t -end \ No newline at end of file +type t = { + id: Snowflake.t option [@default None]; + name: string; + roles: Snowflake.t list [@default []]; + user: User_t.t option [@default None]; + require_colons: bool option [@default None]; + managed: bool option [@default None]; + animated: bool option [@default None]; +} [@@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/emoji.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/models/emoji.ml') diff --git a/lib/models/emoji.ml b/lib/models/emoji.ml index 5e21b37..dccdb54 100644 --- a/lib/models/emoji.ml +++ b/lib/models/emoji.ml @@ -6,4 +6,4 @@ type t = { require_colons: bool option [@default None]; managed: bool option [@default None]; animated: bool option [@default None]; -} [@@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/emoji.ml | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'lib/models/emoji.ml') diff --git a/lib/models/emoji.ml b/lib/models/emoji.ml index dccdb54..62e5bd7 100644 --- a/lib/models/emoji.ml +++ b/lib/models/emoji.ml @@ -1,3 +1,8 @@ +type partial_emoji = { + id: Snowflake.t option [@default None]; + name: string; +} [@@deriving yojson { strict = false }] + type t = { id: Snowflake.t option [@default None]; name: string; -- 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/emoji.ml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'lib/models/emoji.ml') diff --git a/lib/models/emoji.ml b/lib/models/emoji.ml index 62e5bd7..2b7cf1d 100644 --- a/lib/models/emoji.ml +++ b/lib/models/emoji.ml @@ -1,7 +1,9 @@ +open Core + type partial_emoji = { id: Snowflake.t option [@default None]; name: string; -} [@@deriving yojson { strict = false }] +} [@@deriving sexp, yojson { strict = false }] type t = { id: Snowflake.t option [@default None]; @@ -11,4 +13,4 @@ type t = { require_colons: bool option [@default None]; managed: bool option [@default None]; animated: bool option [@default None]; -} [@@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