Merge branch 'dev' into 'master'

Merge first semi-usable state of dev-branch in a while

See merge request Mishio595/disml!10

1 files changed, 0 insertions, 26 deletions

diff --git a/lib/model/user.ml b/lib/model/user.ml
deleted file mode 100644
index 182ea6a..0000000
--- a/lib/model/user.ml
+++ /dev/null
@@ -1,26 +0,0 @@
-type t = {
-    id: int;
-    username: string;
-    discriminator: string;
-    avatar: string option;
-    bot: bool;
-}
-
-let from_json term =
-    let module J = Yojson.Basic.Util in
-    let id = J.member "id" term
-        |> J.to_string
-        |> int_of_string
-    in
-    let username = J.member "username" term
-        |> J.to_string in
-    let discriminator = J.member "discriminator" term
-        |> J.to_string in
-    let avatar = J.member "avatar" term
-        |> J.to_string_option in
-    let bot = J.member "bot" term
-        |> J.to_bool in
-    { id; username; discriminator; avatar; bot; }
-
-let tag user =
-    user.username ^ user.discriminator