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

Make server rank more(?) parallel and introduce calculated pp

Browse source
This commit is contained in:
Natsu Kagami 2024-02-14 14:32:26 +01:00 • committed by Natsu Kagami
parent c2562fbbca
commit aff2f93714
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
youmubot-osu/src/discord/server_rank.rs
View file

@ -15,7 +15,7 @@ use serenity::{
model::channel::Message, model::channel::Message,
utils::MessageBuilder, utils::MessageBuilder,
}; };
use youmubot_prelude::*; use youmubot_prelude::{stream::FuturesUnordered, *};
#[derive(Debug, Clone, Copy)] #[derive(Debug, Clone, Copy)]
enum ModeOrTotal { enum ModeOrTotal {
@ -238,12 +238,17 @@ pub async fn show_leaderboard(ctx: &Context, m: &Message, mut args: Args) -> Com
.and_then(|m| osu_users.get(&m.user.id).map(|ou| (m.distinct(), ou.id))), .and_then(|m| osu_users.get(&m.user.id).map(|ou| (m.distinct(), ou.id))),
) )
}) })
.filter_map(|(mem, osu_id)| { .collect::<Vec<_>>()
.await
.into_iter()
.map(|(mem, osu_id)| {
osu.scores(bm.0.beatmap_id, move |f| { osu.scores(bm.0.beatmap_id, move |f| {
f.user(UserID::ID(osu_id)).mode(bm.1) f.user(UserID::ID(osu_id)).mode(bm.1)
}) })
.map(|r| Some((mem, r.ok()?))) .map(|r| Some((mem, r.ok()?)))
}) })
.collect::<FuturesUnordered<_>>()
.filter_map(future::ready)
.collect::<Vec<_>>() .collect::<Vec<_>>()
.await .await
.into_iter() .into_iter()
@ -252,7 +257,7 @@ pub async fn show_leaderboard(ctx: &Context, m: &Message, mut args: Args) -> Com
scores scores
.into_iter() .into_iter()
.filter_map(|score| { .filter_map(|score| {
let pp = score.pp.or_else(|| { let pp = score.pp.map(|v| (true, v)).or_else(|| {
oppai_map oppai_map
.get_pp_from( .get_pp_from(
mode, mode,
@ -266,6 +271,7 @@ pub async fn show_leaderboard(ctx: &Context, m: &Message, mut args: Args) -> Com
score.mods, score.mods,
) )
.ok() .ok()
.map(|v| (false, v))
})?; })?;
Some((pp, mem.clone(), score)) Some((pp, mem.clone(), score))
}) })
@ -352,8 +358,8 @@ pub async fn show_leaderboard(ctx: &Context, m: &Message, mut args: Args) -> Com
}; };
let pp = scores let pp = scores
.iter() .iter()
.map(|(pp, _, s)| match order { .map(|((official, pp), _, s)| match order {
OrderBy::PP => format!("{:.2}", pp), OrderBy::PP => format!("{:.2}{}", pp, if *official { "" } else { "[?]" }),
OrderBy::Score => crate::discord::embeds::grouped_number(if has_lazer_score { s.normalized_score as u64 } else { s.score.unwrap() }), OrderBy::Score => crate::discord::embeds::grouped_number(if has_lazer_score { s.normalized_score as u64 } else { s.score.unwrap() }),
}) })
.collect::<Vec<_>>(); .collect::<Vec<_>>();