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/member_t.ml | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 lib/models/member_t.ml (limited to 'lib/models/member_t.ml') diff --git a/lib/models/member_t.ml b/lib/models/member_t.ml new file mode 100644 index 0000000..d7ce337 --- /dev/null +++ b/lib/models/member_t.ml @@ -0,0 +1,34 @@ +type partial_member = { + nick: string option [@default None]; + roles: Snowflake.t list; + joined_at: string; + deaf: bool; + mute: bool; +} [@@deriving yojson] + +type member = { + nick: string option [@default None]; + roles: Snowflake.t list; + joined_at: string; + deaf: bool; + mute: bool; + user: User_t.t; +} [@@deriving yojson] + +type member_update = { + guild_id: Snowflake.t [@key "id"]; + member: member; +} [@@deriving yojson] + +type t = { + nick: string option [@default None]; + roles: Snowflake.t list; + joined_at: string; + deaf: bool; + mute: bool; + user: User_t.t; + guild_id: Snowflake.t; +} [@@deriving yojson] + +let wrap ~guild_id ({nick;roles;joined_at;deaf;mute;user}:member) = + {nick;roles;joined_at;deaf;mute;user;guild_id} \ 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/member_t.ml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lib/models/member_t.ml') diff --git a/lib/models/member_t.ml b/lib/models/member_t.ml index d7ce337..4132a20 100644 --- a/lib/models/member_t.ml +++ b/lib/models/member_t.ml @@ -4,7 +4,7 @@ type partial_member = { joined_at: string; deaf: bool; mute: bool; -} [@@deriving yojson] +} [@@deriving yojson { strict = false}] type member = { nick: string option [@default None]; @@ -13,12 +13,12 @@ type member = { deaf: bool; mute: bool; user: User_t.t; -} [@@deriving yojson] +} [@@deriving yojson { strict = false}] type member_update = { guild_id: Snowflake.t [@key "id"]; member: member; -} [@@deriving yojson] +} [@@deriving yojson { strict = false}] type t = { nick: string option [@default None]; @@ -28,7 +28,7 @@ type t = { mute: bool; user: User_t.t; guild_id: Snowflake.t; -} [@@deriving yojson] +} [@@deriving yojson { strict = false}] let wrap ~guild_id ({nick;roles;joined_at;deaf;mute;user}:member) = {nick;roles;joined_at;deaf;mute;user;guild_id} \ 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/member_t.ml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'lib/models/member_t.ml') diff --git a/lib/models/member_t.ml b/lib/models/member_t.ml index 4132a20..ca39092 100644 --- a/lib/models/member_t.ml +++ b/lib/models/member_t.ml @@ -15,9 +15,16 @@ type member = { user: User_t.t; } [@@deriving yojson { strict = false}] +type member_wrapper = { + guild_id: Snowflake.t; + user: User_t.t; +} [@@deriving yojson { strict = false }] + type member_update = { - guild_id: Snowflake.t [@key "id"]; - member: member; + guild_id: Snowflake.t; + roles: Snowflake.t list [@default []]; + user: User_t.t; + nick: string option [@default None]; } [@@deriving yojson { strict = false}] type t = { -- 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/member_t.ml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'lib/models/member_t.ml') diff --git a/lib/models/member_t.ml b/lib/models/member_t.ml index ca39092..e6edb61 100644 --- a/lib/models/member_t.ml +++ b/lib/models/member_t.ml @@ -1,10 +1,12 @@ +open Core + type partial_member = { nick: string option [@default None]; roles: Snowflake.t list; joined_at: string; deaf: bool; mute: bool; -} [@@deriving yojson { strict = false}] +} [@@deriving sexp, yojson { strict = false}] type member = { nick: string option [@default None]; @@ -13,19 +15,19 @@ type member = { deaf: bool; mute: bool; user: User_t.t; -} [@@deriving yojson { strict = false}] +} [@@deriving sexp, yojson { strict = false}] type member_wrapper = { guild_id: Snowflake.t; user: User_t.t; -} [@@deriving yojson { strict = false }] +} [@@deriving sexp, yojson { strict = false }] type member_update = { guild_id: Snowflake.t; roles: Snowflake.t list [@default []]; user: User_t.t; nick: string option [@default None]; -} [@@deriving yojson { strict = false}] +} [@@deriving sexp, yojson { strict = false}] type t = { nick: string option [@default None]; @@ -35,7 +37,7 @@ type t = { mute: bool; user: User_t.t; guild_id: Snowflake.t; -} [@@deriving yojson { strict = false}] +} [@@deriving sexp, yojson { strict = false}] let wrap ~guild_id ({nick;roles;joined_at;deaf;mute;user}:member) = {nick;roles;joined_at;deaf;mute;user;guild_id} \ No newline at end of file -- cgit v1.2.3