From 05dc40863ecf978c48919730b2c98a40847f33fe Mon Sep 17 00:00:00 2001 From: natto1784 Date: Fri, 25 Feb 2022 19:22:38 +0530 Subject: [PATCH] fixed select menu taking more than 25 items --- src/commands/count.rs | 4 +++- src/commands/tags.rs | 4 +++- src/lib/components.rs | 6 ++++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/commands/count.rs b/src/commands/count.rs index 61a7acb..5b09251 100644 --- a/src/commands/count.rs +++ b/src/commands/count.rs @@ -218,19 +218,21 @@ pub async fn clist(ctx: &Context, msg: &Message, mut args: Args) -> CommandResul .get::() .expect("Expected Database in TypeMap.") .clone(); + let rows = db .query( "SELECT ROW_NUMBER() OVER (ORDER BY id), name, owner FROM words", &[], ) .await?; + if rows.is_empty() { msg.reply(ctx, "No words stored").await?; return Ok(()); } + let groups: Vec<&[Row]> = rows.chunks(size).collect(); let mut cur = 1; - let message = msg .channel_id .send_message(ctx, |m| { diff --git a/src/commands/tags.rs b/src/commands/tags.rs index 74463d9..87d3a5b 100644 --- a/src/commands/tags.rs +++ b/src/commands/tags.rs @@ -255,19 +255,21 @@ pub async fn tlist(ctx: &Context, msg: &Message, mut args: Args) -> CommandResul .get::() .expect("Expected Database in TypeMap.") .clone(); + let rows = db .query( "SELECT ROW_NUMBER() OVER (ORDER BY id), name, owner FROM tags", &[], ) .await?; + if rows.is_empty() { msg.reply(ctx, "No tags stored").await?; return Ok(()); } + let groups: Vec<&[Row]> = rows.chunks(size).collect(); let mut cur = 1; - let message = msg .channel_id .send_message(ctx, |m| { diff --git a/src/lib/components.rs b/src/lib/components.rs index 88b3a86..a1aa032 100644 --- a/src/lib/components.rs +++ b/src/lib/components.rs @@ -54,7 +54,9 @@ pub fn make_terminal_components(terminal: &str, pages: usize) -> CreateComponent .emoji(ReactionType::Unicode("\u{1F5D1}".to_string())) .custom_id("delete") }) - }) - .create_action_row(|ar| ar.add_select_menu(make_range_select_menu(1, pages))); + }); + if pages <= 25 { + c.create_action_row(|ar| ar.add_select_menu(make_range_select_menu(1, pages))); + } c }