|
|
@ -12,7 +12,7 @@ use songbird::{
|
|
|
|
};
|
|
|
|
};
|
|
|
|
use tokio::sync::Mutex;
|
|
|
|
use tokio::sync::Mutex;
|
|
|
|
|
|
|
|
|
|
|
|
use clear::CLEAR_COMMAND;
|
|
|
|
use clear_queue::CLEAR_QUEUE_COMMAND;
|
|
|
|
use current::CURRENT_COMMAND;
|
|
|
|
use current::CURRENT_COMMAND;
|
|
|
|
use join::JOIN_COMMAND;
|
|
|
|
use join::JOIN_COMMAND;
|
|
|
|
use leave::LEAVE_COMMAND;
|
|
|
|
use leave::LEAVE_COMMAND;
|
|
|
@ -36,7 +36,7 @@ use regex::Regex;
|
|
|
|
use std::sync::atomic::{AtomicIsize, AtomicUsize, Ordering};
|
|
|
|
use std::sync::atomic::{AtomicIsize, AtomicUsize, Ordering};
|
|
|
|
use std::time::Duration;
|
|
|
|
use std::time::Duration;
|
|
|
|
|
|
|
|
|
|
|
|
mod clear;
|
|
|
|
mod clear_queue;
|
|
|
|
mod current;
|
|
|
|
mod current;
|
|
|
|
mod join;
|
|
|
|
mod join;
|
|
|
|
mod leave;
|
|
|
|
mod leave;
|
|
|
@ -60,13 +60,12 @@ mod skip;
|
|
|
|
shuffle,
|
|
|
|
shuffle,
|
|
|
|
current,
|
|
|
|
current,
|
|
|
|
play_next,
|
|
|
|
play_next,
|
|
|
|
clear,
|
|
|
|
clear_queue,
|
|
|
|
pause,
|
|
|
|
pause,
|
|
|
|
save_playlist,
|
|
|
|
save_playlist,
|
|
|
|
playlists,
|
|
|
|
playlists,
|
|
|
|
lyrics
|
|
|
|
lyrics
|
|
|
|
)]
|
|
|
|
)]
|
|
|
|
#[prefixes("m", "music")]
|
|
|
|
|
|
|
|
pub struct Music;
|
|
|
|
pub struct Music;
|
|
|
|
|
|
|
|
|
|
|
|
struct SongEndNotifier {
|
|
|
|
struct SongEndNotifier {
|
|
|
|