tom/ol_rusty
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Cargo fmt

Browse source 
And fix pagination for ephemeral commands
This commit is contained in:
Tom 2023-04-08 20:41:04 +02:00
parent 8d8662be75
commit fff7611e9b
2 changed files with 20 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/commands/roles.rs
View file

@ -21,22 +21,20 @@ async fn autocomplete_role<'a>(
.get_table("roles") .get_table("roles")
.unwrap() .unwrap()
.get(&ctx.guild_id().expect("Not in a guild").to_string()) .get(&ctx.guild_id().expect("Not in a guild").to_string())
{ {
None => {vec![]} None => {
Some(val) => { vec![]
match val.clone() }
.into_table() Some(val) => match val.clone().into_table() {
{ Err(_) => {
Err(_) => {vec![]} vec![]
Ok(val) => {
val.into_keys()
.filter(|str| {str.contains(partial)})
.collect()
}
}
} }
}; Ok(val) => val
.into_keys()
.filter(|str| str.contains(partial))
.collect(),
},
};
roles.sort_unstable(); roles.sort_unstable();
@ -84,8 +82,8 @@ pub async fn roles(
mem.remove_role(ctx, role_ding).await?; mem.remove_role(ctx, role_ding).await?;
ctx.say(format!("Role {} Added", role)).await? ctx.say(format!("Role {} Added", role)).await?
} else { } else {
mem.add_role(ctx, role_ding).await?; mem.add_role(ctx, role_ding).await?;
ctx.say(format!("Role {} Added", role)).await? ctx.say(format!("Role {} Added", role)).await?
} }
} }
}; };

11
src/commands/utils.rs
View file

@ -44,6 +44,7 @@ pub fn paginator(input: Vec<String>, chunk_size: usize, join_string: String) ->
return result; return result;
} }
pub async fn paginate_string(ctx: Context<'_>, pages: Vec<String>) -> Result<(), Error> { pub async fn paginate_string(ctx: Context<'_>, pages: Vec<String>) -> Result<(), Error> {
let uuid_command = ctx.id().to_string(); let uuid_command = ctx.id().to_string();
let page_count = pages.len(); let page_count = pages.len();
@ -60,7 +61,7 @@ pub async fn paginate_string(ctx: Context<'_>, pages: Vec<String>) -> Result<(),
_ => {} _ => {}
}; };
ctx.send(|m| { let reply_handle = ctx.send(|m| {
m.content(format!( m.content(format!(
"{}\n\nPage: {}/{}", "{}\n\nPage: {}/{}",
pages.get(0).unwrap(), pages.get(0).unwrap(),
@ -115,8 +116,7 @@ pub async fn paginate_string(ctx: Context<'_>, pages: Vec<String>) -> Result<(),
page = 0; page = 0;
} }
let mut msg = mci.message.clone(); reply_handle.edit(ctx, |m| {
msg.edit(ctx, |m| {
m.content(format!( m.content(format!(
"{}\n\nPage: {}/{}", "{}\n\nPage: {}/{}",
pages.get(page).unwrap(), pages.get(page).unwrap(),
@ -157,7 +157,7 @@ pub async fn paginate_string_embed(
_ => {} _ => {}
}; };
ctx.send(|m| { let reply_handle = ctx.send(|m| {
// m.content(format!( // m.content(format!(
// "{}\n\nPage: {}/{}", // "{}\n\nPage: {}/{}",
// pages.get(0).unwrap(), // pages.get(0).unwrap(),
@ -216,8 +216,7 @@ pub async fn paginate_string_embed(
page = 0; page = 0;
} }
let mut msg = mci.message.clone(); reply_handle.edit(ctx, |m| {
msg.edit(ctx, |m| {
m.embed(|e| { m.embed(|e| {
e.title(format!("{} Page {}/{}", title, page + 1, page_count)) e.title(format!("{} Page {}/{}", title, page + 1, page_count))
.description(pages.get(page).unwrap()) .description(pages.get(page).unwrap())