From a6456ad9de4c4aac12fadcb260620c8491a3ff7d Mon Sep 17 00:00:00 2001 From: "DavidCrompton1192@gmail.com" Date: Sat, 11 Mar 2023 20:38:09 -0500 Subject: [PATCH] Add ding to flake & instALL --- ding.mp3 | Bin 0 -> 3644 bytes flake.nix | 4 ++++ src/utils/guild_popin.rs | 16 +++++++++++++--- 3 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 ding.mp3 diff --git a/ding.mp3 b/ding.mp3 new file mode 100644 index 0000000000000000000000000000000000000000..2df70c5ab1f348d634c2483f334090b3e0181fe1 GIT binary patch literal 3644 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 M0|N_A)#OV60QZ{tQvd(} literal 0 HcmV?d00001 diff --git a/flake.nix b/flake.nix index 9ad3d16..2cc9e0b 100644 --- a/flake.nix +++ b/flake.nix @@ -66,6 +66,10 @@ # artifacts from above. newalan = craneLib.buildPackage (commonArgs // { inherit cargoArtifacts; + postInstall = '' + mkdir -p $out/share/sounds + cp ding.mp3 $out/share/sounds/ + ''; }); in rec { checks = pkgs.lib.optionalAttrs (system == "x86_64-linux") { diff --git a/src/utils/guild_popin.rs b/src/utils/guild_popin.rs index ea327fb..1cc1147 100644 --- a/src/utils/guild_popin.rs +++ b/src/utils/guild_popin.rs @@ -3,6 +3,8 @@ use std::sync::Arc; use std::time::{Duration, Instant}; use rand::prelude::*; use serenity::Client; +use songbird::error::JoinError; +use songbird::ffmpeg; use songbird::id::ChannelId; use std::thread::sleep; use std::collections::HashMap; @@ -45,7 +47,7 @@ async fn popin(ctx: Context, guild: Guild) { most = Some(id); } }, - Err(error) => { + Err(_error) => { } }; @@ -60,13 +62,21 @@ async fn popin(ctx: Context, guild: Guild) { Some(chan) => { let manager = songbird::get(&ctx).await .expect("Songbird: intialization"); - let (_,_status) = manager.join(guild.id, chan).await; + let (call,status) = manager.join(guild.id, chan).await; + match status { + Ok(_) => { + let call = call.lock().await; + let ding = ffmpeg(""); + }, + Err(_err) => { + println!("Error joining channel") + } + } }, None => { println!("No good channel to join") } } - () } async fn popin_soon(ctx: Context, guild: Guild) {