From 73d115ce6260e97f5f7ee47f743d842ffd292662 Mon Sep 17 00:00:00 2001
From: Adelyn Breelove <tenseiken595@gmail.com>
Date: Thu, 13 Dec 2018 14:11:54 -0700
Subject: Working on deriving types from json

---
 lib/models/member.atd | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 lib/models/member.atd

(limited to 'lib/models/member.atd')

diff --git a/lib/models/member.atd b/lib/models/member.atd
new file mode 100644
index 0000000..ea00032
--- /dev/null
+++ b/lib/models/member.atd
@@ -0,0 +1,11 @@
+type snowflake <ocaml from="Snowflake" t="t"> = abstract
+type user <ocaml from="User" t="t"> = abstract
+
+type t = {
+    user: user;
+    ?nick: string option;
+    roles: snowflake list;
+    joined_at: string;
+    deaf: bool;
+    mute: bool;
+}
\ No newline at end of file
-- 
cgit v1.2.3


From 179d9598fe62e2966471b312fd438e98ff3a272a Mon Sep 17 00:00:00 2001
From: Adelyn Breelove <tenseiken595@gmail.com>
Date: Thu, 13 Dec 2018 15:50:37 -0700
Subject: Fix more dispatch issues

---
 lib/models/member.atd | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'lib/models/member.atd')

diff --git a/lib/models/member.atd b/lib/models/member.atd
index ea00032..11d8b62 100644
--- a/lib/models/member.atd
+++ b/lib/models/member.atd
@@ -1,11 +1,15 @@
 type snowflake <ocaml from="Snowflake" t="t"> = abstract
 type user <ocaml from="User" t="t"> = abstract
 
-type t = {
-    user: user;
+type partial_member = {
     ?nick: string option;
     roles: snowflake list;
     joined_at: string;
     deaf: bool;
     mute: bool;
+}
+
+type t = {
+    inherit partial_member;
+    user: user;
 }
\ No newline at end of file
-- 
cgit v1.2.3