valter/dj-kitty-cat
1
0
Fork 0
Code Issues 7 Pull requests Projects 1 Releases Wiki Activity

Fix panic when setting volume after song ends

Browse source
This commit is contained in:
Alex Page 2022-01-20 21:48:19 -05:00
parent 8d2e5dec41
commit 37885e5572
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/commands.rs
View file

@ -174,11 +174,11 @@ pub async fn set_volume(ctx: &mut Context, command: &ApplicationCommandInteracti
let current_track = data.get::<CurrentlyPlayingTrack>().unwrap(); let current_track = data.get::<CurrentlyPlayingTrack>().unwrap();
if let Some(track) = current_track { if let Some(track) = current_track {
track.set_volume(new_volume).unwrap(); if track.set_volume(new_volume).is_ok() {
format!("Setting volume to {}%.", volume) return format!("Setting volume to {}%.", volume);
} else { }
"Nothing's currently playing and for some reason, something needs to be playing to set the volume.".to_string()
} }
"Nothing's currently playing and for some reason, something needs to be playing to set the volume.".to_string()
} }
pub async fn set_loop(ctx: &mut Context, command: &ApplicationCommandInteraction) -> String { pub async fn set_loop(ctx: &mut Context, command: &ApplicationCommandInteraction) -> String {
@ -203,13 +203,12 @@ pub async fn set_loop(ctx: &mut Context, command: &ApplicationCommandInteraction
if let Some(track) = current_track { if let Some(track) = current_track {
if loops { if loops {
track.enable_loop().expect("Couldn't enable looping"); track.enable_loop().expect("Couldn't enable looping");
return format!("Loopin'!"); "Loopin'!".to_string()
} else { } else {
track.disable_loop().expect("Couldn't disable looping"); track.disable_loop().expect("Couldn't disable looping");
return format!("This is the last time this track will EVER be played."); "This is the last time this track will EVER be played.".to_string()
} }
} else { } else {
"I can't loop a song if there is no song to loop.".to_string() "I can't loop a song if there is no song to loop.".to_string()
} }
} }