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

Filter check by mod

Browse source
This commit is contained in:
Natsu Kagami 2021-04-28 14:30:55 +09:00
parent b29b2af2f7
commit 5cffcd0eb3
Signed by: nki
GPG key ID: 7306B3D3C3AD6E51
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
youmubot-osu/src/discord/mod.rs
View file

@ -434,11 +434,12 @@ pub async fn last(ctx: &Context, msg: &Message, mut args: Args) -> CommandResult
#[command] #[command]
#[aliases("c", "chk")] #[aliases("c", "chk")]
#[usage = "[style (table or grid) = --table] / [username or tag = yourself]"] #[usage = "[style (table or grid) = --table] / [username or tag = yourself] / [mods to filter]"]
#[description = "Check your own or someone else's best record on the last beatmap. Also stores the result if possible."] #[description = "Check your own or someone else's best record on the last beatmap. Also stores the result if possible."]
#[max_args(2)] #[max_args(3)]
pub async fn check(ctx: &Context, msg: &Message, mut args: Args) -> CommandResult { pub async fn check(ctx: &Context, msg: &Message, mut args: Args) -> CommandResult {
let data = ctx.data.read().await; let data = ctx.data.read().await;
let mods = args.find::<Mods>().unwrap_or(Mods::NOMOD);
let bm = cache::get_beatmap(&*data, msg.channel_id).await?; let bm = cache::get_beatmap(&*data, msg.channel_id).await?;
match bm { match bm {
@ -449,7 +450,9 @@ pub async fn check(ctx: &Context, msg: &Message, mut args: Args) -> CommandResul
Some(bm) => { Some(bm) => {
let b = &bm.0; let b = &bm.0;
let m = bm.1; let m = bm.1;
let style = args.single::<ScoreListStyle>().unwrap_or_default(); let style = args
.single::<ScoreListStyle>()
.unwrap_or(ScoreListStyle::Grid);
let username_arg = args.single::<UsernameArg>().ok(); let username_arg = args.single::<UsernameArg>().ok();
let user_id = match username_arg.as_ref() { let user_id = match username_arg.as_ref() {
Some(UsernameArg::Tagged(v)) => Some(*v), Some(UsernameArg::Tagged(v)) => Some(*v),
@ -466,7 +469,10 @@ pub async fn check(ctx: &Context, msg: &Message, mut args: Args) -> CommandResul
.ok_or_else(|| Error::msg("User not found"))?; .ok_or_else(|| Error::msg("User not found"))?;
let scores = osu let scores = osu
.scores(b.beatmap_id, |f| f.user(UserID::ID(user.id)).mode(m)) .scores(b.beatmap_id, |f| f.user(UserID::ID(user.id)).mode(m))
.await?; .await?
.into_iter()
.filter(|s| s.mods.contains(mods))
.collect::<Vec<_>>();
if scores.is_empty() { if scores.is_empty() {
msg.reply(&ctx, "No scores found").await?; msg.reply(&ctx, "No scores found").await?;