diff options
| author | Maiddog <[email protected]> | 2017-08-26 17:55:43 -0500 |
|---|---|---|
| committer | alex <[email protected]> | 2017-08-27 00:55:43 +0200 |
| commit | 3e0b1032d80a1847558a752e8316d97f9ae58f04 (patch) | |
| tree | ca65390091cb3c0ab98b6497a1447ba69df3d20d /src/gateway | |
| parent | Use `$crate` for `Args` (diff) | |
| download | serenity-3e0b1032d80a1847558a752e8316d97f9ae58f04.tar.xz serenity-3e0b1032d80a1847558a752e8316d97f9ae58f04.zip | |
Add ability to play DCA and Opus files. (#148)
Diffstat (limited to 'src/gateway')
| -rw-r--r-- | src/gateway/shard.rs | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/gateway/shard.rs b/src/gateway/shard.rs index 7663cee..6f6a949 100644 --- a/src/gateway/shard.rs +++ b/src/gateway/shard.rs @@ -12,7 +12,7 @@ use websocket::stream::sync::AsTcpStream; use websocket::sync::client::{Client, ClientBuilder}; use websocket::sync::stream::{TcpStream, TlsStream}; use websocket::WebSocketError; -use constants::{self, close_codes, OpCode}; +use constants::{self, OpCode, close_codes}; use internal::prelude::*; use internal::ws_impl::SenderExt; use model::event::{Event, GatewayEvent}; @@ -95,7 +95,8 @@ pub struct Shard { /// update the voice connections' states. #[cfg(feature = "voice")] pub manager: VoiceManager, - #[cfg(feature = "voice")] manager_rx: MpscReceiver<Value>, + #[cfg(feature = "voice")] + manager_rx: MpscReceiver<Value>, } impl Shard { @@ -136,7 +137,8 @@ impl Shard { let stage = ConnectionStage::Handshake; let session_id = None; - let mut shard = feature_voice! {{ + let mut shard = + feature_voice! {{ let (tx, rx) = mpsc::channel(); let user = http::get_current_user()?; @@ -469,7 +471,8 @@ impl Shard { return Err(Error::Gateway(GatewayError::OverloadedShard)); }, - Some(4006) | Some(close_codes::SESSION_TIMEOUT) => { + Some(4006) | + Some(close_codes::SESSION_TIMEOUT) => { info!("[Shard {:?}] Invalid session", self.shard_info); self.session_id = None; @@ -739,9 +742,10 @@ impl Shard { }, Err(why) => { match why { - Error::WebSocket(WebSocketError::IoError(err)) => if err.raw_os_error() != - Some(32) { - debug!("[Shard {:?}] Err w/ heartbeating: {:?}", self.shard_info, err); + Error::WebSocket(WebSocketError::IoError(err)) => { + if err.raw_os_error() != Some(32) { + debug!("[Shard {:?}] Err w/ heartbeating: {:?}", self.shard_info, err); + } }, other => { warn!("[Shard {:?}] Other err w/ keepalive: {:?}", self.shard_info, other); |