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

Simplify some of the osu commands

Browse source
This commit is contained in:
Natsu Kagami 2022-02-01 16:31:33 -05:00
parent 1a499e782a
commit a1975d5b54
Signed by: nki
GPG key ID: 7306B3D3C3AD6E51
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -221,13 +221,14 @@ pub async fn save(ctx: &Context, msg: &Message, mut args: Args) -> CommandResult
#[description = "Save the given username as someone's username."] #[description = "Save the given username as someone's username."]
#[owners_only] #[owners_only]
#[usage = "[ping user]/[username or user_id]"] #[usage = "[ping user]/[username or user_id]"]
#[delimiters(" ")]
#[num_args(2)] #[num_args(2)]
pub async fn forcesave(ctx: &Context, msg: &Message, mut args: Args) -> CommandResult { pub async fn forcesave(ctx: &Context, msg: &Message, mut args: Args) -> CommandResult {
let data = ctx.data.read().await; let data = ctx.data.read().await;
let osu = data.get::<OsuClient>().unwrap(); let osu = data.get::<OsuClient>().unwrap();
let target = args.single::<serenity::model::id::UserId>()?; let target = args.single::<serenity::model::id::UserId>()?;
let user = args.single::<String>()?; let user = args.quoted().trimmed().single::<String>()?;
let user: Option<User> = osu.user(UserID::Auto(user), |f| f).await?; let user: Option<User> = osu.user(UserID::Auto(user), |f| f).await?;
match user { match user {
Some(u) => { Some(u) => {
@ -318,13 +319,19 @@ impl FromStr for Nth {
#[description = "Gets an user's recent play"] #[description = "Gets an user's recent play"]
#[usage = "#[the nth recent play = --all] / [style (table or grid) = --table] / [mode (std, taiko, mania, catch) = std] / [username / user id = your saved id]"] #[usage = "#[the nth recent play = --all] / [style (table or grid) = --table] / [mode (std, taiko, mania, catch) = std] / [username / user id = your saved id]"]
#[example = "#1 / taiko / natsukagami"] #[example = "#1 / taiko / natsukagami"]
#[delimiters("/", " ")]
#[max_args(4)] #[max_args(4)]
pub async fn recent(ctx: &Context, msg: &Message, mut args: Args) -> CommandResult { pub async fn recent(ctx: &Context, msg: &Message, mut args: Args) -> CommandResult {
let data = ctx.data.read().await; let data = ctx.data.read().await;
let nth = args.single::<Nth>().unwrap_or(Nth::All); let nth = args.single::<Nth>().unwrap_or(Nth::All);
let style = args.single::<ScoreListStyle>().unwrap_or_default(); let style = args.single::<ScoreListStyle>().unwrap_or_default();
let mode = args.single::<ModeArg>().unwrap_or(ModeArg(Mode::Std)).0; let mode = args.single::<ModeArg>().unwrap_or(ModeArg(Mode::Std)).0;
let user = to_user_id_query(args.single::<UsernameArg>().ok(), &*data, msg).await?; let user = to_user_id_query(
args.quoted().trimmed().single::<UsernameArg>().ok(),
&*data,
msg,
)
.await?;
let osu = data.get::<OsuClient>().unwrap(); let osu = data.get::<OsuClient>().unwrap();
let meta_cache = data.get::<BeatmapMetaCache>().unwrap(); let meta_cache = data.get::<BeatmapMetaCache>().unwrap();
@ -385,6 +392,7 @@ impl FromStr for OptBeatmapset {
#[command] #[command]
#[description = "Show information from the last queried beatmap."] #[description = "Show information from the last queried beatmap."]
#[usage = "[--set/-s/--beatmapset] / [mods = no mod]"] #[usage = "[--set/-s/--beatmapset] / [mods = no mod]"]
#[delimiters(" ")]
#[max_args(2)] #[max_args(2)]
pub async fn last(ctx: &Context, msg: &Message, mut args: Args) -> CommandResult { pub async fn last(ctx: &Context, msg: &Message, mut args: Args) -> CommandResult {
let data = ctx.data.read().await; let data = ctx.data.read().await;