jude/reminder-bot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity

turned pager into a single type

Browse Source
This commit is contained in:
jellywx
2021-10-13 17:23:50 +01:00
parent a362a24cfc
commit 4490f19c04
4 changed files with 105 additions and 324 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/commands/reminder_cmds.rs
View File

@ -13,7 +13,7 @@ use serenity::{builder::CreateEmbed, client::Context, model::channel::Channel};
use crate::{
check_subscription_on_message,
component_models::{
pager::{DelPager, LookPager, Pager},
pager::{DelData, LookData, Pager},
ComponentDataModel, DelSelector,
},
consts::{
@ -329,7 +329,7 @@ async fn look(ctx: &Context, invoke: &mut CommandInvoke, args: CommandOptions) {
.fold(0, |t, r| t + r.len())
.div_ceil(EMBED_DESCRIPTION_MAX_LENGTH);
let pager = LookPager::new(flags, timezone);
let pager = Pager::new(0, LookData { flags, timezone });
invoke
.respond(
@ -395,7 +395,7 @@ pub fn show_delete_page(
page: usize,
timezone: Tz,
) -> CreateGenericResponse {
let pager = DelPager::new(page, timezone);
let pager = Pager::new(page, DelData { timezone });
if reminders.is_empty() {
return CreateGenericResponse::new()

4
src/commands/todo_cmds.rs
View File

@ -3,7 +3,7 @@ use serenity::client::Context;
use crate::{
component_models::{
pager::{Pager, TodoPager},
pager::{Pager, TodoData},
ComponentDataModel, TodoSelector,
},
consts::{EMBED_DESCRIPTION_MAX_LENGTH, SELECT_MAX_ENTRIES, THEME_COLOR},
@ -136,7 +136,7 @@ pub fn show_todo_page(
channel_id: Option<u64>,
guild_id: Option<u64>,
) -> CreateGenericResponse {
let pager = TodoPager::new(page, user_id, channel_id, guild_id);
let pager = Pager::new(page, TodoData { user_id, channel_id, guild_id });
let pages = max_todo_page(todo_values);
let mut page = page;