aboutsummaryrefslogtreecommitdiff
path: root/lib/model
diff options
context:
space:
mode:
authorAdelyn Breedlove <[email protected]>2018-12-15 18:02:29 +0000
committerAdelyn Breedlove <[email protected]>2018-12-15 18:02:29 +0000
commit910ce60bba69b961c82e29ff1bb63bf4d3fe5519 (patch)
tree690861418bed15de47e7cf5672d96fdacc9abe5e /lib/model
parentMerge branch 'patch-1' into 'master' (diff)
parentMerging (diff)
downloaddisml-910ce60bba69b961c82e29ff1bb63bf4d3fe5519.tar.xz
disml-910ce60bba69b961c82e29ff1bb63bf4d3fe5519.zip
Merge branch 'dev' into 'master'
Merge first semi-usable state of dev-branch in a while See merge request Mishio595/disml!10
Diffstat (limited to 'lib/model')
-rw-r--r--lib/model/channel.ml1
-rw-r--r--lib/model/emoji.ml1
-rw-r--r--lib/model/guild.ml26
-rw-r--r--lib/model/member.ml1
-rw-r--r--lib/model/message.ml1
-rw-r--r--lib/model/presence.ml1
-rw-r--r--lib/model/role.ml1
-rw-r--r--lib/model/user.ml26
-rw-r--r--lib/model/voiceState.ml1
9 files changed, 0 insertions, 59 deletions
diff --git a/lib/model/channel.ml b/lib/model/channel.ml
deleted file mode 100644
index eb6679e..0000000
--- a/lib/model/channel.ml
+++ /dev/null
@@ -1 +0,0 @@
-type t \ No newline at end of file
diff --git a/lib/model/emoji.ml b/lib/model/emoji.ml
deleted file mode 100644
index eb6679e..0000000
--- a/lib/model/emoji.ml
+++ /dev/null
@@ -1 +0,0 @@
-type t \ No newline at end of file
diff --git a/lib/model/guild.ml b/lib/model/guild.ml
deleted file mode 100644
index 6345c17..0000000
--- a/lib/model/guild.ml
+++ /dev/null
@@ -1,26 +0,0 @@
-type t = {
- afk_channel_id: int option;
- afk_timeout: int;
- application_id: int option;
- channels: Channel.t list;
- default_message_notifications: int;
- emojis: Emoji.t list;
- explicit_content_filter: int;
- features: string list;
- icon: string option;
- id: int;
- joined_at: string;
- large: bool;
- member_count: int;
- members: Member.t list;
- mfa_level: int;
- name: string;
- owner_id: int;
- presences: Presence.t list;
- region: string;
- roles: Role.t list;
- splash: string option;
- system_channel_id: int option;
- verification_level: int;
- voice_states: VoiceState.t list;
-}
diff --git a/lib/model/member.ml b/lib/model/member.ml
deleted file mode 100644
index eb6679e..0000000
--- a/lib/model/member.ml
+++ /dev/null
@@ -1 +0,0 @@
-type t \ No newline at end of file
diff --git a/lib/model/message.ml b/lib/model/message.ml
deleted file mode 100644
index eb6679e..0000000
--- a/lib/model/message.ml
+++ /dev/null
@@ -1 +0,0 @@
-type t \ No newline at end of file
diff --git a/lib/model/presence.ml b/lib/model/presence.ml
deleted file mode 100644
index eb6679e..0000000
--- a/lib/model/presence.ml
+++ /dev/null
@@ -1 +0,0 @@
-type t \ No newline at end of file
diff --git a/lib/model/role.ml b/lib/model/role.ml
deleted file mode 100644
index eb6679e..0000000
--- a/lib/model/role.ml
+++ /dev/null
@@ -1 +0,0 @@
-type t \ No newline at end of file
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
diff --git a/lib/model/voiceState.ml b/lib/model/voiceState.ml
deleted file mode 100644
index eb6679e..0000000
--- a/lib/model/voiceState.ml
+++ /dev/null
@@ -1 +0,0 @@
-type t \ No newline at end of file