aboutsummaryrefslogtreecommitdiff
path: root/src/gateway
diff options
context:
space:
mode:
authorMaiddog <[email protected]>2017-08-27 04:17:59 -0500
committeralex <[email protected]>2017-08-27 11:17:59 +0200
commite1a8fe3e9f619fbb94dd54993c8f5d25fd5dc375 (patch)
tree4c6c45cc592505f971c13aee8dfbdd41107a84ce /src/gateway
parentAdd ability to play DCA and Opus files. (#148) (diff)
downloadserenity-e1a8fe3e9f619fbb94dd54993c8f5d25fd5dc375.tar.xz
serenity-e1a8fe3e9f619fbb94dd54993c8f5d25fd5dc375.zip
Prevent malformed opus data from crashing the bot process (#149)
Diffstat (limited to 'src/gateway')
-rw-r--r--src/gateway/shard.rs72
1 files changed, 37 insertions, 35 deletions
diff --git a/src/gateway/shard.rs b/src/gateway/shard.rs
index 6f6a949..028efeb 100644
--- a/src/gateway/shard.rs
+++ b/src/gateway/shard.rs
@@ -138,41 +138,43 @@ impl Shard {
let session_id = None;
let mut shard =
- feature_voice! {{
- let (tx, rx) = mpsc::channel();
-
- let user = http::get_current_user()?;
-
- Shard {
- client,
- current_presence,
- heartbeat_instants,
- heartbeat_interval,
- last_heartbeat_acknowledged,
- seq,
- stage,
- token,
- session_id,
- shard_info,
- ws_url,
- manager: VoiceManager::new(tx, user.id),
- manager_rx: rx,
- }
- } else {
- Shard {
- client,
- current_presence,
- heartbeat_instants,
- heartbeat_interval,
- last_heartbeat_acknowledged,
- seq,
- stage,
- token,
- session_id,
- shard_info,
- ws_url,
- }
- }};
+ feature_voice! {
+ {
+ let (tx, rx) = mpsc::channel();
+
+ let user = http::get_current_user()?;
+
+ Shard {
+ client,
+ current_presence,
+ heartbeat_instants,
+ heartbeat_interval,
+ last_heartbeat_acknowledged,
+ seq,
+ stage,
+ token,
+ session_id,
+ shard_info,
+ ws_url,
+ manager: VoiceManager::new(tx, user.id),
+ manager_rx: rx,
+ }
+ } else {
+ Shard {
+ client,
+ current_presence,
+ heartbeat_instants,
+ heartbeat_interval,
+ last_heartbeat_acknowledged,
+ seq,
+ stage,
+ token,
+ session_id,
+ shard_info,
+ ws_url,
+ }
+ }
+ };
shard.identify()?;