feat: connect command implementation
This commit is contained in:
parent
13d7f48c3d
commit
92b7bd64bf
6 changed files with 208 additions and 8 deletions
|
@ -1,7 +1,10 @@
|
||||||
pub use moover::*;
|
pub use moover::*;
|
||||||
pub use notice::*;
|
pub use notice::*;
|
||||||
pub use user_interactions::*;
|
pub use user_interactions::*;
|
||||||
|
pub use voice::*;
|
||||||
|
|
||||||
pub mod moover;
|
pub mod moover;
|
||||||
pub mod notice;
|
pub mod notice;
|
||||||
pub mod user_interactions;
|
pub mod user_interactions;
|
||||||
|
pub mod other;
|
||||||
|
pub mod voice;
|
||||||
|
|
1
src/commands/voice/mod.rs
Normal file
1
src/commands/voice/mod.rs
Normal file
|
@ -0,0 +1 @@
|
||||||
|
pub mod spotify;
|
1
src/commands/voice/spotify/mod.rs
Normal file
1
src/commands/voice/spotify/mod.rs
Normal file
|
@ -0,0 +1 @@
|
||||||
|
pub mod player;
|
159
src/commands/voice/spotify/player.rs
Normal file
159
src/commands/voice/spotify/player.rs
Normal file
|
@ -0,0 +1,159 @@
|
||||||
|
use poise;
|
||||||
|
use serenity::{all::ChannelId, async_trait};
|
||||||
|
use songbird::events::{Event, EventContext, EventHandler as VoiceEventHandler};
|
||||||
|
use songbird::TrackEvent;
|
||||||
|
|
||||||
|
use crate::util::debug::send_error;
|
||||||
|
use crate::{types::{Context, Error}, util::utilities::get_channel_by_name};
|
||||||
|
|
||||||
|
use serenity::all::User;
|
||||||
|
|
||||||
|
#[poise::command(
|
||||||
|
slash_command,
|
||||||
|
description_localized("en-US", "Play song")
|
||||||
|
)]
|
||||||
|
pub async fn play(ctx: Context<'_>,
|
||||||
|
#[description = "Song: "]
|
||||||
|
_url: String
|
||||||
|
) -> Result<(), Error> {
|
||||||
|
|
||||||
|
ctx.reply("Done!").await?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
#[poise::command(
|
||||||
|
slash_command,
|
||||||
|
description_localized("en-US", "Headpat all your friends!")
|
||||||
|
)]
|
||||||
|
pub async fn headpat(ctx: Context<'_>,
|
||||||
|
#[description = "Who is the lucky one?"]
|
||||||
|
user: User
|
||||||
|
) -> Result<(), Error> {
|
||||||
|
let _title = "HEADPATS!";
|
||||||
|
let _desc = format!("{} headpats {}", ctx.author(), user);
|
||||||
|
// send_with_embed(ctx, "headpat", &title, &desc).await?;
|
||||||
|
ctx.reply("Done!").await?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
#[poise::command(
|
||||||
|
slash_command,
|
||||||
|
description_localized("en-US", "Connect to channel")
|
||||||
|
)]
|
||||||
|
pub async fn connect(ctx: Context<'_>,
|
||||||
|
#[autocomplete = "autocomplete_channel"]
|
||||||
|
#[description = "Voice channel name: "]
|
||||||
|
name: Option<String>
|
||||||
|
) -> Result<(), Error> {
|
||||||
|
|
||||||
|
if ctx.guild().is_none() {
|
||||||
|
ctx.reply("Can't use this outside of guild").await?;
|
||||||
|
return Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
let channel: ChannelId;
|
||||||
|
if name.is_none() || name.clone().unwrap() == "" {
|
||||||
|
// Ugly one liner since I don't know how to do this another way yet
|
||||||
|
// TODO fix please
|
||||||
|
let Some(voice_channel) = ctx.guild().unwrap().voice_states.get(&ctx.author().id).and_then(|voice_state| voice_state.channel_id) else {
|
||||||
|
ctx.reply("You must be in a voice channel or specify explicit voice channel by name").await?;
|
||||||
|
return Ok(())
|
||||||
|
};
|
||||||
|
|
||||||
|
channel = voice_channel;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
channel = match get_channel_by_name(ctx.guild().unwrap(), name.unwrap()) {
|
||||||
|
Some(channel) => channel,
|
||||||
|
None => {
|
||||||
|
ctx.reply("Channel with this name does not exist").await?;
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
let manager = songbird::get(ctx.serenity_context())
|
||||||
|
.await
|
||||||
|
.expect("Songbird Voice client placed in at initialisation.")
|
||||||
|
.clone();
|
||||||
|
|
||||||
|
if let Ok(handler_lock) = manager.join(ctx.guild_id().unwrap(), channel).await {
|
||||||
|
let mut handler = handler_lock.lock().await;
|
||||||
|
handler.add_global_event(TrackEvent::Error.into(), TrackErrorNotifier);
|
||||||
|
}
|
||||||
|
|
||||||
|
ctx.reply("Done!").await?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
struct TrackErrorNotifier;
|
||||||
|
|
||||||
|
#[async_trait]
|
||||||
|
impl VoiceEventHandler for TrackErrorNotifier {
|
||||||
|
async fn act(&self, ctx: &EventContext<'_>) -> Option<Event> {
|
||||||
|
if let EventContext::Track(track_list) = ctx {
|
||||||
|
for (state, handle) in *track_list {
|
||||||
|
println!(
|
||||||
|
"Track {:?} encountered an error: {:?}",
|
||||||
|
handle.uuid(),
|
||||||
|
state.playing
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
None
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn autocomplete_channel(
|
||||||
|
ctx: Context<'_>,
|
||||||
|
_partial: &str,
|
||||||
|
) -> Vec<String> {
|
||||||
|
|
||||||
|
use crate::util::utilities::get_vc_names;
|
||||||
|
match ctx.guild() {
|
||||||
|
Some(guild) => get_vc_names(guild),
|
||||||
|
None => [].to_vec()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[poise::command(
|
||||||
|
slash_command,
|
||||||
|
description_localized("en-US", "Disconnect from voice channel")
|
||||||
|
)]
|
||||||
|
async fn disconnect(
|
||||||
|
ctx: Context<'_>
|
||||||
|
) -> Result<(), Error> {
|
||||||
|
|
||||||
|
let Some(guild_id) = ctx.guild_id() else {
|
||||||
|
ctx.reply("Can't use this outside of guild").await?;
|
||||||
|
return Ok(());
|
||||||
|
};
|
||||||
|
|
||||||
|
let manager = songbird::get(ctx.serenity_context())
|
||||||
|
.await
|
||||||
|
.expect("Songbird Voice client placed in at initialisation.")
|
||||||
|
.clone();
|
||||||
|
|
||||||
|
let has_handler = manager.get(guild_id).is_some();
|
||||||
|
|
||||||
|
if ! has_handler {
|
||||||
|
ctx.reply("I am not connected to a channel!").await?;
|
||||||
|
return Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
match manager.remove(guild_id).await {
|
||||||
|
Ok(()) => {
|
||||||
|
ctx.reply("Disconnected").await?;
|
||||||
|
return Ok(())
|
||||||
|
}
|
||||||
|
Err(e) => {
|
||||||
|
let _ = send_error(ctx.serenity_context().http.clone(), e.to_string()).await;
|
||||||
|
return Ok(())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
23
src/main.rs
23
src/main.rs
|
@ -5,9 +5,6 @@ use std::time::Duration;
|
||||||
use std::error;
|
use std::error;
|
||||||
use std::env;
|
use std::env;
|
||||||
|
|
||||||
use poise::samples::register_globally;
|
|
||||||
|
|
||||||
use poise::samples::register_in_guild;
|
|
||||||
use serenity::async_trait;
|
use serenity::async_trait;
|
||||||
use serenity::prelude::GatewayIntents;
|
use serenity::prelude::GatewayIntents;
|
||||||
use serenity::client::Context;
|
use serenity::client::Context;
|
||||||
|
@ -17,6 +14,7 @@ use serenity::Client;
|
||||||
|
|
||||||
use dotenv::dotenv;
|
use dotenv::dotenv;
|
||||||
|
|
||||||
|
use songbird::SerenityInit;
|
||||||
use tokio_cron_scheduler::{JobScheduler, Job};
|
use tokio_cron_scheduler::{JobScheduler, Job};
|
||||||
|
|
||||||
mod message_handler;
|
mod message_handler;
|
||||||
|
@ -85,7 +83,9 @@ async fn main() -> anyhow::Result<()> {
|
||||||
let options: poise::FrameworkOptions<(), Box<dyn error::Error + Send + Sync>> = poise::FrameworkOptions {
|
let options: poise::FrameworkOptions<(), Box<dyn error::Error + Send + Sync>> = poise::FrameworkOptions {
|
||||||
commands: vec![
|
commands: vec![
|
||||||
commands::say(),
|
commands::say(),
|
||||||
commands::hug()
|
commands::hug(),
|
||||||
|
// commands::spotify::player::play(),
|
||||||
|
commands::spotify::player::connect(),
|
||||||
],
|
],
|
||||||
prefix_options: poise::PrefixFrameworkOptions {
|
prefix_options: poise::PrefixFrameworkOptions {
|
||||||
prefix: Some("/".into()),
|
prefix: Some("/".into()),
|
||||||
|
@ -107,14 +107,20 @@ async fn main() -> anyhow::Result<()> {
|
||||||
let framework = poise::Framework::builder()
|
let framework = poise::Framework::builder()
|
||||||
.setup(move |ctx, _ready, framework| {
|
.setup(move |ctx, _ready, framework| {
|
||||||
Box::pin(async move {
|
Box::pin(async move {
|
||||||
|
|
||||||
|
|
||||||
#[cfg(feature="GUILD_COMMAND")] {
|
#[cfg(feature="GUILD_COMMAND")] {
|
||||||
|
use poise::samples::register_in_guild;
|
||||||
|
use serenity::all::GuildId;
|
||||||
|
|
||||||
let debug_guild_id = env::var("DEBUG_GUILD_ID")
|
let debug_guild_id = env::var("DEBUG_GUILD_ID")
|
||||||
.context("DEBUG_GUILD_ID not found in env")?
|
.context("DEBUG_GUILD_ID not found in env")?
|
||||||
.parse::<u64>().unwrap();
|
.parse::<u64>().unwrap();
|
||||||
|
|
||||||
register_in_guild(ctx, &framework.options().commands, debug_guild_id).await?;
|
register_in_guild(ctx, &framework.options().commands, GuildId::new(debug_guild_id)).await?;
|
||||||
}
|
}
|
||||||
#[cfg(not(feature="GUILD_COMMAND"))] {
|
#[cfg(not(feature="GUILD_COMMAND"))] {
|
||||||
|
use poise::samples::register_globally;
|
||||||
register_globally(ctx, &framework.options().commands).await?;
|
register_globally(ctx, &framework.options().commands).await?;
|
||||||
}
|
}
|
||||||
Ok(())
|
Ok(())
|
||||||
|
@ -130,11 +136,16 @@ async fn main() -> anyhow::Result<()> {
|
||||||
|
|
||||||
let token = env::var(token_str).context("TOKEN not found in env")?;
|
let token = env::var(token_str).context("TOKEN not found in env")?;
|
||||||
|
|
||||||
let intents = GatewayIntents::GUILD_MESSAGES | GatewayIntents::MESSAGE_CONTENT;
|
let intents = GatewayIntents::GUILD_MESSAGES
|
||||||
|
| GatewayIntents::MESSAGE_CONTENT
|
||||||
|
| GatewayIntents::GUILD_VOICE_STATES
|
||||||
|
| GatewayIntents::GUILD_MESSAGE_REACTIONS
|
||||||
|
| GatewayIntents::GUILD_MESSAGE_TYPING;
|
||||||
|
|
||||||
let mut client = Client::builder(&token, intents)
|
let mut client = Client::builder(&token, intents)
|
||||||
.event_handler(Handler)
|
.event_handler(Handler)
|
||||||
.framework(framework)
|
.framework(framework)
|
||||||
|
.register_songbird()
|
||||||
.await
|
.await
|
||||||
.context("Failed to build client")?;
|
.context("Failed to build client")?;
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,8 @@
|
||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
|
|
||||||
use serenity::{all::{ChannelId, CreateMessage, GuildId, Message}, http::Http};
|
use serenity::{all::{ChannelId, ChannelType, CreateMessage, GuildChannel, GuildId, GuildRef, Message}, http::Http};
|
||||||
|
|
||||||
|
use crate::types;
|
||||||
use anyhow::Context;
|
use anyhow::Context;
|
||||||
|
|
||||||
pub async fn get_system_channel(guild_id: GuildId, http: &Http) -> anyhow::Result<ChannelId> {
|
pub async fn get_system_channel(guild_id: GuildId, http: &Http) -> anyhow::Result<ChannelId> {
|
||||||
|
@ -14,3 +15,27 @@ pub async fn replace_msg(http: Arc<Http>, msg: Message, content: String) -> Resu
|
||||||
|
|
||||||
return ChannelId::new(msg.channel_id.get()).send_message(http.clone(), CreateMessage::new().content(content)).await;
|
return ChannelId::new(msg.channel_id.get()).send_message(http.clone(), CreateMessage::new().content(content)).await;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn get_vc_names(guild: GuildRef) -> Vec<String> {
|
||||||
|
|
||||||
|
let mut result: Vec<String> = [].to_vec();
|
||||||
|
for (_, channel) in &guild.channels {
|
||||||
|
if channel.kind == ChannelType::Voice {
|
||||||
|
result.push(channel.name.clone());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
result
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn get_channel_by_name(guild: GuildRef, name: String) -> Option<ChannelId> {
|
||||||
|
let mut result = None;
|
||||||
|
for (_, channel) in &guild.channels {
|
||||||
|
if channel.name == name {
|
||||||
|
result = Some(channel.id);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
result
|
||||||
|
}
|
Loading…
Reference in a new issue