nki/youmubot
1
0
Fork 0
mirror of https://github.com/natsukagami/youmubot.git synced 2025-05-24 17:20:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix User/Role/Channel id parsing (#35)

Browse source 
* Import thiserror to make nicer errors

* Create wrappers for id that exposes old parsing behavior (from mentions)

* Use id wrappers when parsing parameters
This commit is contained in:
Natsu Kagami 2024-02-28 18:02:42 +00:00 • committed by GitHub
parent 431f295b41
commit b4cf6ce94f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 91 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

9
youmubot-core/src/admin/mod.rs
View file

@ -5,10 +5,7 @@ use serenity::{
macros::{command, group},
Args, CommandResult,
},
model::{
channel::{Channel, Message},
id::UserId,
},
model::channel::{Channel, Message},
};
use soft_ban::{SOFT_BAN_COMMAND, SOFT_BAN_INIT_COMMAND};
use youmubot_prelude::*;
@ -69,7 +66,7 @@ async fn clean(ctx: &Context, msg: &Message, mut args: Args) -> CommandResult {
#[max_args(2)]
#[only_in("guilds")]
async fn ban(ctx: &Context, msg: &Message, mut args: Args) -> CommandResult {
let user = args.single::<UserId>()?.to_user(&ctx).await?;
let user = args.single::<UserId>()?.0.to_user(&ctx).await?;
let reason = args.single::<String>().map(|v| format!("`{}`", v)).ok();
let dmds = args.single::<u8>().unwrap_or(0);
@ -105,7 +102,7 @@ async fn ban(ctx: &Context, msg: &Message, mut args: Args) -> CommandResult {
#[num_args(1)]
#[only_in("guilds")]
async fn kick(ctx: &Context, msg: &Message, mut args: Args) -> CommandResult {
let user = args.single::<UserId>()?.to_user(&ctx).await?;
let user = args.single::<UserId>()?.0.to_user(&ctx).await?;
msg.reply(&ctx, format!("🔫 Kicking user {}.", user.tag()))
.await?;

15
youmubot-core/src/admin/soft_ban.rs
View file

@ -3,10 +3,7 @@ use chrono::offset::Utc;
use futures_util::{stream, TryStreamExt};
use serenity::{
framework::standard::{macros::command, Args, CommandResult},
model::{
channel::Message,
id::{GuildId, RoleId, UserId},
},
model::{channel::Message, id},
};
use youmubot_prelude::*;
@ -19,7 +16,7 @@ use youmubot_prelude::*;
#[max_args(2)]
#[only_in("guilds")]
pub async fn soft_ban(ctx: &Context, msg: &Message, mut args: Args) -> CommandResult {
let user = args.single::<UserId>()?.to_user(&ctx).await?;
let user = args.single::<UserId>()?.0.to_user(&ctx).await?;
let data = ctx.data.read().await;
let duration = if args.is_empty() {
None
@ -81,7 +78,7 @@ pub async fn soft_ban(ctx: &Context, msg: &Message, mut args: Args) -> CommandRe
#[num_args(1)]
#[only_in("guilds")]
pub async fn soft_ban_init(ctx: &Context, msg: &Message, mut args: Args) -> CommandResult {
let role_id = args.single::<RoleId>()?;
let role_id = args.single::<RoleId>()?.0;
let data = ctx.data.read().await;
let guild = msg.guild_id.unwrap().to_partial_guild(&ctx).await?;
// Check whether the role_id is the one we wanted
@ -152,10 +149,10 @@ pub async fn watch_soft_bans(cache_http: impl CacheHttp, data: AppData) {
async fn lift_soft_ban_for(
cache_http: impl CacheHttp,
server_id: GuildId,
server_id: id::GuildId,
server_name: &str,
ban_role: RoleId,
user_id: UserId,
ban_role: id::RoleId,
user_id: id::UserId,
) -> Result<()> {
let m = server_id.member(&cache_http, user_id).await?;
println!(