.idea/dataSources.local.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="dataSourceStorageLocal" created-in="CL-231.9161.40">
+  <component name="dataSourceStorageLocal" created-in="CL-231.8109.174">
     <data-source name="MySQL for 5.1 - soundfx@localhost" uuid="1067c1d0-1386-4a39-b3f5-6d48d6f279eb">
       <database-info product="" version="" jdbc-version="" driver-name="" driver-version="" dbms="MYSQL" exact-version="0" />
       <secret-storage>master_key</secret-storage>

Cargo.toml

@@ -30,10 +30,7 @@ suggests = "mysql-server-8.0"
 maintainer-scripts = "debian"
 assets = [
     ["target/release/soundfx-rs", "usr/bin/soundfx-rs", "755"],
-    ["conf/default.env", "etc/soundfx-rs/config.env", "600"]
+    ["conf/default.env", "etc/soundfx-rs/default.env", "600"]
-]
-conf-files = [
-    "/etc/soundfx-rs/config.env",
 ]
 
 [package.metadata.deb.systemd-units]

debian/postinst

@@ -4,6 +4,10 @@ set -e
 
 id -u soundfx &>/dev/null || useradd -r -M soundfx
 
+if [ ! -f /etc/soundfx-rs/config.env ]; then
+  cp /etc/soundfx-rs/default.env /etc/soundfx-rs/config.env
+fi
+
 chown soundfx /etc/soundfx-rs/config.env
 
 #DEBHELPER#

debian/postrm

@@ -4,4 +4,8 @@ set -e
 
 id -u soundfx &>/dev/null || userdel soundfx
 
+if [ -f /etc/soundfx-rs/config.env ]; then
+  rm /etc/soundfx-rs/config.env
+fi
+
 #DEBHELPER#

src/cmds/play.rs

@@ -1,6 +1,5 @@
 use poise::serenity_prelude::{
     builder::CreateActionRow, model::application::component::ButtonStyle, GuildChannel,
-    ReactionType,
 };
 
 use crate::{
@@ -373,33 +372,7 @@ pub async fn soundboard(
                 c.add_action_row(action_row);
             }
 
-            c.create_action_row(|r| {
+            c
-                r.create_button(|b| {
-                    b.label("Stop")
-                        .emoji(ReactionType::Unicode("⏹".to_string()))
-                        .style(ButtonStyle::Danger)
-                        .custom_id("#stop")
-                })
-                .create_button(|b| {
-                    b.label("Mode:")
-                        .style(ButtonStyle::Secondary)
-                        .disabled(true)
-                        .custom_id("#mode")
-                })
-                .create_button(|b| {
-                    b.label("Instant")
-                        .emoji(ReactionType::Unicode("▶".to_string()))
-                        .style(ButtonStyle::Secondary)
-                        .disabled(true)
-                        .custom_id("#instant")
-                })
-                .create_button(|b| {
-                    b.label("Loop")
-                        .emoji(ReactionType::Unicode("🔁".to_string()))
-                        .style(ButtonStyle::Secondary)
-                        .custom_id("#loop")
-                })
-            })
         })
     })
     .await?;

src/event_handlers.rs

@@ -6,7 +6,7 @@ use poise::serenity_prelude::{
         channel::Channel,
     },
     utils::shard_id,
-    ActionRowComponent, Activity, Context, CreateActionRow, CreateComponents,
+    Activity, Context,
 };
 
 use crate::{
@@ -137,118 +137,23 @@ SELECT name, id, public, server_id, uploader_id
                 if let Some(guild_id) = component.guild_id {
                     if let Ok(()) = SoundPager::handle_interaction(ctx, &data, component).await {
                     } else {
-                        let mode = component.data.custom_id.as_str();
+                        component
-                        match mode {
+                            .create_interaction_response(ctx, |r| {
-                            "#stop" => {
+                                r.kind(InteractionResponseType::DeferredUpdateMessage)
-                                component
+                            })
-                                    .create_interaction_response(ctx, |r| {
+                            .await
-                                        r.kind(InteractionResponseType::DeferredUpdateMessage)
+                            .unwrap();
-                                    })
-                                    .await
-                                    .unwrap();
 
-                                let songbird = songbird::get(ctx).await.unwrap();
+                        play_from_query(
-                                let call_opt = songbird.get(guild_id);
+                            &ctx,
-
+                            &data,
-                                if let Some(call) = call_opt {
+                            guild_id.to_guild_cached(&ctx).unwrap(),
-                                    let mut lock = call.lock().await;
+                            component.user.id,
-
+                            None,
-                                    lock.stop();
+                            &component.data.custom_id,
-                                }
+                            false,
-                            }
+                        )
-
+                        .await;
-                            "#loop" | "#queue" | "#instant" => {
-                                component
-                                    .create_interaction_response(ctx, |r| {
-                                        r.kind(InteractionResponseType::UpdateMessage)
-                                            .interaction_response_data(|d| {
-                                                let mut c: CreateComponents = Default::default();
-
-                                                for action_row in &component.message.components {
-                                                    let mut a: CreateActionRow = Default::default();
-                                                    // These are always buttons
-                                                    for component in &action_row.components {
-                                                        match component {
-                                                            ActionRowComponent::Button(button) => {
-                                                                a.create_button(|b| {
-                                                                    if let Some(label) =
-                                                                        &button.label
-                                                                    {
-                                                                        b.label(label);
-                                                                    }
-                                                                    if let Some(emoji) =
-                                                                        &button.emoji
-                                                                    {
-                                                                        b.emoji(emoji.clone());
-                                                                    }
-                                                                    if let Some(custom_id) =
-                                                                        &button.custom_id
-                                                                    {
-                                                                        if custom_id
-                                                                            .starts_with('#')
-                                                                        {
-                                                                            b.custom_id(custom_id)
-                                                                                .disabled(
-                                                                                    custom_id
-                                                                                        == "#mode"
-                                                                                        || custom_id
-                                                                                            == mode,
-                                                                                );
-                                                                        } else {
-                                                                            b.custom_id(format!(
-                                                                                "{}{}",
-                                                                                custom_id
-                                                                                    .split('#')
-                                                                                    .next()
-                                                                                    .unwrap(),
-                                                                                mode
-                                                                            ));
-                                                                        }
-                                                                    }
-
-                                                                    b.style(button.style);
-
-                                                                    b
-                                                                });
-                                                            }
-                                                            _ => {}
-                                                        }
-                                                    }
-
-                                                    c.add_action_row(a);
-                                                }
-
-                                                d.set_components(c)
-                                            })
-                                    })
-                                    .await
-                                    .unwrap();
-                            }
-
-                            id_mode => {
-                                component
-                                    .create_interaction_response(ctx, |r| {
-                                        r.kind(InteractionResponseType::DeferredUpdateMessage)
-                                    })
-                                    .await
-                                    .unwrap();
-
-                                let mut it = id_mode.split('#');
-                                let id = it.next().unwrap();
-                                let mode = it.next().unwrap_or("instant");
-
-                                play_from_query(
-                                    &ctx,
-                                    &data,
-                                    guild_id.to_guild_cached(&ctx).unwrap(),
-                                    component.user.id,
-                                    None,
-                                    id.split('#').next().unwrap(),
-                                    mode == "loop",
-                                )
-                                .await;
-                            }
-                        }
                     }
                 }
             }