aboutsummaryrefslogtreecommitdiff
path: root/src/ext
diff options
context:
space:
mode:
Diffstat (limited to 'src/ext')
-rw-r--r--src/ext/voice/handler.rs8
-rw-r--r--src/ext/voice/manager.rs6
2 files changed, 7 insertions, 7 deletions
diff --git a/src/ext/voice/handler.rs b/src/ext/voice/handler.rs
index 8dc0ab1..1f2a5d2 100644
--- a/src/ext/voice/handler.rs
+++ b/src/ext/voice/handler.rs
@@ -2,7 +2,7 @@ use serde_json::builder::ObjectBuilder;
use std::sync::mpsc::{self, Sender};
use super::connection_info::ConnectionInfo;
use super::{Status as VoiceStatus, Target};
-use ::client::ConnectionStatus;
+use ::client::gateway::GatewayStatus;
use ::constants::VoiceOpCode;
use ::model::{ChannelId, GuildId, VoiceState};
use super::threading;
@@ -39,7 +39,7 @@ pub struct Handler {
sender: Sender<VoiceStatus>,
session_id: Option<String>,
user_id: u64,
- ws: Sender<ConnectionStatus>,
+ ws: Sender<GatewayStatus>,
}
impl Handler {
@@ -52,7 +52,7 @@ impl Handler {
///
/// [`Manager::join`]: struct.Manager.html#method.join
#[doc(hidden)]
- pub fn new(target: Target, ws: Sender<ConnectionStatus>, user_id: u64)
+ pub fn new(target: Target, ws: Sender<GatewayStatus>, user_id: u64)
-> Self {
let (tx, rx) = mpsc::channel();
@@ -260,7 +260,7 @@ impl Handler {
.insert("self_mute", self.self_mute))
.build();
- let _ = self.ws.send(ConnectionStatus::SendMessage(map));
+ let _ = self.ws.send(GatewayStatus::SendMessage(map));
}
fn send(&mut self, status: VoiceStatus) {
diff --git a/src/ext/voice/manager.rs b/src/ext/voice/manager.rs
index c6c7533..b4f3501 100644
--- a/src/ext/voice/manager.rs
+++ b/src/ext/voice/manager.rs
@@ -1,7 +1,7 @@
use std::collections::HashMap;
use std::sync::mpsc::Sender as MpscSender;
use super::{Handler, Target};
-use ::client::ConnectionStatus;
+use ::client::gateway::GatewayStatus;
use ::model::{ChannelId, GuildId};
/// A manager is a struct responsible for managing [`Handler`]s which belong to
@@ -23,12 +23,12 @@ use ::model::{ChannelId, GuildId};
pub struct Manager {
handlers: HashMap<Target, Handler>,
user_id: u64,
- ws: MpscSender<ConnectionStatus>,
+ ws: MpscSender<GatewayStatus>,
}
impl Manager {
#[doc(hidden)]
- pub fn new(ws: MpscSender<ConnectionStatus>, user_id: u64) -> Manager {
+ pub fn new(ws: MpscSender<GatewayStatus>, user_id: u64) -> Manager {
Manager {
handlers: HashMap::new(),
user_id: user_id,