Working on music
This commit is contained in:
parent
d2de03894a
commit
f3a9098ddb
|
@ -45,8 +45,14 @@ impl songbird::EventHandler for TrackStartNotifier {
|
||||||
error!("Error sending message: {:?}", why);
|
error!("Error sending message: {:?}", why);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if let Err(why) = self.chan_id.say(&self.http, "Queue finished").await {
|
if let Err(e) = self
|
||||||
error!("Error sending message: {:?}", why);
|
.chan_id
|
||||||
|
.send_message(&self.http, |m| {
|
||||||
|
embed_response(m, "Queue finished", "", None)
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
{
|
||||||
|
error!("Error sending message: {:?}", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -166,7 +172,7 @@ fn embed_author<'a>(e: &'a mut CreateEmbed, author: Option<&Member>) -> &'a mut
|
||||||
}
|
}
|
||||||
|
|
||||||
#[group]
|
#[group]
|
||||||
#[commands(join, leave, play, stop, next)]
|
#[commands(join, leave, play, stop, next, pause, resume)]
|
||||||
struct Music;
|
struct Music;
|
||||||
|
|
||||||
#[command]
|
#[command]
|
||||||
|
@ -291,6 +297,7 @@ async fn leave(ctx: &Context, msg: &Message) -> CommandResult {
|
||||||
};
|
};
|
||||||
|
|
||||||
let member = msg.member(&ctx.http).await?;
|
let member = msg.member(&ctx.http).await?;
|
||||||
|
|
||||||
if if let Some(member) = &msg.member {
|
if if let Some(member) = &msg.member {
|
||||||
is_mute(ctx, member, guild_id).await.unwrap_or(false)
|
is_mute(ctx, member, guild_id).await.unwrap_or(false)
|
||||||
} else {
|
} else {
|
||||||
|
@ -319,55 +326,30 @@ async fn leave(ctx: &Context, msg: &Message) -> CommandResult {
|
||||||
log::error!("Failed to leave : {}", e);
|
log::error!("Failed to leave : {}", e);
|
||||||
msg.channel_id
|
msg.channel_id
|
||||||
.send_message(&ctx.http, |m| {
|
.send_message(&ctx.http, |m| {
|
||||||
embed_response(
|
embed_response(m, "Error", "Failed to leave", Some(&member))
|
||||||
m,
|
|
||||||
"Error",
|
|
||||||
"Failed to leave",
|
|
||||||
Some(&member),
|
|
||||||
)
|
|
||||||
})
|
})
|
||||||
.await?;
|
.await?;
|
||||||
}
|
}
|
||||||
|
|
||||||
msg.channel_id
|
msg.channel_id
|
||||||
.send_message(&ctx.http, |m| {
|
.send_message(&ctx.http, |m| {
|
||||||
embed_response(
|
embed_response(m, "Left channel", "", Some(&member))
|
||||||
m,
|
|
||||||
"Left channel",
|
|
||||||
"",
|
|
||||||
Some(&member),
|
|
||||||
)
|
|
||||||
})
|
})
|
||||||
.await?;
|
.await?;
|
||||||
} else {
|
} else {
|
||||||
msg.channel_id
|
msg.channel_id
|
||||||
.send_message(&ctx.http, |m| {
|
.send_message(&ctx.http, |m| {
|
||||||
embed_response(
|
embed_response(m, "Error", "Not in a voice channel", Some(&member))
|
||||||
m,
|
|
||||||
"Error",
|
|
||||||
"Not in a voice channel",
|
|
||||||
Some(&member),
|
|
||||||
)
|
|
||||||
})
|
})
|
||||||
.await?;
|
.await?;
|
||||||
}
|
}
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TODO FORCE CLEAN FLAG ADMIN
|
||||||
#[command]
|
#[command]
|
||||||
#[description("Play a music (require an url)")]
|
#[description("Play a music (require an url)")]
|
||||||
async fn play(ctx: &Context, msg: &Message, mut args: Args) -> CommandResult {
|
async fn play(ctx: &Context, msg: &Message, mut args: Args) -> CommandResult {
|
||||||
let url = match args.single::<String>() {
|
|
||||||
Ok(url) => url,
|
|
||||||
Err(_) => {
|
|
||||||
msg.channel_id
|
|
||||||
.say(&ctx.http, "Must provide a URL to a video or audio")
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
return Ok(());
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
let guild_id = match ctx.cache.guild_channel(msg.channel_id).await {
|
let guild_id = match ctx.cache.guild_channel(msg.channel_id).await {
|
||||||
Some(channel) => channel.guild_id,
|
Some(channel) => channel.guild_id,
|
||||||
None => {
|
None => {
|
||||||
|
@ -379,13 +361,39 @@ async fn play(ctx: &Context, msg: &Message, mut args: Args) -> CommandResult {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
let member = msg.member(&ctx.http).await?;
|
||||||
|
|
||||||
|
let url = match args.single::<String>() {
|
||||||
|
Ok(url) => url,
|
||||||
|
Err(_) => {
|
||||||
|
msg.channel_id
|
||||||
|
.send_message(&ctx.http, |m| {
|
||||||
|
embed_response(
|
||||||
|
m,
|
||||||
|
"Error",
|
||||||
|
"You must provide an url or a song name",
|
||||||
|
Some(&member),
|
||||||
|
)
|
||||||
|
})
|
||||||
|
.await?;
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
if if let Some(member) = &msg.member {
|
if if let Some(member) = &msg.member {
|
||||||
is_mute(ctx, member, guild_id).await.unwrap_or(false)
|
is_mute(ctx, member, guild_id).await.unwrap_or(false)
|
||||||
} else {
|
} else {
|
||||||
false
|
false
|
||||||
} {
|
} {
|
||||||
msg.channel_id
|
msg.channel_id
|
||||||
.say(&ctx.http, "Error, you cant play music")
|
.send_message(&ctx.http, |m| {
|
||||||
|
embed_response(
|
||||||
|
m,
|
||||||
|
"Error",
|
||||||
|
"You don't have the right to play music",
|
||||||
|
Some(&member),
|
||||||
|
)
|
||||||
|
})
|
||||||
.await?;
|
.await?;
|
||||||
return Ok(());
|
return Ok(());
|
||||||
}
|
}
|
||||||
|
@ -405,7 +413,9 @@ async fn play(ctx: &Context, msg: &Message, mut args: Args) -> CommandResult {
|
||||||
error!("Err starting source: {:?}", why);
|
error!("Err starting source: {:?}", why);
|
||||||
|
|
||||||
msg.channel_id
|
msg.channel_id
|
||||||
.say(&ctx.http, "Error sourcing ffmpeg")
|
.send_message(&ctx.http, |m| {
|
||||||
|
embed_response(m, "Error", "Failed to load the song", Some(&member))
|
||||||
|
})
|
||||||
.await?;
|
.await?;
|
||||||
|
|
||||||
return Ok(());
|
return Ok(());
|
||||||
|
@ -418,7 +428,9 @@ async fn play(ctx: &Context, msg: &Message, mut args: Args) -> CommandResult {
|
||||||
error!("Err starting source: {:?}", why);
|
error!("Err starting source: {:?}", why);
|
||||||
|
|
||||||
msg.channel_id
|
msg.channel_id
|
||||||
.say(&ctx.http, "Error sourcing ffmpeg")
|
.send_message(&ctx.http, |m| {
|
||||||
|
embed_response(m, "Error", "Failed to load the song", Some(&member))
|
||||||
|
})
|
||||||
.await?;
|
.await?;
|
||||||
|
|
||||||
return Ok(());
|
return Ok(());
|
||||||
|
@ -442,7 +454,9 @@ async fn play(ctx: &Context, msg: &Message, mut args: Args) -> CommandResult {
|
||||||
.await?;
|
.await?;
|
||||||
} else {
|
} else {
|
||||||
msg.channel_id
|
msg.channel_id
|
||||||
.say(&ctx.http, "Not in a voice channel to play in")
|
.send_message(&ctx.http, |m| {
|
||||||
|
embed_response(m, "Error", "Not in a voice channel", Some(&member))
|
||||||
|
})
|
||||||
.await?;
|
.await?;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -463,13 +477,22 @@ async fn next(ctx: &Context, msg: &Message) -> CommandResult {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
let member = msg.member(&ctx.http).await?;
|
||||||
|
|
||||||
if if let Some(member) = &msg.member {
|
if if let Some(member) = &msg.member {
|
||||||
is_mute(ctx, member, guild_id).await.unwrap_or(false)
|
is_mute(ctx, member, guild_id).await.unwrap_or(false)
|
||||||
} else {
|
} else {
|
||||||
false
|
false
|
||||||
} {
|
} {
|
||||||
msg.channel_id
|
msg.channel_id
|
||||||
.say(&ctx.http, "Error, you cant play music")
|
.send_message(&ctx.http, |m| {
|
||||||
|
embed_response(
|
||||||
|
m,
|
||||||
|
"Error",
|
||||||
|
"You don't have the right to play music",
|
||||||
|
Some(&member),
|
||||||
|
)
|
||||||
|
})
|
||||||
.await?;
|
.await?;
|
||||||
return Ok(());
|
return Ok(());
|
||||||
}
|
}
|
||||||
|
@ -484,27 +507,29 @@ async fn next(ctx: &Context, msg: &Message) -> CommandResult {
|
||||||
|
|
||||||
let queue = handler.queue();
|
let queue = handler.queue();
|
||||||
|
|
||||||
if let Some(current) = queue.current() {
|
|
||||||
let metadata = current.metadata();
|
|
||||||
log::debug!("Metadata : {:?}", metadata);
|
|
||||||
}
|
|
||||||
|
|
||||||
let current_queue = queue.current_queue();
|
let current_queue = queue.current_queue();
|
||||||
let next = current_queue.get(1);
|
let next = current_queue.get(1);
|
||||||
queue.skip()?;
|
queue.skip()?;
|
||||||
|
|
||||||
if let Some(current) = next {
|
if let Some(current) = next {
|
||||||
let metadata = current.metadata();
|
let metadata = current.metadata();
|
||||||
log::debug!("{:?}", metadata);
|
|
||||||
|
|
||||||
if let Some(title) = &metadata.title {
|
|
||||||
msg.channel_id
|
msg.channel_id
|
||||||
.say(&ctx.http, format!("Playing {}", title))
|
.send_message(&ctx.http, |m| {
|
||||||
|
embed_song(m, metadata, Some(&member));
|
||||||
|
m
|
||||||
|
})
|
||||||
|
.await?;
|
||||||
|
} else {
|
||||||
|
msg.channel_id
|
||||||
|
.send_message(&ctx.http, |m| embed_response(m, "Queue finished", "", None))
|
||||||
.await?;
|
.await?;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
msg.reply(ctx, "Not in a voice channel").await?;
|
msg.channel_id
|
||||||
|
.send_message(&ctx.http, |m| {
|
||||||
|
embed_response(m, "Error", "Not in a voice channel", Some(&member))
|
||||||
|
})
|
||||||
|
.await?;
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
|
@ -524,13 +549,22 @@ async fn stop(ctx: &Context, msg: &Message) -> CommandResult {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
let member = msg.member(&ctx.http).await?;
|
||||||
|
|
||||||
if if let Some(member) = &msg.member {
|
if if let Some(member) = &msg.member {
|
||||||
is_mute(ctx, member, guild_id).await.unwrap_or(false)
|
is_mute(ctx, member, guild_id).await.unwrap_or(false)
|
||||||
} else {
|
} else {
|
||||||
false
|
false
|
||||||
} {
|
} {
|
||||||
msg.channel_id
|
msg.channel_id
|
||||||
.say(&ctx.http, "Error, you cant play music")
|
.send_message(&ctx.http, |m| {
|
||||||
|
embed_response(
|
||||||
|
m,
|
||||||
|
"Error",
|
||||||
|
"You don't have the right to play music",
|
||||||
|
Some(&member),
|
||||||
|
)
|
||||||
|
})
|
||||||
.await?;
|
.await?;
|
||||||
return Ok(());
|
return Ok(());
|
||||||
}
|
}
|
||||||
|
@ -544,9 +578,129 @@ async fn stop(ctx: &Context, msg: &Message) -> CommandResult {
|
||||||
let handler = handler.lock().await;
|
let handler = handler.lock().await;
|
||||||
handler.queue().stop();
|
handler.queue().stop();
|
||||||
|
|
||||||
msg.channel_id.say(&ctx.http, "Stopping").await?;
|
msg.channel_id
|
||||||
|
.send_message(&ctx.http, |m| {
|
||||||
|
embed_response(m, "Stopped the queue", "", Some(&member))
|
||||||
|
})
|
||||||
|
.await?;
|
||||||
} else {
|
} else {
|
||||||
msg.reply(ctx, "Not in a voice channel").await?;
|
msg.channel_id
|
||||||
|
.send_message(&ctx.http, |m| {
|
||||||
|
embed_response(m, "Error", "Not in a voice channel", Some(&member))
|
||||||
|
})
|
||||||
|
.await?;
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[command]
|
||||||
|
#[description("Pause the music")]
|
||||||
|
async fn pause(ctx: &Context, msg: &Message) -> CommandResult {
|
||||||
|
let guild_id = match ctx.cache.guild_channel(msg.channel_id).await {
|
||||||
|
Some(channel) => channel.guild_id,
|
||||||
|
None => {
|
||||||
|
msg.channel_id
|
||||||
|
.say(&ctx.http, "Error finding channel info")
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
let member = msg.member(&ctx.http).await?;
|
||||||
|
|
||||||
|
if if let Some(member) = &msg.member {
|
||||||
|
is_mute(ctx, member, guild_id).await.unwrap_or(false)
|
||||||
|
} else {
|
||||||
|
false
|
||||||
|
} {
|
||||||
|
msg.channel_id
|
||||||
|
.send_message(&ctx.http, |m| {
|
||||||
|
embed_response(
|
||||||
|
m,
|
||||||
|
"Error",
|
||||||
|
"You don't have the right to play music",
|
||||||
|
Some(&member),
|
||||||
|
)
|
||||||
|
})
|
||||||
|
.await?;
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
|
||||||
|
let manager = songbird::get(ctx)
|
||||||
|
.await
|
||||||
|
.expect("Songbird Voice client placed in at initialisation.")
|
||||||
|
.clone();
|
||||||
|
|
||||||
|
if let Some(handler) = manager.get(guild_id) {
|
||||||
|
let handler = handler.lock().await;
|
||||||
|
handler.queue().pause()?;
|
||||||
|
|
||||||
|
msg.channel_id
|
||||||
|
.send_message(&ctx.http, |m| {
|
||||||
|
embed_response(m, "Paused the player", "", Some(&member))
|
||||||
|
})
|
||||||
|
.await?;
|
||||||
|
} else {
|
||||||
|
msg.channel_id
|
||||||
|
.send_message(&ctx.http, |m| {
|
||||||
|
embed_response(m, "Error", "Not in a voice channel", Some(&member))
|
||||||
|
})
|
||||||
|
.await?;
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[command]
|
||||||
|
#[description("Resume the music")]
|
||||||
|
async fn resume(ctx: &Context, msg: &Message) -> CommandResult {
|
||||||
|
let guild_id = match ctx.cache.guild_channel(msg.channel_id).await {
|
||||||
|
Some(channel) => channel.guild_id,
|
||||||
|
None => {
|
||||||
|
msg.channel_id
|
||||||
|
.say(&ctx.http, "Error finding channel info")
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
let member = msg.member(&ctx.http).await?;
|
||||||
|
|
||||||
|
if if let Some(member) = &msg.member {
|
||||||
|
is_mute(ctx, member, guild_id).await.unwrap_or(false)
|
||||||
|
} else {
|
||||||
|
false
|
||||||
|
} {
|
||||||
|
msg.channel_id
|
||||||
|
.send_message(&ctx.http, |m| {
|
||||||
|
embed_response(
|
||||||
|
m,
|
||||||
|
"Error",
|
||||||
|
"You don't have the right to play music",
|
||||||
|
Some(&member),
|
||||||
|
)
|
||||||
|
})
|
||||||
|
.await?;
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
|
||||||
|
let manager = songbird::get(ctx)
|
||||||
|
.await
|
||||||
|
.expect("Songbird Voice client placed in at initialisation.")
|
||||||
|
.clone();
|
||||||
|
|
||||||
|
if let Some(handler) = manager.get(guild_id) {
|
||||||
|
let handler = handler.lock().await;
|
||||||
|
handler.queue().resume()?;
|
||||||
|
} else {
|
||||||
|
msg.channel_id
|
||||||
|
.send_message(&ctx.http, |m| {
|
||||||
|
embed_response(m, "Error", "Not in a voice channel", Some(&member))
|
||||||
|
})
|
||||||
|
.await?;
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
|
|
Loading…
Reference in New Issue