Wip commit

This commit is contained in:
jude 2023-12-18 19:06:18 +00:00
parent cd5651c7f6
commit e369b42131
14 changed files with 1432 additions and 948 deletions

1787
Cargo.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -7,17 +7,17 @@ authors = ["jellywx <judesouthworth@pm.me>"]
edition = "2018"
[dependencies]
songbird = { version = "0.3", features = ["builtin-queue"] }
poise = "0.5.5"
songbird = { version = "0.4", features = ["builtin-queue"] }
poise = "0.6.1-rc1"
sqlx = { version = "0.5", default-features = false, features = ["runtime-tokio-rustls", "macros", "mysql", "bigdecimal", "migrate"] }
tokio = { version = "1", features = ["fs", "process", "io-util"] }
lazy_static = "1.4"
reqwest = "0.11"
env_logger = "0.10"
regex = "1.4"
regex = "1.10"
log = "0.4"
serde_json = "1.0"
dashmap = "5.3"
dashmap = "5.5"
serde = "1.0"
dotenv = "0.15.0"
prometheus = { version = "0.13.3", optional = true }
@ -26,9 +26,6 @@ axum = { version = "0.6.20", optional = true }
[features]
metrics = ["dep:prometheus", "dep:axum"]
[patch."https://github.com/serenity-rs/serenity"]
serenity = { version = "0.11.6" }
[package.metadata.deb]
features = ["metrics"]
depends = "$auto, ffmpeg"

View File

@ -1,19 +1,23 @@
use poise::{
serenity_prelude::{CreateEmbed, CreateEmbedFooter},
CreateReply,
};
use crate::{consts::THEME_COLOR, Context, Error};
/// View bot commands
#[poise::command(slash_command)]
pub async fn help(ctx: Context<'_>) -> Result<(), Error> {
ctx.send(|m| {
m.ephemeral(true).embed(|e| {
e.title("Help")
ctx.send(
CreateReply::default().ephemeral(true).embed(
CreateEmbed::new()
.title("Help")
.color(THEME_COLOR)
.footer(|f| {
f.text(concat!(
.footer(CreateEmbedFooter::new(concat!(
env!("CARGO_PKG_NAME"),
" ver ",
env!("CARGO_PKG_VERSION")
))
})
)))
.description(
"__Info Commands__
`/help` `/info`
@ -49,9 +53,9 @@ __Setting Commands__
__Advanced Commands__
`/soundboard` - Create a soundboard",
),
),
)
})
})
.await?;
Ok(())
@ -62,12 +66,16 @@ __Advanced Commands__
pub async fn info(ctx: Context<'_>) -> Result<(), Error> {
let current_user = ctx.serenity_context().cache.current_user();
ctx.send(|m| m.ephemeral(true)
.embed(|e| e
ctx.send(
CreateReply::default().ephemeral(true).embed(
CreateEmbed::new()
.title("Info")
.color(THEME_COLOR)
.footer(|f| f
.text(concat!(env!("CARGO_PKG_NAME"), " ver ", env!("CARGO_PKG_VERSION"))))
.footer(CreateEmbedFooter::new(concat!(
env!("CARGO_PKG_NAME"),
" ver ",
env!("CARGO_PKG_VERSION")
)))
.description(format!("Invite me: https://discord.com/api/oauth2/authorize?client_id={}&permissions=3165184&scope=applications.commands%20bot
**Welcome to SoundFX!**
@ -76,7 +84,9 @@ Find me on https://discord.jellywx.com/ and on https://github.com/JellyWX :)
**An online dashboard is available!** Visit https://soundfx.jellywx.com/dashboard
There is a maximum sound limit per user. This can be removed by subscribing at **https://patreon.com/jellywx**",
current_user.id.as_u64())))).await?;
current_user.id.get())))
)
.await?;
Ok(())
}

View File

@ -1,4 +1,7 @@
use poise::serenity_prelude::{Attachment, GuildId, RoleId};
use poise::{
serenity_prelude::{Attachment, CreateAttachment, GuildId, RoleId},
CreateReply,
};
use tokio::fs::File;
#[cfg(feature = "metrics")]
@ -63,11 +66,12 @@ pub async fn upload_new_sound(
// need to check if user is Patreon or not
if count >= *MAX_SOUNDS {
let patreon_guild_member =
GuildId(*PATREON_GUILD).member(ctx, ctx.author().id).await;
let patreon_guild_member = GuildId::from(*PATREON_GUILD)
.member(ctx, ctx.author().id)
.await;
if let Ok(member) = patreon_guild_member {
permit_upload = member.roles.contains(&RoleId(*PATREON_ROLE));
permit_upload = member.roles.contains(&RoleId::from(*PATREON_ROLE));
} else {
permit_upload = false;
}
@ -120,8 +124,8 @@ pub async fn delete_sound(
let pool = ctx.data().database.clone();
let uid = ctx.author().id.0;
let gid = ctx.guild_id().unwrap().0;
let uid = ctx.author().id.get();
let gid = ctx.guild_id().unwrap().get();
let sound_vec = ctx.data().search_for_sound(&name, gid, uid, true).await?;
let sound_result = sound_vec.first();
@ -173,8 +177,8 @@ pub async fn change_public(
) -> Result<(), Error> {
let pool = ctx.data().database.clone();
let uid = ctx.author().id.0;
let gid = ctx.guild_id().unwrap().0;
let uid = ctx.author().id.get();
let gid = ctx.guild_id().unwrap().get();
let mut sound_vec = ctx.data().search_for_sound(&name, gid, uid, true).await?;
let sound_result = sound_vec.first_mut();
@ -228,7 +232,10 @@ pub async fn download_file(
let file = File::open(&source).await?;
let name = format!("{}-{}.opus", sound.id, sound.name);
ctx.send(|m| m.attachment((&file, name.as_str()).into()))
ctx.send(
CreateReply::default()
.attachment(CreateAttachment::file(&file, name.as_str()).await?),
)
.await?;
}

View File

@ -1,3 +1,5 @@
use poise::serenity_prelude::AutocompleteChoice;
use crate::{models::sound::SoundCtx, Context};
pub mod favorite;
@ -8,34 +10,22 @@ pub mod search;
pub mod settings;
pub mod stop;
pub async fn autocomplete_sound(
ctx: Context<'_>,
partial: &str,
) -> Vec<poise::AutocompleteChoice<String>> {
pub async fn autocomplete_sound(ctx: Context<'_>, partial: &str) -> Vec<AutocompleteChoice> {
ctx.data()
.autocomplete_user_sounds(&partial, ctx.author().id, ctx.guild_id().unwrap())
.await
.unwrap_or(vec![])
.iter()
.map(|s| poise::AutocompleteChoice {
name: s.name.clone(),
value: s.id.to_string(),
})
.map(|s| AutocompleteChoice::new(s.name.clone(), s.id.to_string()))
.collect()
}
pub async fn autocomplete_favorite(
ctx: Context<'_>,
partial: &str,
) -> Vec<poise::AutocompleteChoice<String>> {
pub async fn autocomplete_favorite(ctx: Context<'_>, partial: &str) -> Vec<AutocompleteChoice> {
ctx.data()
.autocomplete_favorite_sounds(&partial, ctx.author().id)
.await
.unwrap_or(vec![])
.iter()
.map(|s| poise::AutocompleteChoice {
name: s.name.clone(),
value: s.id.to_string(),
})
.map(|s| AutocompleteChoice::new(s.name.clone(), s.id.to_string()))
.collect()
}

View File

@ -1,8 +1,10 @@
use std::time::{SystemTime, UNIX_EPOCH};
use poise::serenity_prelude::{
builder::CreateActionRow, model::application::component::ButtonStyle, GuildChannel,
ReactionType,
use poise::{
serenity_prelude::{
builder::CreateActionRow, ButtonStyle, CreateButton, GuildChannel, ReactionType,
},
CreateReply,
};
#[cfg(feature = "metrics")]
@ -74,8 +76,7 @@ pub async fn play_random(
match channel_to_join {
Some(channel) => {
let (call_handler, _) =
join_channel(ctx.serenity_context(), guild.clone(), channel).await;
let call = join_channel(ctx.serenity_context(), &guild.clone(), channel).await?;
let sounds = ctx.data().guild_sounds(guild.id, None).await?;
if sounds.len() == 0 {
@ -92,7 +93,7 @@ pub async fn play_random(
match sounds.get(ts.subsec_micros() as usize % sounds.len()) {
Some(sound) => {
let guild_data = ctx.data().guild_data(guild.id).await.unwrap();
let mut lock = call_handler.lock().await;
let mut lock = call.lock().await;
play_audio(
sound,
@ -218,8 +219,7 @@ pub async fn queue_play(
match channel_to_join {
Some(user_channel) => {
let (call_handler, _) =
join_channel(ctx.serenity_context(), guild.clone(), user_channel).await;
let call = join_channel(ctx.serenity_context(), guild, user_channel).await?;
let guild_data = ctx
.data()
@ -227,8 +227,6 @@ pub async fn queue_play(
.await
.unwrap();
let mut lock = call_handler.lock().await;
let query_terms = [
Some(sound_1),
Some(sound_2),
@ -270,6 +268,9 @@ pub async fn queue_play(
}
}
{
let mut lock = call.lock().await;
queue_audio(
&sounds,
guild_data.read().await.volume,
@ -278,6 +279,7 @@ pub async fn queue_play(
)
.await
.unwrap();
}
ctx.say(format!("Queued {} sounds!", sounds.len())).await?;
}
@ -434,50 +436,49 @@ pub async fn soundboard(
}
}
ctx.send(|m| {
m.content("**Play a sound:**").components(|c| {
let components = {
let mut c = vec![];
for row in sounds.as_slice().chunks(5) {
let mut action_row: CreateActionRow = Default::default();
let mut action_row = vec![];
for sound in row {
action_row.create_button(|b| {
b.style(ButtonStyle::Primary)
.label(&sound.name)
.custom_id(sound.id)
});
action_row.push(
CreateButton::new(sound.id.to_string())
.style(ButtonStyle::Primary)
.label(&sound.name),
);
}
c.add_action_row(action_row);
c.push(CreateActionRow::Buttons(action_row));
}
c.create_action_row(|r| {
r.create_button(|b| {
b.label("Stop")
c.push(CreateActionRow::Buttons(vec![
CreateButton::new("#stop")
.label("Stop")
.emoji(ReactionType::Unicode("".to_string()))
.style(ButtonStyle::Danger)
.custom_id("#stop")
})
.create_button(|b| {
b.label("Mode:")
.style(ButtonStyle::Danger),
CreateButton::new("#mode")
.label("Mode:")
.style(ButtonStyle::Secondary)
.disabled(true)
.custom_id("#mode")
})
.create_button(|b| {
b.label("Instant")
.disabled(true),
CreateButton::new("#instant")
.label("Instant")
.emoji(ReactionType::Unicode("".to_string()))
.style(ButtonStyle::Secondary)
.disabled(true)
.custom_id("#instant")
})
.create_button(|b| {
b.label("Loop")
.disabled(true),
CreateButton::new("#loop")
.label("Loop")
.emoji(ReactionType::Unicode("🔁".to_string()))
.style(ButtonStyle::Secondary)
.custom_id("#loop")
})
})
})
})
.style(ButtonStyle::Secondary),
]));
c
};
ctx.send(
CreateReply::default()
.content("**Play a sound:**")
.components(components),
)
.await?;
Ok(())

View File

@ -1,10 +1,8 @@
use poise::{
serenity_prelude,
serenity_prelude::{
application::component::ButtonStyle,
constants::MESSAGE_CODE_LIMIT,
interaction::{message_component::MessageComponentInteraction, InteractionResponseType},
CreateActionRow, CreateEmbed, GuildId, UserId,
constants::MESSAGE_CODE_LIMIT, ButtonStyle, ComponentInteraction, CreateActionRow,
CreateButton, CreateEmbed, EditInteractionResponse, GuildId, UserId,
},
CreateReply,
};
@ -16,7 +14,7 @@ use crate::{
Context, Data, Error,
};
fn format_search_results<'a>(search_results: Vec<Sound>) -> CreateReply<'a> {
fn format_search_results(search_results: Vec<Sound>) -> CreateReply {
let mut builder = CreateReply::default();
let mut current_character_count = 0;
@ -32,7 +30,7 @@ fn format_search_results<'a>(search_results: Vec<Sound>) -> CreateReply<'a> {
current_character_count <= MESSAGE_CODE_LIMIT - title.len()
});
builder.embed(|e| e.title(title).fields(field_iter));
builder.embed(CreateEmbed::default().title(title).fields(field_iter));
builder
}
@ -124,10 +122,8 @@ impl SoundPager {
}
fn create_action_row(&self, max_page: u64) -> CreateActionRow {
let mut row = CreateActionRow::default();
row.create_button(|b| {
b.custom_id(
let mut row = CreateActionRow::Buttons(vec![
CreateButton::new(
serde_json::to_string(&SoundPager {
nonce: 0,
page: 0,
@ -137,10 +133,8 @@ impl SoundPager {
)
.style(ButtonStyle::Primary)
.label("")
.disabled(self.page == 0)
})
.create_button(|b| {
b.custom_id(
.disabled(self.page == 0),
CreateButton::new(
serde_json::to_string(&SoundPager {
nonce: 1,
page: self.page.saturating_sub(1),
@ -150,16 +144,12 @@ impl SoundPager {
)
.style(ButtonStyle::Secondary)
.label("◀️")
.disabled(self.page == 0)
})
.create_button(|b| {
b.custom_id("pid")
.disabled(self.page == 0),
CreateButton::new("pid")
.style(ButtonStyle::Success)
.label(format!("Page {}", self.page + 1))
.disabled(true)
})
.create_button(|b| {
b.custom_id(
.disabled(true),
CreateButton::new(
serde_json::to_string(&SoundPager {
nonce: 2,
page: self.page.saturating_add(1),
@ -169,10 +159,8 @@ impl SoundPager {
)
.style(ButtonStyle::Secondary)
.label("▶️")
.disabled(self.page == max_page)
})
.create_button(|b| {
b.custom_id(
.disabled(self.page == max_page),
CreateButton::new(
serde_json::to_string(&SoundPager {
nonce: 3,
page: max_page,
@ -182,16 +170,14 @@ impl SoundPager {
)
.style(ButtonStyle::Primary)
.label("")
.disabled(self.page == max_page)
});
.disabled(self.page == max_page),
]);
row
}
fn embed(&self, sounds: &[Sound], count: u64) -> CreateEmbed {
let mut embed = CreateEmbed::default();
embed
CreateEmbed::default()
.color(THEME_COLOR)
.title(self.context.title())
.description(format!("**{}** sounds:", count))
@ -205,15 +191,13 @@ impl SoundPager {
),
true,
)
}));
embed
}))
}
pub async fn handle_interaction(
ctx: &serenity_prelude::Context,
data: &Data,
interaction: &MessageComponentInteraction,
interaction: &ComponentInteraction,
) -> Result<(), Error> {
let user_id = interaction.user.id;
let guild_id = interaction.guild_id.unwrap();
@ -227,14 +211,12 @@ impl SoundPager {
};
interaction
.create_interaction_response(&ctx, |r| {
r.kind(InteractionResponseType::UpdateMessage)
.interaction_response_data(|d| {
d.ephemeral(true)
.edit_response(
&ctx,
EditInteractionResponse::default()
.add_embed(pager.embed(&sounds, count))
.components(|c| c.add_action_row(pager.create_action_row(count / 25)))
})
})
.components(vec![pager.create_action_row(count / 25)]),
)
.await?;
Ok(())
@ -254,14 +236,12 @@ impl SoundPager {
}
};
ctx.send(|r| {
r.ephemeral(true)
.embed(|e| {
*e = self.embed(&sounds, count);
e
})
.components(|c| c.add_action_row(self.create_action_row(count / 25)))
})
ctx.send(
CreateReply::default()
.ephemeral(true)
.embed(self.embed(&sounds, count))
.components(vec![self.create_action_row(count / 25)]),
)
.await?;
Ok(())
@ -284,11 +264,7 @@ pub async fn search_sounds(
.search_for_sound(&query, ctx.guild_id().unwrap(), ctx.author().id, false)
.await?;
ctx.send(|m| {
*m = format_search_results(search_results);
m
})
.await?;
ctx.send(format_search_results(search_results)).await?;
Ok(())
}

View File

@ -1,4 +1,7 @@
use poise::serenity_prelude::{GuildId, User};
use poise::{
serenity_prelude::{GuildId, User},
CreateReply,
};
use crate::{
cmds::autocomplete_sound,
@ -60,14 +63,14 @@ pub async fn set_guild_greet_sound(
#[description = "User to set join sound for"] user: User,
) -> Result<(), Error> {
if user.id != ctx.author().id {
let guild = ctx.guild().unwrap();
let permissions = guild.member_permissions(&ctx, ctx.author().id).await;
let permissions = ctx.author_member().await.unwrap().permissions(&ctx.cache());
if permissions.map_or(true, |p| !p.manage_guild()) {
ctx.send(|b| {
b.ephemeral(true)
.content("Only admins can change other user's greet sounds.")
})
ctx.send(
CreateReply::default()
.ephemeral(true)
.content("Only admins can change other user's greet sounds."),
)
.await?;
return Ok(());
@ -107,14 +110,14 @@ pub async fn unset_guild_greet_sound(
#[description = "User to set join sound for"] user: User,
) -> Result<(), Error> {
if user.id != ctx.author().id {
let guild = ctx.guild().unwrap();
let permissions = guild.member_permissions(&ctx, ctx.author().id).await;
let permissions = ctx.author_member().await.unwrap().permissions(&ctx.cache());
if permissions.map_or(true, |p| !p.manage_guild()) {
ctx.send(|b| {
b.ephemeral(true)
.content("Only admins can change other user's greet sounds.")
})
ctx.send(
CreateReply::default()
.ephemeral(true)
.content("Only admins can change other user's greet sounds."),
)
.await?;
return Ok(());
@ -155,20 +158,19 @@ pub async fn set_user_greet_sound(
.update_join_sound(ctx.author().id, None::<GuildId>, Some(sound.id))
.await?;
ctx.send(|b| {
b.ephemeral(true).content(format!(
ctx.send(CreateReply::default().ephemeral(true).content(format!(
"Greet sound has been set to {} (ID {})",
sound.name, sound.id
))
})
)))
.await?;
}
None => {
ctx.send(|b| {
b.ephemeral(true)
.content("Could not find a sound by that name.")
})
ctx.send(
CreateReply::default()
.ephemeral(true)
.content("Could not find a sound by that name."),
)
.await?;
}
}
@ -183,7 +185,11 @@ pub async fn unset_user_greet_sound(ctx: Context<'_>) -> Result<(), Error> {
.update_join_sound(ctx.author().id, None::<GuildId>, None)
.await?;
ctx.send(|b| b.ephemeral(true).content("Greet sound has been unset"))
ctx.send(
CreateReply::default()
.ephemeral(true)
.content("Greet sound has been unset"),
)
.await?;
Ok(())

View File

@ -1,9 +1,6 @@
use poise::serenity_prelude::{
model::{
application::interaction::{Interaction, InteractionResponseType},
channel::Channel,
},
ActionRowComponent, Activity, Context, CreateActionRow, CreateComponents,
model::channel::Channel, ActionRowComponent, Activity, Context, CreateActionRow, FullEvent,
Interaction,
};
#[cfg(feature = "metrics")]
@ -19,16 +16,18 @@ use crate::{
Data, Error,
};
pub async fn listener(ctx: &Context, event: &poise::Event<'_>, data: &Data) -> Result<(), Error> {
pub async fn listener(ctx: &Context, event: &FullEvent, data: &Data) -> Result<(), Error> {
match event {
poise::Event::Ready { .. } => {
FullEvent::Ready { .. } => {
ctx.set_activity(Activity::watching("for /play")).await;
}
poise::Event::VoiceStateUpdate { old, new, .. } => {
FullEvent::VoiceStateUpdate { old, new, .. } => {
if let Some(past_state) = old {
if let (Some(guild_id), None) = (past_state.guild_id, new.channel_id) {
if let Some(channel_id) = past_state.channel_id {
if let Some(Channel::Guild(channel)) = channel_id.to_channel_cached(&ctx) {
if let Some(Channel::Guild(channel)) =
channel_id.to_channel_cached(&ctx.cache)
{
if channel.members(&ctx).await.map(|m| m.len()).unwrap_or(0) <= 1 {
let songbird = songbird::get(ctx).await.unwrap();
@ -93,7 +92,7 @@ pub async fn listener(ctx: &Context, event: &poise::Event<'_>, data: &Data) -> R
}
}
}
poise::Event::InteractionCreate { interaction } => match interaction {
FullEvent::InteractionCreate { interaction } => match interaction {
Interaction::MessageComponent(component) => {
if let Some(guild_id) = component.guild_id {
if let Ok(()) = SoundPager::handle_interaction(ctx, &data, component).await {
@ -123,7 +122,7 @@ pub async fn listener(ctx: &Context, event: &poise::Event<'_>, data: &Data) -> R
.create_interaction_response(ctx, |r| {
r.kind(InteractionResponseType::UpdateMessage)
.interaction_response_data(|d| {
let mut c: CreateComponents = Default::default();
let mut c = vec![];
for action_row in &component.message.components {
let mut a: CreateActionRow = Default::default();
@ -176,7 +175,7 @@ pub async fn listener(ctx: &Context, event: &poise::Event<'_>, data: &Data) -> R
}
}
c.add_action_row(a);
c.push(a);
}
d.set_components(c)

View File

@ -14,13 +14,13 @@ use std::{env, path::Path, sync::Arc};
use dashmap::DashMap;
use poise::serenity_prelude::{
builder::CreateApplicationCommands,
model::{
gateway::GatewayIntents,
id::{GuildId, UserId},
},
ClientBuilder,
};
use songbird::SerenityInit;
use serde_json::Value;
use sqlx::{MySql, Pool};
use tokio::sync::RwLock;
@ -40,29 +40,20 @@ type Context<'a> = poise::Context<'a, Data, Error>;
pub async fn register_application_commands(
ctx: &poise::serenity_prelude::Context,
framework: &poise::Framework<Data, Error>,
guild_id: Option<GuildId>,
) -> Result<(), poise::serenity_prelude::Error> {
let mut commands_builder = CreateApplicationCommands::default();
let mut commands_builder = vec![];
let commands = &framework.options().commands;
for command in commands {
if let Some(slash_command) = command.create_as_slash_command() {
commands_builder.add_application_command(slash_command);
commands_builder.push(slash_command.into());
}
if let Some(context_menu_command) = command.create_as_context_menu_command() {
commands_builder.add_application_command(context_menu_command);
commands_builder.push(context_menu_command.into());
}
}
let commands_builder = poise::serenity_prelude::json::Value::Array(commands_builder.0);
let commands_builder = Value::Array(commands_builder);
if let Some(guild_id) = guild_id {
ctx.http
.create_guild_application_commands(guild_id.0, &commands_builder)
.await?;
} else {
ctx.http
.create_global_application_commands(&commands_builder)
.await?;
}
ctx.http.create_global_commands(&commands_builder).await?;
Ok(())
}
@ -149,13 +140,10 @@ async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
tokio::spawn(async { metrics::serve().await });
}
poise::Framework::builder()
.token(discord_token)
let framework = poise::Framework::builder()
.setup(move |ctx, _bot, framework| {
Box::pin(async move {
register_application_commands(ctx, framework, None)
.await
.unwrap();
register_application_commands(ctx, framework).await.unwrap();
Ok(Data {
database,
@ -165,10 +153,16 @@ async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
})
})
.options(options)
.client_settings(move |client_builder| client_builder.register_songbird())
.intents(GatewayIntents::GUILD_VOICE_STATES | GatewayIntents::GUILDS)
.run_autosharded()
.build();
let mut client = ClientBuilder::new(
&discord_token,
GatewayIntents::GUILD_VOICE_STATES | GatewayIntents::GUILDS,
)
.framework(framework)
.await?;
client.start_autosharded().await.unwrap();
Ok(())
}

View File

@ -78,12 +78,10 @@ impl GuildData {
let guild_data = sqlx::query_as_unchecked!(
GuildData,
"
SELECT id, prefix, volume, allow_greets, allowed_role
"SELECT id, prefix, volume, allow_greets, allowed_role
FROM servers
WHERE id = ?
",
guild_id.as_u64()
WHERE id = ?",
guild_id.get()
)
.fetch_one(db_pool)
.await;
@ -104,17 +102,15 @@ SELECT id, prefix, volume, allow_greets, allowed_role
let guild_id = guild_id.into();
sqlx::query!(
"
INSERT INTO servers (id)
VALUES (?)
",
guild_id.as_u64()
"INSERT INTO servers (id)
VALUES (?)",
guild_id.get()
)
.execute(db_pool)
.await?;
Ok(GuildData {
id: guild_id.as_u64().to_owned(),
id: guild_id.get(),
prefix: String::from("?"),
volume: 100,
allow_greets: AllowGreet::Enabled,

View File

@ -51,10 +51,9 @@ SELECT join_sound_id
FROM join_sounds
WHERE user = ?
AND guild = ?
ORDER BY guild IS NULL
",
user_id.as_u64(),
guild_id.map(|g| g.0)
ORDER BY guild IS NULL",
user_id.get(),
guild_id.map(|g| g.get())
)
.fetch_one(&self.database)
.await
@ -66,10 +65,9 @@ SELECT join_sound_id
FROM join_sounds
WHERE user = ?
AND (guild IS NULL OR guild = ?)
ORDER BY guild IS NULL
",
user_id.as_u64(),
guild_id.map(|g| g.0)
ORDER BY guild IS NULL",
user_id.get(),
guild_id.map(|g| g.get())
)
.fetch_one(&self.database)
.await
@ -111,17 +109,17 @@ SELECT join_sound_id
Some(join_id) => {
sqlx::query!(
"DELETE FROM join_sounds WHERE user = ? AND guild <=> ?",
user_id.0,
guild_id.map(|g| g.0)
user_id.get(),
guild_id.map(|g| g.get())
)
.execute(&mut transaction)
.await?;
sqlx::query!(
"INSERT INTO join_sounds (user, join_sound_id, guild) VALUES (?, ?, ?)",
user_id.0,
user_id.get(),
join_id,
guild_id.map(|g| g.0)
guild_id.map(|g| g.get())
)
.execute(&mut transaction)
.await?;
@ -130,8 +128,8 @@ SELECT join_sound_id
None => {
sqlx::query!(
"DELETE FROM join_sounds WHERE user = ? AND guild <=> ?",
user_id.0,
guild_id.map(|g| g.0)
user_id.get(),
guild_id.map(|g| g.get())
)
.execute(&mut transaction)
.await?;

View File

@ -1,7 +1,7 @@
use std::{env, path::Path};
use poise::serenity_prelude::async_trait;
use songbird::input::restartable::Restartable;
use songbird::input::Input;
use sqlx::Executor;
use tokio::{fs::File, io::AsyncWriteExt, process::Command};
@ -441,12 +441,10 @@ impl Sound {
pub async fn playable(
&self,
db_pool: impl Executor<'_, Database = Database>,
) -> Result<Restartable, Box<dyn std::error::Error + Send + Sync>> {
) -> Result<Input, Box<dyn std::error::Error + Send + Sync>> {
let path_name = self.store_sound_source(db_pool).await?;
Ok(Restartable::ffmpeg(path_name, false)
.await
.expect("FFMPEG ERROR!"))
Ok(Input::from(path_name))
}
pub async fn count_user_sounds<U: Into<u64>>(

View File

@ -1,11 +1,13 @@
use std::sync::Arc;
use std::{ops::Deref, sync::Arc};
use poise::serenity_prelude::model::{
channel::Channel,
use poise::serenity_prelude::{
model::{
guild::Guild,
id::{ChannelId, UserId},
},
EditVoiceState,
};
use songbird::{create_player, error::JoinResult, tracks::TrackHandle, Call};
use songbird::{tracks::TrackHandle, Call};
use sqlx::Executor;
use tokio::sync::{Mutex, MutexGuard};
@ -24,19 +26,18 @@ pub async fn play_audio(
db_pool: impl Executor<'_, Database = Database>,
r#loop: bool,
) -> Result<TrackHandle, Box<dyn std::error::Error + Send + Sync>> {
let (track, track_handler) = create_player(sound.playable(db_pool).await?.into());
let track = sound.playable(db_pool).await?;
let handle = call_handler.play_input(track);
let _ = track_handler.set_volume(volume as f32 / 100.0);
handle.set_volume(volume as f32 / 100.0)?;
if r#loop {
let _ = track_handler.enable_loop();
handle.enable_loop()?;
} else {
let _ = track_handler.disable_loop();
handle.disable_loop()?;
}
call_handler.play(track);
Ok(track_handler)
Ok(handle)
}
pub async fn queue_audio(
@ -46,11 +47,10 @@ pub async fn queue_audio(
db_pool: impl Executor<'_, Database = Database> + Copy,
) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
for sound in sounds {
let (a, b) = create_player(sound.playable(db_pool).await?.into());
let track = sound.playable(db_pool).await?;
let handle = call_handler.enqueue_input(track).await;
let _ = b.set_volume(volume as f32 / 100.0);
call_handler.enqueue(a);
handle.set_volume(volume as f32 / 100.0)?;
}
Ok(())
@ -58,60 +58,62 @@ pub async fn queue_audio(
pub async fn join_channel(
ctx: &poise::serenity_prelude::Context,
guild: Guild,
guild: impl Deref<Target = Guild>,
channel_id: ChannelId,
) -> (Arc<Mutex<Call>>, JoinResult<()>) {
) -> Result<Arc<Mutex<Call>>, Box<dyn std::error::Error + Send + Sync>> {
let songbird = songbird::get(ctx).await.unwrap();
let current_user = ctx.cache.current_user_id();
let current_user = ctx.cache.current_user().id;
let current_voice_state = guild
.deref()
.voice_states
.get(&current_user)
.and_then(|voice_state| voice_state.channel_id);
let (call, res) = if current_voice_state == Some(channel_id) {
let call_opt = songbird.get(guild.id);
let call = if current_voice_state == Some(channel_id) {
let call_opt = songbird.get(guild.deref().id);
if let Some(call) = call_opt {
(call, Ok(()))
Ok(call)
} else {
let (call, res) = songbird.join(guild.id, channel_id).await;
(call, res)
songbird.join(guild.deref().id, channel_id).await
}
} else {
let (call, res) = songbird.join(guild.id, channel_id).await;
(call, res)
};
songbird.join(guild.deref().id, channel_id).await
}?;
{
// set call to deafen
let _ = call.lock().await.deafen(true).await;
}
if let Some(Channel::Guild(channel)) = channel_id.to_channel_cached(&ctx) {
let _ = channel
.edit_voice_state(&ctx, ctx.cache.current_user(), |v| v.suppress(false))
.await;
if let Some(channel) = channel_id.to_channel_cached(&ctx.cache).as_deref() {
channel
.edit_voice_state(
&ctx,
ctx.cache.current_user().id,
EditVoiceState::new().suppress(true),
)
.await?;
}
(call, res)
Ok(call)
}
pub async fn play_from_query(
ctx: &poise::serenity_prelude::Context,
data: &Data,
guild: Guild,
guild: impl Deref<Target = Guild>,
user_id: UserId,
channel: Option<ChannelId>,
query: &str,
r#loop: bool,
) -> String {
let guild_id = guild.id;
let guild_id = guild.deref().id;
let channel_to_join = channel.or_else(|| {
guild
.deref()
.voice_states
.get(&user_id)
.and_then(|voice_state| voice_state.channel_id)
@ -129,8 +131,7 @@ pub async fn play_from_query(
match sound_res {
Some(sound) => {
{
let (call_handler, _) =
join_channel(ctx, guild.clone(), user_channel).await;
let call_handler = join_channel(ctx, guild, user_channel).await.unwrap();
let guild_data = data.guild_data(guild_id).await.unwrap();