aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNathan Perry <avaglir@gmail.com>2019-02-21 00:32:52 -0500
committerNathan Perry <avaglir@gmail.com>2019-02-21 00:32:52 -0500
commit809439a83127a7dde63058a9a787948b4ca0f43b (patch)
treeb13a1f213a8ee43a568ddb181475f2ee909e9f44 /src
parent299f9813bbae50dfdecccd6c8ecdaeaa9b4f4ec6 (diff)
fix Context.currently_playing
Diffstat (limited to 'src')
-rw-r--r--src/audio/mod.rs11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/audio/mod.rs b/src/audio/mod.rs
index eaebf55..5044c49 100644
--- a/src/audio/mod.rs
+++ b/src/audio/mod.rs
@@ -1,26 +1,25 @@
use std::sync::Arc;
-use either::Either;
-use typemap::Key;
use chrono::Duration;
-
+use either::Either;
use serenity::{
+ client::bridge::voice::ClientVoiceManager,
model::{
id::ChannelId,
},
prelude::*,
- client::bridge::voice::ClientVoiceManager,
voice::LockedAudio,
};
+use typemap::Key;
use crate::{
must_env_lookup,
Result,
};
+pub use self::play_queue::PlayQueue;
pub use self::timeutil::parse_times;
pub use self::ytdl::*;
-pub use self::play_queue::PlayQueue;
mod timeutil;
mod ytdl;
@@ -35,7 +34,7 @@ impl CtxExt for Context {
fn currently_playing(&self) -> bool {
let queue_lock = self.data.lock().get::<PlayQueue>().cloned().unwrap();
let play_queue = queue_lock.read().unwrap();
- play_queue.playing.is_none()
+ play_queue.playing.is_some()
}
fn users_listening(&self) -> Result<bool> {