fix ascii list

This commit is contained in:
sad 2024-03-21 15:32:57 -06:00
parent 06b32db707
commit 5d5ed9da8e
WARNING! Although there is a key with this ID in the database it does not verify this commit! This commit is SUSPICIOUS.
GPG Key ID: 28D3A882F3E6AD02

View File

@ -77,7 +77,7 @@ pub async fn handle_ascii_command<W: AsyncWriteExt + Unpin>(
if *command_type == "random" && parts.len() == 2 { if *command_type == "random" && parts.len() == 2 {
handle_random(writer, config, channel).await?; handle_random(writer, config, channel).await?;
} else if *command_type == "list"{ } else if *command_type == "list"{
handle_list(writer, config, channel, Some(parts.get(3).unwrap_or(&""))).await?; handle_list(writer, config, channel, Some(parts.get(2).unwrap_or(&""))).await?;
} else { } else {
handle_specific_file(writer, config, channel, &parts).await?; handle_specific_file(writer, config, channel, &parts).await?;
} }
@ -104,10 +104,11 @@ async fn handle_list<W: AsyncWriteExt + Unpin>(
writer: &mut W, writer: &mut W,
config: &Config, config: &Config,
channel: &str, channel: &str,
subdirectory: Option<&str>, parts: Option<&str>
) -> Result<(), Box<dyn Error>> { ) -> Result<(), Box<dyn Error>> {
let base_dir = config.ascii_art.clone().unwrap_or_else(|| "ascii_art".to_string()); let base_dir = config.ascii_art.clone().unwrap_or_else(|| "ascii_art".to_string());
let dir = if let Some(subdir) = subdirectory {
let dir = if let Some(subdir) = parts {
format!("{}/{}", base_dir, subdir) format!("{}/{}", base_dir, subdir)
} else { } else {
base_dir base_dir