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/user_t.ml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 lib/models/user_t.ml (limited to 'lib/models/user_t.ml') diff --git a/lib/models/user_t.ml b/lib/models/user_t.ml new file mode 100644 index 0000000..53b8065 --- /dev/null +++ b/lib/models/user_t.ml @@ -0,0 +1,11 @@ +type partial_user = { + id: Snowflake.t; +} [@@deriving yojson] + +type t = { + id: Snowflake.t; + username: string; + discriminator: int [@encoding `string]; + avatar: string option [@default None]; + bot: bool [@default false]; +} [@@deriving yojson { strict = false }] \ 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/user_t.ml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/models/user_t.ml') diff --git a/lib/models/user_t.ml b/lib/models/user_t.ml index 53b8065..9980f43 100644 --- a/lib/models/user_t.ml +++ b/lib/models/user_t.ml @@ -1,11 +1,11 @@ type partial_user = { id: Snowflake.t; -} [@@deriving yojson] +} [@@deriving yojson { strict = false}] type t = { id: Snowflake.t; username: string; - discriminator: int [@encoding `string]; + discriminator: string; avatar: string option [@default None]; bot: bool [@default false]; } [@@deriving yojson { strict = false }] \ No newline at end of file -- 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/user_t.ml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'lib/models/user_t.ml') diff --git a/lib/models/user_t.ml b/lib/models/user_t.ml index 9980f43..52dbaf4 100644 --- a/lib/models/user_t.ml +++ b/lib/models/user_t.ml @@ -1,6 +1,8 @@ +open Core + type partial_user = { id: Snowflake.t; -} [@@deriving yojson { strict = false}] +} [@@deriving sexp, yojson { strict = false}] type t = { id: Snowflake.t; @@ -8,4 +10,4 @@ type t = { discriminator: string; avatar: string option [@default None]; bot: bool [@default false]; -} [@@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