diff --git a/Cargo.lock b/Cargo.lock index eb37f08..2723c9e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1924,7 +1924,7 @@ dependencies = [ [[package]] name = "soundfx-rs" -version = "1.5.3" +version = "1.5.4" dependencies = [ "dashmap", "env_logger", diff --git a/Cargo.toml b/Cargo.toml index 1d143c1..e5f16c8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "soundfx-rs" -version = "1.5.3" +version = "1.5.4" authors = ["jellywx "] edition = "2018" diff --git a/src/cmds/search.rs b/src/cmds/search.rs index 2c8cc80..19cf0c7 100644 --- a/src/cmds/search.rs +++ b/src/cmds/search.rs @@ -197,32 +197,25 @@ impl SoundPager { let user_id = interaction.user.id; let guild_id = interaction.guild_id.unwrap(); - match serde_json::from_str::(&interaction.data.custom_id) { - Ok(pager) => { - let sounds = pager.get_page(data, user_id, guild_id).await?; - let count = match pager.context { - ListContext::User => data.count_user_sounds(user_id).await?, - ListContext::Guild => data.count_guild_sounds(guild_id).await?, - }; + let pager = serde_json::from_str::(&interaction.data.custom_id)?; + let sounds = pager.get_page(data, user_id, guild_id).await?; + let count = match pager.context { + ListContext::User => data.count_user_sounds(user_id).await?, + ListContext::Guild => data.count_guild_sounds(guild_id).await?, + }; - interaction - .create_interaction_response(&ctx, |r| { - r.kind(InteractionResponseType::UpdateMessage) - .interaction_response_data(|d| { - d.ephemeral(true) - .add_embed(pager.embed(&sounds, count)) - .components(|c| { - c.add_action_row(pager.create_action_row(count / 25)) - }) - }) + interaction + .create_interaction_response(&ctx, |r| { + r.kind(InteractionResponseType::UpdateMessage) + .interaction_response_data(|d| { + d.ephemeral(true) + .add_embed(pager.embed(&sounds, count)) + .components(|c| c.add_action_row(pager.create_action_row(count / 25))) }) - .await?; + }) + .await?; - Ok(()) - } - - Err(_) => Ok(()), - } + Ok(()) } async fn reply(&self, ctx: Context<'_>) -> Result<(), Error> {