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

osu: play tables now show star difficulty

Browse source
This commit is contained in:
Natsu Kagami 2020-02-12 19:03:46 -05:00
parent dec7309f01
commit abb8611083
Signed by: nki
GPG key ID: 73376E117CD20735
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
youmubot-core/src/community/votes.rs
View file

@ -2,7 +2,7 @@ use serenity::framework::standard::CommandError as Error;
use serenity::{ use serenity::{
framework::standard::{macros::command, Args, CommandResult}, framework::standard::{macros::command, Args, CommandResult},
model::{ model::{
channel::{Message,Reaction, ReactionType}, channel::{Message, Reaction, ReactionType},
id::UserId, id::UserId,
}, },
utils::MessageBuilder, utils::MessageBuilder,

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

@ -248,20 +248,21 @@ fn list_plays(plays: &[Score], mode: Mode, ctx: Context, m: &Message) -> Command
|| osu.beatmaps(BeatmapRequestKind::Beatmap(plays[i].beatmap_id), |f| f) || osu.beatmaps(BeatmapRequestKind::Beatmap(plays[i].beatmap_id), |f| f)
.ok() .ok()
.and_then(|v| v.into_iter().next()) .and_then(|v| v.into_iter().next())
.map(|b| format!("{} - {} [{}] (#{})", b.artist, b.title, b.difficulty_name, b.beatmap_id)) .map(|b| format!(
"[{:.1}*] {} - {} [{}] (#{})",
b.difficulty.stars, b.artist, b.title, b.difficulty_name, b.beatmap_id))
.unwrap_or("FETCH FAILED".to_owned()))).collect::<Vec<_>>() .unwrap_or("FETCH FAILED".to_owned()))).collect::<Vec<_>>()
}; };
let /*mods width*/ mw = plays.iter().map(|v| v.mods.to_string().len()).max().unwrap().max(4); let /*mods width*/ mw = plays.iter().map(|v| v.mods.to_string().len()).max().unwrap().max(4);
let /*beatmap names*/ bw = beatmaps.iter().map(|v| v.len()).max().unwrap().max(7); let /*beatmap names*/ bw = beatmaps.iter().map(|v| v.len()).max().unwrap().max(7);
let mut m = MessageBuilder::new(); let mut m = MessageBuilder::new();
m.push_line("```");
// Table header // Table header
m.push_line(format!(" # | pp | accuracy | rank | {:mw$} | {:bw$}", "mods", "beatmap", mw = mw, bw = bw)); m.push_line(format!(" # | pp | accuracy | rank | {:mw$} | {:bw$}", "mods", "beatmap", mw = mw, bw = bw));
m.push_line(format!("---------------------------------{:-<mw$}---{:-<bw$}", "", "", mw = mw, bw = bw)); m.push_line(format!("---------------------------------{:-<mw$}---{:-<bw$}", "", "", mw = mw, bw = bw));
// Each row // Each row
for (id, (play, beatmap)) in plays.iter().zip(beatmaps.iter()).enumerate() { for (id, (play, beatmap)) in plays.iter().zip(beatmaps.iter()).enumerate() {
m.push_line_safe( m.push_line(
format!( format!(
"{:>3} | {:>6} | {:>8} | {:^4} | {:mw$} | {:bw$}", "{:>3} | {:>6} | {:>8} | {:^4} | {:mw$} | {:bw$}",
id + start + 1, id + start + 1,
@ -270,7 +271,12 @@ fn list_plays(plays: &[Score], mode: Mode, ctx: Context, m: &Message) -> Command
play.rank.to_string(), play.mods.to_string(), beatmap, mw = mw, bw = bw)); play.rank.to_string(), play.mods.to_string(), beatmap, mw = mw, bw = bw));
} }
// End // End
m.push_line("```").push_line(format!("Page **{}/{}**", page + 1, total_pages)); let table = m.build().replace("```", "\\`\\`\\`");
let mut m = MessageBuilder::new();
m
.push_codeblock(table, None)
.push_line(format!("Page **{}/{}**", page + 1, total_pages))
.push_line("Note: star difficulty don't reflect mods applied.");
(e.content(m.build()), Ok(())) (e.content(m.build()), Ok(()))
}, std::time::Duration::from_secs(60)) }, std::time::Duration::from_secs(60))
} }