aboutsummaryrefslogtreecommitdiff
path: root/src/voice/handler.rs
diff options
context:
space:
mode:
authorZeyla Hellyer <[email protected]>2017-06-10 16:06:37 -0700
committerZeyla Hellyer <[email protected]>2017-06-10 16:06:37 -0700
commit2f30f9ab38761aad62af977ab4440b8bfb43a897 (patch)
treee403e3e3cd394c9ff6d05f49febe285868ae108b /src/voice/handler.rs
parentUse an https connector in http::send_files (diff)
downloadserenity-2f30f9ab38761aad62af977ab4440b8bfb43a897.tar.xz
serenity-2f30f9ab38761aad62af977ab4440b8bfb43a897.zip
Fix voice compilation
Diffstat (limited to 'src/voice/handler.rs')
-rw-r--r--src/voice/handler.rs10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/voice/handler.rs b/src/voice/handler.rs
index 22c0375..e40c6d9 100644
--- a/src/voice/handler.rs
+++ b/src/voice/handler.rs
@@ -1,9 +1,9 @@
+use serde_json::Value;
use std::sync::mpsc::{self, Sender as MpscSender};
use super::{AudioReceiver, AudioSource};
use super::connection_info::ConnectionInfo;
use super::Status as VoiceStatus;
use ::constants::VoiceOpCode;
-use ::gateway::GatewayStatus;
use ::model::{ChannelId, GuildId, UserId, VoiceState};
use super::threading;
@@ -99,7 +99,7 @@ pub struct Handler {
///
/// When set via [`standalone`][`Handler::standalone`], it will not be
/// present.
- ws: Option<MpscSender<GatewayStatus>>,
+ ws: Option<MpscSender<Value>>,
}
impl Handler {
@@ -113,7 +113,7 @@ impl Handler {
/// [`Manager::join`]: struct.Manager.html#method.join
#[doc(hidden)]
#[inline]
- pub fn new(guild_id: GuildId, ws: MpscSender<GatewayStatus>, user_id: UserId) -> Self {
+ pub fn new(guild_id: GuildId, ws: MpscSender<Value>, user_id: UserId) -> Self {
Self::new_raw(guild_id, Some(ws), user_id)
}
@@ -357,7 +357,7 @@ impl Handler {
}
}
- fn new_raw(guild_id: GuildId, ws: Option<MpscSender<GatewayStatus>>, user_id: UserId) -> Self {
+ fn new_raw(guild_id: GuildId, ws: Option<MpscSender<Value>>, user_id: UserId) -> Self {
let (tx, rx) = mpsc::channel();
threading::start(guild_id, rx);
@@ -418,7 +418,7 @@ impl Handler {
}
});
- let _ = ws.send(GatewayStatus::SendMessage(map));
+ let _ = ws.send(map);
}
}
}