diff options
| author | Adelyn Breedlove <[email protected]> | 2019-03-01 23:15:23 -0700 |
|---|---|---|
| committer | Adelyn Breedlove <[email protected]> | 2019-03-01 23:15:23 -0700 |
| commit | ef28f111cfec95a62b21a9267f9d24b1edc645dd (patch) | |
| tree | c5a93c0072823aaeac425f6263c076333b55d225 /lib/gateway | |
| parent | Remove use of Tyre in favour of Str lib (diff) | |
| download | disml-ef28f111cfec95a62b21a9267f9d24b1edc645dd.tar.xz disml-ef28f111cfec95a62b21a9267f9d24b1edc645dd.zip | |
Style improvements who dis
Diffstat (limited to 'lib/gateway')
| -rw-r--r-- | lib/gateway/dispatch.mli | 18 | ||||
| -rw-r--r-- | lib/gateway/sharder.ml | 8 | ||||
| -rw-r--r-- | lib/gateway/sharder.mli | 2 |
3 files changed, 14 insertions, 14 deletions
diff --git a/lib/gateway/dispatch.mli b/lib/gateway/dispatch.mli index 18b9261..89905a6 100644 --- a/lib/gateway/dispatch.mli +++ b/lib/gateway/dispatch.mli @@ -6,14 +6,14 @@ [Client.guild_create := (fun guild -> print_endline guild.name)]
{[
- open Core
- open Disml
-
- let check_command (msg : Message.t) =
- if String.is_prefix ~prefix:"!ping" msg.content then
- Message.reply msg "Pong!" >>> ignore
-
- Client.message_create := check_command
+open Core
+open Disml
+
+let check_command (msg : Message.t) =
+ if String.is_prefix ~prefix:"!ping" msg.content then
+ Message.reply msg "Pong!" >>> ignore
+
+Client.message_create := check_command
]}
*)
@@ -117,4 +117,4 @@ val unknown : (Unknown.t -> unit) ref (**/**)
(* val voice_state_update : (Yojson.Safe.t -> unit) ref *)
-(* val voice_server_update : (Yojson.Safe.t -> unit) ref *)
\ No newline at end of file +(* val voice_server_update : (Yojson.Safe.t -> unit) ref *)
diff --git a/lib/gateway/sharder.ml b/lib/gateway/sharder.ml index 71e900d..ba865a9 100644 --- a/lib/gateway/sharder.ml +++ b/lib/gateway/sharder.ml @@ -62,7 +62,7 @@ module Shard = struct | Binary ->
if compress then `Ok (decompress s.content |> Yojson.Safe.from_string)
else `Error "Failed to decompress"
- | Close -> `Close s.content
+ | Close -> `Close s
| op ->
let op = Frame.Opcode.to_string op in
`Error ("Unexpected opcode " ^ op)
@@ -311,13 +311,13 @@ let start ?count ?compress ?large_threshold () = Logs.info (fun m -> m "Connecting to %s" url);
let rec ev_loop (t:Shard.shard Shard.t) =
let step (t:Shard.shard Shard.t) =
- Pipe.read (fst t.state.pipe) >>= fun frame ->
+ Pipe.read (fst t.state.pipe) >>= fun frame ->
begin match Shard.parse ~compress:t.state.compress frame with
| `Ok f ->
Shard.handle_frame ~f t.state >>| fun s ->
t.state <- s
| `Close c ->
- Logs.warn (fun m -> m "Close frame received. Code: %s" c);
+ Logs.warn (fun m -> m "Close frame received. %s" (Frame.show c));
Shard.shutdown t
| `Error e ->
Logs.warn (fun m -> m "Websocket soft error: %s" e);
@@ -379,4 +379,4 @@ let request_guild_members ?query ?limit ~guild sharder = let shutdown_all ?restart sharder =
Deferred.all @@ List.map ~f:(fun t ->
Shard.shutdown ~clean:true ?restart t
- ) sharder.shards
\ No newline at end of file + ) sharder.shards
diff --git a/lib/gateway/sharder.mli b/lib/gateway/sharder.mli index bbd8617..6249d4d 100644 --- a/lib/gateway/sharder.mli +++ b/lib/gateway/sharder.mli @@ -33,7 +33,7 @@ module Shard : sig url: string; (** The websocket URL in use. *)
_internal: Reader.t * Writer.t;
}
-
+
(** Wrapper around an internal state, used to wrap {!shard}. *)
type 'a t = {
mutable state: 'a;
|