jheuel/ohrwurm
1
0
Fork 0
Code Issues 1 Pull Requests 9 Actions Packages Projects Releases Wiki Activity

fix empty pages
All checks were successful
tests / fmt (push) Successful in 1m16s
Details
tests / build (push) Successful in 1m54s
Details
tests / clippy (push) Successful in 1m50s
Details
tests / pre-commit (push) Successful in 1m50s
Details
tests / test (push) Successful in 2m13s
Details
deploy / release-image (push) Successful in 5m34s
Details

Browse Source
This commit is contained in:
Johannes Heuel
2024-06-19 00:24:32 +02:00
parent 9f0e934f92
commit cad6cf22fa
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/commands/queue.rs
View File

@@ -59,9 +59,9 @@ pub(crate) async fn build_queue_embeds(queue: &[TrackHandle], page: usize) -> Ve
} }
message.push('\n'); message.push('\n');
let max_pages = queue.len() / TRACKS_PER_PAGE; let n_pages = (queue.len() + TRACKS_PER_PAGE - 1) / TRACKS_PER_PAGE;
if max_pages > 0 { if n_pages > 1 {
message.push_str(&format!("page {}/{}", 1 + page, 1 + max_pages)); message.push_str(&format!("page {}/{}", 1 + page, n_pages));
} }
vec![EmbedBuilder::new() vec![EmbedBuilder::new()
.description(&message) .description(&message)
@@ -69,7 +69,7 @@ pub(crate) async fn build_queue_embeds(queue: &[TrackHandle], page: usize) -> Ve
.build()] .build()]
} }
pub(crate) fn build_action_row(page: usize, max_pages: usize) -> Vec<Component> { pub(crate) fn build_action_row(page: usize, n_pages: usize) -> Vec<Component> {
vec![Component::ActionRow(ActionRow { vec![Component::ActionRow(ActionRow {
components: vec![ components: vec![
Component::Button(Button { Component::Button(Button {
@@ -100,7 +100,7 @@ pub(crate) fn build_action_row(page: usize, max_pages: usize) -> Vec<Component>
name: "➡️".to_string(), name: "➡️".to_string(),
}), }),
url: None, url: None,
disabled: page >= max_pages, disabled: page >= n_pages - 1,
}), }),
], ],
})] })]
@@ -146,7 +146,8 @@ pub(crate) async fn queue(
} }
let embeds = build_queue_embeds(&queue, 0).await; let embeds = build_queue_embeds(&queue, 0).await;
let action_row = build_action_row(0, queue.len() / TRACKS_PER_PAGE); let n_pages = (queue.len() + TRACKS_PER_PAGE - 1) / TRACKS_PER_PAGE;
let action_row = build_action_row(0, n_pages);
state state
.http .http

4
src/handler.rs
View File

@@ -147,8 +147,8 @@ impl Handler {
let call = call_lock.lock().await; let call = call_lock.lock().await;
queue = call.queue().current_queue(); queue = call.queue().current_queue();
} }
let n_pages = queue.len() / TRACKS_PER_PAGE; let n_pages = (queue.len() + TRACKS_PER_PAGE - 1) / TRACKS_PER_PAGE;
let page = page.min(n_pages).max(0); let page = page.min(n_pages - 1).max(0);
let embeds = build_queue_embeds(&queue, page).await; let embeds = build_queue_embeds(&queue, page).await;
let action_row = build_action_row(page, n_pages); let action_row = build_action_row(page, n_pages);