aboutsummaryrefslogtreecommitdiff
path: root/lib/models
diff options
context:
space:
mode:
authorAdelyn Breedlove <[email protected]>2019-03-01 23:15:23 -0700
committerAdelyn Breedlove <[email protected]>2019-03-01 23:15:23 -0700
commitef28f111cfec95a62b21a9267f9d24b1edc645dd (patch)
treec5a93c0072823aaeac425f6263c076333b55d225 /lib/models
parentRemove use of Tyre in favour of Str lib (diff)
downloaddisml-ef28f111cfec95a62b21a9267f9d24b1edc645dd.tar.xz
disml-ef28f111cfec95a62b21a9267f9d24b1edc645dd.zip
Style improvements who dis
Diffstat (limited to 'lib/models')
-rw-r--r--lib/models/channel/channel.mli16
-rw-r--r--lib/models/channel/message/message.ml16
-rw-r--r--lib/models/channel/message/message.mli4
-rw-r--r--lib/models/event_models.ml14
-rw-r--r--lib/models/guild/guild.ml4
-rw-r--r--lib/models/id/channel_id.mli16
-rw-r--r--lib/models/id/guild_id.ml4
-rw-r--r--lib/models/permissions.ml54
-rw-r--r--lib/models/permissions.mli54
9 files changed, 91 insertions, 91 deletions
diff --git a/lib/models/channel/channel.mli b/lib/models/channel/channel.mli
index 9e981ae..0d7431b 100644
--- a/lib/models/channel/channel.mli
+++ b/lib/models/channel/channel.mli
@@ -10,15 +10,15 @@ exception No_message_found
{3 Examples}
{[
- open Core
- open Disml
+open Core
+open Disml
- let check_command (msg : Message.t) =
- if String.is_prefix ~prefix:"!hello" msg.content then
- let embed = Embed.(default |> title "Hello World!") in
- Channel_id.send_message ~embed msg.channel_id >>> ignore
+let check_command (msg : Message.t) =
+ if String.is_prefix ~prefix:"!hello" msg.content then
+ let embed = Embed.(default |> title "Hello World!") in
+ Channel_id.send_message ~embed msg.channel_id >>> ignore
- Client.message_create := check_command
+Client.message_create := check_command
]}
*)
val send_message :
@@ -43,4 +43,4 @@ val get_messages :
val broadcast_typing : t -> unit Deferred.Or_error.t
val get_pins : t -> Message_t.t list Deferred.Or_error.t
val bulk_delete : Snowflake.t list -> t -> unit Deferred.Or_error.t
-(* TODO more things related to guild channels *) \ No newline at end of file
+(* TODO more things related to guild channels *)
diff --git a/lib/models/channel/message/message.ml b/lib/models/channel/message/message.ml
index d3917e9..41174e1 100644
--- a/lib/models/channel/message/message.ml
+++ b/lib/models/channel/message/message.ml
@@ -10,7 +10,7 @@ let add_reaction msg (emoji:Emoji.t) =
| None -> emoji.name
in
Http.create_reaction channel_id id e
-
+
let remove_reaction msg (emoji:Emoji.t) (user:User_t.t) =
let `Message_id id = msg.id in
@@ -21,31 +21,31 @@ let remove_reaction msg (emoji:Emoji.t) (user:User_t.t) =
| None -> emoji.name
in
Http.delete_reaction channel_id id e user_id
-
+
let clear_reactions msg =
let `Message_id id = msg.id in
let `Channel_id channel_id = msg.channel_id in
Http.delete_reactions channel_id id
-
+
let delete msg =
let `Message_id id = msg.id in
let `Channel_id channel_id = msg.channel_id in
Http.delete_message channel_id id
-
+
let pin msg =
let `Message_id id = msg.id in
let `Channel_id channel_id = msg.channel_id in
Http.pin_message channel_id id
-
+
let unpin msg =
let `Message_id id = msg.id in
let `Channel_id channel_id = msg.channel_id in
Http.unpin_message channel_id id
-
+
let reply msg content =
Channel_id.say content msg.channel_id
@@ -58,11 +58,11 @@ let set_content msg cont =
let `Channel_id channel_id = msg.channel_id in
to_yojson { msg with content = cont; }
|> Http.edit_message channel_id id
-
+
let set_embed msg embed =
let `Message_id id = msg.id in
let `Channel_id channel_id = msg.channel_id in
to_yojson { msg with embeds = [embed]; }
|> Http.edit_message channel_id id
- \ No newline at end of file
+
diff --git a/lib/models/channel/message/message.mli b/lib/models/channel/message/message.mli
index 56e1c98..0eba3af 100644
--- a/lib/models/channel/message/message.mli
+++ b/lib/models/channel/message/message.mli
@@ -31,9 +31,9 @@ val reply_with :
?tts:bool ->
t ->
Message_t.t Deferred.Or_error.t
-
+
(** Set the content of the message. *)
val set_content : t -> string -> t Deferred.Or_error.t
(** Set the embed of the message. *)
-val set_embed : t -> Embed.t -> t Deferred.Or_error.t \ No newline at end of file
+val set_embed : t -> Embed.t -> t Deferred.Or_error.t
diff --git a/lib/models/event_models.ml b/lib/models/event_models.ml
index 03bf79c..603f2c3 100644
--- a/lib/models/event_models.ml
+++ b/lib/models/event_models.ml
@@ -220,7 +220,7 @@ module GuildDelete = struct
{ id: Guild_id_t.t
; unavailable: bool
}
-
+
let deserialize = Guild_t.unavailable_of_yojson_exn
let update_cache (cache:Cache.t) (t:t) =
@@ -298,7 +298,7 @@ module GuildMemberAdd = struct
let update_cache (cache:Cache.t) (t:t) =
if Cache.GuildMap.mem cache.guilds t.guild_id then
let guilds = match Cache.GuildMap.find cache.guilds t.guild_id with
- | Some g ->
+ | Some g ->
let members = t :: g.members in
let data = { g with members } in
Cache.GuildMap.set cache.guilds ~key:t.guild_id ~data
@@ -318,7 +318,7 @@ module GuildMemberRemove = struct
let update_cache (cache:Cache.t) t =
if Cache.GuildMap.mem cache.guilds t.guild_id then
let guilds = match Cache.GuildMap.find cache.guilds t.guild_id with
- | Some g ->
+ | Some g ->
let members = List.filter g.members ~f:(fun m -> m.user.id <> t.user.id) in
let data = { g with members } in
Cache.GuildMap.set cache.guilds ~key:t.guild_id ~data
@@ -340,7 +340,7 @@ module GuildMemberUpdate = struct
let update_cache (cache:Cache.t) t =
if Cache.GuildMap.mem cache.guilds t.guild_id then
let guilds = match Cache.GuildMap.find cache.guilds t.guild_id with
- | Some g ->
+ | Some g ->
let members = List.map g.members ~f:(fun m ->
if m.user.id = t.user.id then
{ m with nick = t.nick; roles = t.roles }
@@ -518,7 +518,7 @@ module PresenceUpdate = struct
end
(* module PresencesReplace = struct
- type t =
+ type t =
let deserialize = of_yojson_exn
end *)
@@ -635,7 +635,7 @@ module Unknown = struct
; value: Yojson.Safe.t
}
- let deserialize kind value = { kind; value; }
+ let deserialize kind value = { kind; value; }
end
(* module VoiceHeartbeat = struct
@@ -660,4 +660,4 @@ end
module VoiceStateUpdate = struct
-end *) \ No newline at end of file
+end *)
diff --git a/lib/models/guild/guild.ml b/lib/models/guild/guild.ml
index bd3143e..2559df6 100644
--- a/lib/models/guild/guild.ml
+++ b/lib/models/guild/guild.ml
@@ -46,7 +46,7 @@ let create_channel ~mode ~name guild =
("type", `Int kind);
])
-let delete guild =
+let delete guild =
Http.delete_guild (get_id guild)
let get_ban ~id guild =
@@ -125,4 +125,4 @@ let get_channel ~(id:Channel_id_t.t) guild =
(* TODO add HTTP fallback *)
let get_role ~(id:Role_id.t) guild =
- List.find ~f:(fun r -> r.id = id) guild.roles \ No newline at end of file
+ List.find ~f:(fun r -> r.id = id) guild.roles
diff --git a/lib/models/id/channel_id.mli b/lib/models/id/channel_id.mli
index 20987c5..74010a5 100644
--- a/lib/models/id/channel_id.mli
+++ b/lib/models/id/channel_id.mli
@@ -10,15 +10,15 @@ exception No_message_found
{3 Examples}
{[
- open Core
- open Disml
+open Core
+open Disml
- let check_command (msg : Message.t) =
- if String.is_prefix ~prefix:"!hello" msg.content then
- let embed = Embed.(default |> title "Hello World!") in
- Channel_id.send_message ~embed msg.channel_id >>> ignore
+let check_command (msg : Message.t) =
+ if String.is_prefix ~prefix:"!hello" msg.content then
+ let embed = Embed.(default |> title "Hello World!") in
+ Channel_id.send_message ~embed msg.channel_id >>> ignore
- Client.message_create := check_command
+Client.message_create := check_command
]}
*)
val send_message :
@@ -43,4 +43,4 @@ val get_messages :
val broadcast_typing : t -> unit Deferred.Or_error.t
val get_pins : t -> Message_t.t list Deferred.Or_error.t
val bulk_delete : Snowflake.t list -> t -> unit Deferred.Or_error.t
-(* TODO more things related to guild channels *) \ No newline at end of file
+(* TODO more things related to guild channels *)
diff --git a/lib/models/id/guild_id.ml b/lib/models/id/guild_id.ml
index 6b3385c..d4db185 100644
--- a/lib/models/id/guild_id.ml
+++ b/lib/models/id/guild_id.ml
@@ -39,7 +39,7 @@ let create_channel ~mode ~name guild =
("type", `Int kind);
])
-let delete guild =
+let delete guild =
Http.delete_guild (get_id guild)
let get_ban ~id guild =
@@ -101,4 +101,4 @@ let unban_user ~id ?reason guild =
let payload = match reason with
| Some r -> `Assoc [("reason", `String r)]
| None -> `Null
- in Http.guild_ban_remove (get_id guild) id payload \ No newline at end of file
+ in Http.guild_ban_remove (get_id guild) id payload
diff --git a/lib/models/permissions.ml b/lib/models/permissions.ml
index 9a0567d..7a0892b 100644
--- a/lib/models/permissions.ml
+++ b/lib/models/permissions.ml
@@ -1,32 +1,32 @@
type elt =
| CREATE_INSTANT_INVITE
-| KICK_MEMBERS
-| BAN_MEMBERS
-| ADMINISTRATOR
-| MANAGE_CHANNELS
-| MANAGE_GUILD
-| ADD_REACTIONS
-| VIEW_AUDIT_LOG
-| PRIORITY_SPEAKER
+| KICK_MEMBERS
+| BAN_MEMBERS
+| ADMINISTRATOR
+| MANAGE_CHANNELS
+| MANAGE_GUILD
+| ADD_REACTIONS
+| VIEW_AUDIT_LOG
+| PRIORITY_SPEAKER
| READ_MESSAGES
-| SEND_MESSAGES
-| SEND_TTS_MESSAGES
-| MANAGE_MESSAGES
-| EMBED_LINKS
-| ATTACH_FILES
-| READ_MESSAGE_HISTORY
-| MENTION_EVERYONE
-| USE_EXTERNAL_EMOJIS
-| CONNECT
-| SPEAK
-| MUTE_MEMBERS
-| DEAFEN_MEMBERS
-| MOVE_MEMBERS
-| USE_VAD
-| CHANGE_NICKNAME
-| MANAGE_NICKNAMES
-| MANAGE_ROLES
-| MANAGE_WEBHOOKS
+| SEND_MESSAGES
+| SEND_TTS_MESSAGES
+| MANAGE_MESSAGES
+| EMBED_LINKS
+| ATTACH_FILES
+| READ_MESSAGE_HISTORY
+| MENTION_EVERYONE
+| USE_EXTERNAL_EMOJIS
+| CONNECT
+| SPEAK
+| MUTE_MEMBERS
+| DEAFEN_MEMBERS
+| MOVE_MEMBERS
+| USE_VAD
+| CHANGE_NICKNAME
+| MANAGE_NICKNAMES
+| MANAGE_ROLES
+| MANAGE_WEBHOOKS
| MANAGE_EMOJIS
[@@deriving sexp]
@@ -56,4 +56,4 @@ let to_seq_from elt init =
elt :: elements r |> List.to_seq
let add_seq seq init =
- of_seq seq |> union init \ No newline at end of file
+ of_seq seq |> union init
diff --git a/lib/models/permissions.mli b/lib/models/permissions.mli
index 6e4d30a..ce5913a 100644
--- a/lib/models/permissions.mli
+++ b/lib/models/permissions.mli
@@ -1,32 +1,32 @@
type elt =
| CREATE_INSTANT_INVITE
-| KICK_MEMBERS
-| BAN_MEMBERS
-| ADMINISTRATOR
-| MANAGE_CHANNELS
-| MANAGE_GUILD
-| ADD_REACTIONS
-| VIEW_AUDIT_LOG
-| PRIORITY_SPEAKER
+| KICK_MEMBERS
+| BAN_MEMBERS
+| ADMINISTRATOR
+| MANAGE_CHANNELS
+| MANAGE_GUILD
+| ADD_REACTIONS
+| VIEW_AUDIT_LOG
+| PRIORITY_SPEAKER
| READ_MESSAGES
-| SEND_MESSAGES
-| SEND_TTS_MESSAGES
-| MANAGE_MESSAGES
-| EMBED_LINKS
-| ATTACH_FILES
-| READ_MESSAGE_HISTORY
-| MENTION_EVERYONE
-| USE_EXTERNAL_EMOJIS
-| CONNECT
-| SPEAK
-| MUTE_MEMBERS
-| DEAFEN_MEMBERS
-| MOVE_MEMBERS
-| USE_VAD
-| CHANGE_NICKNAME
-| MANAGE_NICKNAMES
-| MANAGE_ROLES
-| MANAGE_WEBHOOKS
+| SEND_MESSAGES
+| SEND_TTS_MESSAGES
+| MANAGE_MESSAGES
+| EMBED_LINKS
+| ATTACH_FILES
+| READ_MESSAGE_HISTORY
+| MENTION_EVERYONE
+| USE_EXTERNAL_EMOJIS
+| CONNECT
+| SPEAK
+| MUTE_MEMBERS
+| DEAFEN_MEMBERS
+| MOVE_MEMBERS
+| USE_VAD
+| CHANGE_NICKNAME
+| MANAGE_NICKNAMES
+| MANAGE_ROLES
+| MANAGE_WEBHOOKS
| MANAGE_EMOJIS
[@@deriving sexp]
@@ -38,4 +38,4 @@ val sexp_of_t : t -> Sexplib.Sexp.t
val t_of_sexp : Sexplib.Sexp.t -> t
val of_yojson_exn : Yojson.Safe.t -> t
val of_yojson : Yojson.Safe.t -> (t, string) result
-val to_yojson : t -> Yojson.Safe.t \ No newline at end of file
+val to_yojson : t -> Yojson.Safe.t