diff options
| author | Jokler <jokler@protonmail.com> | 2020-01-31 22:34:31 +0100 |
|---|---|---|
| committer | Jokler <jokler@protonmail.com> | 2020-02-22 23:20:10 +0100 |
| commit | ca4c0158f417b87f04313053a3f656f2de4e803b (patch) | |
| tree | 8eeb45f789d409f2b45e857f0ce743d2cf29640a | |
| parent | 757edd214f841e8d95e4c5430d7ead7a0e8fecbb (diff) | |
| download | pokebot-ca4c0158f417b87f04313053a3f656f2de4e803b.tar.gz pokebot-ca4c0158f417b87f04313053a3f656f2de4e803b.zip | |
Make titles of audio metdata non optional
| -rw-r--r-- | src/bot/music.rs | 18 | ||||
| -rw-r--r-- | src/youtube_dl.rs | 2 |
2 files changed, 7 insertions, 13 deletions
diff --git a/src/bot/music.rs b/src/bot/music.rs index a23ed3b..920f1cb 100644 --- a/src/bot/music.rs +++ b/src/bot/music.rs @@ -173,13 +173,8 @@ impl MusicBot { } fn start_playing_audio(&self, metadata: AudioMetadata) { - if let Some(title) = metadata.title { - self.send_message(&format!("Playing {}", ts::underline(&title))); - self.set_description(&format!("Currently playing '{}'", title)); - } else { - self.send_message("Playing unknown title"); - self.set_description("Currently playing"); - } + self.send_message(&format!("Playing {}", ts::underline(&metadata.title))); + self.set_description(&format!("Currently playing '{}'", metadata.title)); self.player.reset().unwrap(); self.player.set_source_url(metadata.url).unwrap(); self.player.play().unwrap(); @@ -198,11 +193,10 @@ impl MusicBot { self.start_playing_audio(request); } } else { - if let Some(title) = metadata.title { - self.send_message(&format!("Added {} to playlist", ts::underline(&title))); - } else { - self.send_message("Added to playlist"); - } + self.send_message(&format!( + "Added {} to playlist", + ts::underline(&metadata.title) + )); } } Err(e) => { diff --git a/src/youtube_dl.rs b/src/youtube_dl.rs index c6012f0..b62d4b3 100644 --- a/src/youtube_dl.rs +++ b/src/youtube_dl.rs @@ -9,7 +9,7 @@ use log::debug; #[derive(Serialize, Deserialize, Clone, Debug)] pub struct AudioMetadata { pub url: String, - pub title: Option<String>, + pub title: String, } pub async fn get_audio_download_url(uri: String) -> Result<AudioMetadata, String> { |