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

Add profile command

Browse source
This commit is contained in:
Natsu Kagami 2024-12-31 02:38:43 +01:00 • committed by Natsu Kagami
parent 257afd28af
commit 1aa1baf657
3 changed files with 65 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
youmubot-osu/src/discord/commands.rs
View file

@ -4,7 +4,7 @@ use serenity::all::User;
use youmubot_prelude::*;
/// osu!-related command group.
#[poise::command(slash_command, subcommands("top"))]
#[poise::command(slash_command, subcommands("profile", "top"))]
pub async fn osu<U: HasOsuEnv>(_ctx: CmdContext<'_, U>) -> Result<()> {
Ok(())
}
@ -22,14 +22,10 @@ async fn top<U: HasOsuEnv>(
#[description = "Score listing style"] style: Option<ScoreListStyle>,
#[description = "Game mode"] mode: Option<Mode>,
#[description = "osu! username"] username: Option<String>,
#[description = "Discord username"] user: Option<User>,
#[description = "Discord username"] discord_name: Option<User>,
) -> Result<()> {
let env = ctx.data().osu_env();
let username_arg = match (username, user) {
(Some(v), _) => Some(UsernameArg::Raw(v)),
(_, Some(u)) => Some(UsernameArg::Tagged(u.id)),
(None, None) => None,
};
let username_arg = arg_from_username_or_discord(username, discord_name);
let ListingArgs {
nth,
style,
@ -68,10 +64,9 @@ async fn top<U: HasOsuEnv>(
ctx.send({
CreateReply::default()
.content(format!(
"Here is the #{} top play by [`{}`](<{}>)",
"Here is the #{} top play by {}",
nth + 1,
user.username,
user.link()
user.mention()
))
.embed(
score_embed(&play, &beatmap, &content, user)
@ -88,11 +83,7 @@ async fn top<U: HasOsuEnv>(
Nth::All => {
let reply = ctx
.clone()
.reply(format!(
"Here are the top plays by [`{}`](<{}>)!",
user.username,
user.link()
))
.reply(format!("Here are the top plays by {}!", user.mention()))
.await?
.into_message()
.await?;
@ -103,3 +94,53 @@ async fn top<U: HasOsuEnv>(
}
Ok(())
}
/// Get an user's profile.
#[poise::command(slash_command)]
async fn profile<U: HasOsuEnv>(
ctx: CmdContext<'_, U>,
#[description = "Game mode"]
#[rename = "mode"]
mode_override: Option<Mode>,
#[description = "osu! username"] username: Option<String>,
#[description = "Discord username"] discord_name: Option<User>,
) -> Result<()> {
let env = ctx.data().osu_env();
let username_arg = arg_from_username_or_discord(username, discord_name);
let (mode, user) = user_header_or_default_id(username_arg, env, ctx.author().id).await?;
let mode = mode_override.unwrap_or(mode);
ctx.defer().await?;
let user = env
.client
.user(&UserID::ID(user.id), |f| f.mode(mode))
.await?;
match user {
Some(u) => {
let ex = UserExtras::from_user(env, &u, mode).await?;
ctx.send(
CreateReply::default()
.content(format!("Here is {}'s **{}** profile!", u.mention(), mode))
.embed(user_embed(u, ex)),
)
.await?;
}
None => {
ctx.reply("🔍 user not found!").await?;
}
};
Ok(())
}
fn arg_from_username_or_discord(
username: Option<String>,
discord_name: Option<User>,
) -> Option<UsernameArg> {
match (username, discord_name) {
(Some(v), _) => Some(UsernameArg::Raw(v)),
(_, Some(u)) => Some(UsernameArg::Tagged(u.id)),
(None, None) => None,
}
}

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

@ -1007,10 +1007,9 @@ pub async fn top(ctx: &Context, msg: &Message, mut args: Args) -> CommandResult
.send_message(&ctx, {
CreateMessage::new()
.content(format!(
"Here is the #{} top play by [`{}`](<{}>)",
"Here is the #{} top play by {}",
nth + 1,
user.username,
user.link()
user.mention()
))
.embed(
score_embed(&play, &beatmap, &content, user)
@ -1028,11 +1027,7 @@ pub async fn top(ctx: &Context, msg: &Message, mut args: Args) -> CommandResult
let reply = msg
.reply(
&ctx,
format!(
"Here are the top plays by [`{}`](<{}>)!",
user.username,
user.link()
),
format!("Here are the top plays by {}!", user.mention()),
)
.await?;
style
@ -1080,10 +1075,7 @@ async fn get_user(
.send_message(
&ctx,
CreateMessage::new()
.content(format!(
"{}: here is the user that you requested",
msg.author
))
.content(format!("Here is {}'s **{}** profile!", u.mention(), mode))
.embed(user_embed(u, ex)),
)
.await?;

8
youmubot/src/main.rs
View file

@ -265,12 +265,14 @@ async fn main() {
Box::pin(async move {
if let poise::FrameworkError::Command { error, ctx, .. } = err {
let reply = format!(
"Command '{}' returned error {:?}",
"Command '{}' returned error: {:?}",
ctx.invoked_command_name(),
error
);
ctx.reply(&reply).await.pls_ok();
println!("{}", reply)
println!("{}", reply);
ctx.send(poise::CreateReply::default().content(reply).ephemeral(true))
.await
.pls_ok();
} else {
eprintln!("Poise error: {:?}", err)
}