nki/youmubot
1
0
Fork 0
mirror of https://github.com/natsukagami/youmubot.git synced 2025-04-19 16:58:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Relax Pagination to &mut self

Browse source
This commit is contained in:
Natsu Kagami 2020-02-10 19:09:23 -05:00
parent 2831754e3d
commit 90be66b950
Signed by: nki
GPG key ID: 73376E117CD20735
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
youmubot-prelude/src/pagination.rs
View file

@ -39,7 +39,7 @@ impl ReactionWatcher {
duration: std::time::Duration, duration: std::time::Duration,
) -> CommandResult ) -> CommandResult
where where
T: for<'a> Fn(u8, &'a mut EditMessage) -> (&'a mut EditMessage, CommandResult), T: for<'a> FnMut(u8, &'a mut EditMessage) -> (&'a mut EditMessage, CommandResult),
{ {
self.paginate(ctx, channel, pager, duration) self.paginate(ctx, channel, pager, duration)
} }
@ -57,7 +57,7 @@ pub trait Pagination {
/// ///
/// This would either create or edit a message, but you should not be worry about it. /// This would either create or edit a message, but you should not be worry about it.
fn render_page<'a>( fn render_page<'a>(
&self, &mut self,
page: u8, page: u8,
target: &'a mut EditMessage, target: &'a mut EditMessage,
) -> (&'a mut EditMessage, CommandResult); ) -> (&'a mut EditMessage, CommandResult);
@ -65,10 +65,10 @@ pub trait Pagination {
impl<T> Pagination for T impl<T> Pagination for T
where where
T: for<'a> Fn(u8, &'a mut EditMessage) -> (&'a mut EditMessage, CommandResult), T: for<'a> FnMut(u8, &'a mut EditMessage) -> (&'a mut EditMessage, CommandResult),
{ {
fn render_page<'a>( fn render_page<'a>(
&self, &mut self,
page: u8, page: u8,
target: &'a mut EditMessage, target: &'a mut EditMessage,
) -> (&'a mut EditMessage, CommandResult) { ) -> (&'a mut EditMessage, CommandResult) {
@ -107,7 +107,7 @@ impl<T: Pagination> PaginationHandler<T> {
fn call_pager(&mut self) -> CommandResult { fn call_pager(&mut self) -> CommandResult {
let mut res: CommandResult = Ok(()); let mut res: CommandResult = Ok(());
let mut msg = self.message.clone(); let mut msg = self.message.clone();
msg.edit(&self.ctx, |e| { msg.edit(self.ctx.http.clone(), |e| {
let (e, r) = self.pager.render_page(self.page, e); let (e, r) = self.pager.render_page(self.page, e);
res = r; res = r;
e e