Merge branch 'dev' of https://gitlab.com/Mishio595/disml into dev

14 files changed, 22 insertions, 19 deletions

diff --git a/lib/models/activity.ml b/lib/models/activity.ml
index eb6679e..80f1049 100644
--- a/lib/models/activity.ml
+++ b/lib/models/activity.ml
@@ -1 +1,4 @@
-type t
\ No newline at end of file
+type t = {
+    id: Snowflake.t;
+}
+[@@deriving yojson]
\ No newline at end of file
diff --git a/lib/models/attachment.ml b/lib/models/attachment.ml
index 095743d..595aa45 100644
--- a/lib/models/attachment.ml
+++ b/lib/models/attachment.ml
@@ -6,4 +6,4 @@ type t = {
     proxy_url: string;
     height: int option;
     width: int option;
-}
\ No newline at end of file
+} [@@deriving yojson]
\ No newline at end of file
diff --git a/lib/models/ban.ml b/lib/models/ban.ml
index 510c2f5..ff0fb67 100644
--- a/lib/models/ban.ml
+++ b/lib/models/ban.ml
@@ -1,4 +1,4 @@
 type t = {
     id: Snowflake.t;
     user: User.t;
-}
\ No newline at end of file
+} [@@deriving yojson]
\ No newline at end of file
diff --git a/lib/models/channel.ml b/lib/models/channel.ml
index 78051c3..ac3e596 100644
--- a/lib/models/channel.ml
+++ b/lib/models/channel.ml
@@ -14,4 +14,4 @@ type t = {
     owner_id: Snowflake.t option;
     application_id: Snowflake.t option;
     parent_id: Snowflake.t option;
-}
\ No newline at end of file
+} [@@deriving yojson]
\ No newline at end of file
diff --git a/lib/models/embed.ml b/lib/models/embed.ml
index 6ba1115..b4dc143 100644
--- a/lib/models/embed.ml
+++ b/lib/models/embed.ml
@@ -2,31 +2,31 @@ type footer = {
     text: string;
     icon_url: string option;
     proxy_icon_url: string option;
-}
+} [@@deriving yojson]
 
 type image = {
     url: string option;
     proxy_url: string option;
     height: int option;
     width: int option;
-}
+} [@@deriving yojson]
 
 type video = {
     url: string option;
     height: int option;
     width: int option;
-}
+} [@@deriving yojson]
 
 type provider = {
     name: string option;
     url: string option;
-}
+} [@@deriving yojson]
 
 type field = {
     name: string;
     value: string;
     inline: bool option;
-}
+} [@@deriving yojson]
 
 type t = {
     title: string option;
@@ -41,4 +41,4 @@ type t = {
     video: video option;
     provider: provider option;
     fields: (field list) option;
-}
\ No newline at end of file
+} [@@deriving yojson]
\ No newline at end of file
diff --git a/lib/models/emoji.ml b/lib/models/emoji.ml
index 3d89867..cfbfe64 100644
--- a/lib/models/emoji.ml
+++ b/lib/models/emoji.ml
@@ -6,4 +6,4 @@ type t = {
     require_colons: bool option;
     managed: bool;
     animated: bool;
-}
\ No newline at end of file
+} [@@deriving yojson]
\ No newline at end of file
diff --git a/lib/models/guild.ml b/lib/models/guild.ml
index 364a4d5..5f5855b 100644
--- a/lib/models/guild.ml
+++ b/lib/models/guild.ml
@@ -25,4 +25,4 @@ type t = {
     member_count: int;
     members: Member.t list;
     channels: Channel.t list;
-}
\ No newline at end of file
+} [@@deriving yojson]
\ No newline at end of file
diff --git a/lib/models/member.ml b/lib/models/member.ml
index 1cbe50b..4621902 100644
--- a/lib/models/member.ml
+++ b/lib/models/member.ml
@@ -5,4 +5,4 @@ type t = {
     joined_at: string;
     deaf: bool;
     mute: bool;
-}
\ No newline at end of file
+} [@@deriving yojson]
\ No newline at end of file
diff --git a/lib/models/message.ml b/lib/models/message.ml
index 6c2e80d..c578d9f 100644
--- a/lib/models/message.ml
+++ b/lib/models/message.ml
@@ -18,4 +18,4 @@ type t = {
     pinned: bool;
     webhook_id: Snowflake.t;
     kind: int;
-}
\ No newline at end of file
+} [@@deriving yojson]
\ No newline at end of file
diff --git a/lib/models/presence.ml b/lib/models/presence.ml
index 7243f43..ed1bdb6 100644
--- a/lib/models/presence.ml
+++ b/lib/models/presence.ml
@@ -5,4 +5,4 @@ type t = {
     guild: Guild.t;
     status: string;
     activities: Activity.t list;
-}
\ No newline at end of file
+} [@@deriving yojson]
\ No newline at end of file
diff --git a/lib/models/reaction.ml b/lib/models/reaction.ml
index b427505..00bebe6 100644
--- a/lib/models/reaction.ml
+++ b/lib/models/reaction.ml
@@ -1,4 +1,4 @@
 type t = {
     count: int;
     emoji: Emoji.t;
-}
\ No newline at end of file
+} [@@deriving yojson]
\ No newline at end of file
diff --git a/lib/models/role.ml b/lib/models/role.ml
index debba60..0577342 100644
--- a/lib/models/role.ml
+++ b/lib/models/role.ml
@@ -7,4 +7,4 @@ type t = {
     permissions: int;
     managed: bool;
     mentionable: bool;
-}
\ No newline at end of file
+} [@@deriving yojson]
\ No newline at end of file
diff --git a/lib/models/snowflake.ml b/lib/models/snowflake.ml
index ed80b62..ab723a7 100644
--- a/lib/models/snowflake.ml
+++ b/lib/models/snowflake.ml
@@ -1,7 +1,7 @@
 type t = {
     id: int;
     as_string: string;
-}
+} [@@deriving yojson]
 
 let to_int t = t.id
 let to_string t = t.as_string
diff --git a/lib/models/user.ml b/lib/models/user.ml
index 05cf570..e6c5c69 100644
--- a/lib/models/user.ml
+++ b/lib/models/user.ml
@@ -4,4 +4,4 @@ type t = {
     discriminator: string;
     avatar: string;
     bot: bool;
-}
\ No newline at end of file
+} [@@deriving yojson]
\ No newline at end of file