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

Update youmubot-core

Browse source
This commit is contained in:
Natsu Kagami 2024-02-18 00:29:58 +01:00 • committed by Natsu Kagami
parent 3f115eaab0
commit 08d639944e
10 changed files with 167 additions and 354 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,6 @@
use futures_util::{stream, TryStreamExt};
use serenity::{
builder::GetMessages,
framework::standard::{
macros::{command, group},
Args, CommandResult,
@ -31,7 +32,7 @@ async fn clean(ctx: &Context, msg: &Message, mut args: Args) -> CommandResult {
let limit = args.single().unwrap_or(10);
let messages = msg
.channel_id
.messages(&ctx.http, |b| b.before(msg.id).limit(limit))
.messages(&ctx.http, GetMessages::new().before(msg.id).limit(limit))
.await?;
let channel = msg.channel_id.to_channel(&ctx).await?;
match &channel {

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

@ -7,9 +7,7 @@ use serenity::{
channel::Message,
id::{GuildId, RoleId, UserId},
},
CacheAndHttp,
};
use std::sync::Arc;
use youmubot_prelude::*;
#[command]
@ -45,7 +43,7 @@ pub async fn soft_ban(ctx: &Context, msg: &Message, mut args: Args) -> CommandRe
Some(v) => v,
};
let mut member = guild.member(&ctx, &user).await?;
let member = guild.member(&ctx, &user).await?;
match duration {
None if member.roles.contains(&role) => {
msg.reply(&ctx, format!("⛓ Lifting soft-ban for user {}.", user.tag()))
@ -85,7 +83,7 @@ pub async fn soft_ban(ctx: &Context, msg: &Message, mut args: Args) -> CommandRe
pub async fn soft_ban_init(ctx: &Context, msg: &Message, mut args: Args) -> CommandResult {
let role_id = args.single::<RoleId>()?;
let data = ctx.data.read().await;
let guild = msg.guild(ctx).unwrap();
let guild = msg.guild_id.unwrap().to_partial_guild(&ctx).await?;
// Check whether the role_id is the one we wanted
if !guild.roles.contains_key(&role_id) {
return Err(Error::msg(format!("{} is not a role in this server.", role_id)).into());
@ -105,7 +103,7 @@ pub async fn soft_ban_init(ctx: &Context, msg: &Message, mut args: Args) -> Comm
}
// Watch the soft bans. Blocks forever.
pub async fn watch_soft_bans(cache_http: Arc<CacheAndHttp>, data: AppData) {
pub async fn watch_soft_bans(cache_http: impl CacheHttp, data: AppData) {
loop {
// Scope so that locks are released
{
@ -115,7 +113,7 @@ pub async fn watch_soft_bans(cache_http: Arc<CacheAndHttp>, data: AppData) {
let mut db = data.borrow().unwrap().clone();
let now = Utc::now();
for (server_id, bans) in db.iter_mut() {
let server_name: String = match server_id.to_partial_guild(&*cache_http.http).await
let server_name: String = match server_id.to_partial_guild(cache_http.http()).await
{
Err(_) => continue,
Ok(v) => v.name,
@ -153,17 +151,17 @@ pub async fn watch_soft_bans(cache_http: Arc<CacheAndHttp>, data: AppData) {
}
async fn lift_soft_ban_for(
cache_http: &CacheAndHttp,
cache_http: impl CacheHttp,
server_id: GuildId,
server_name: &str,
ban_role: RoleId,
user_id: UserId,
) -> Result<()> {
let mut m = server_id.member(cache_http, user_id).await?;
let m = server_id.member(&cache_http, user_id).await?;
println!(
"Soft-ban for `{}` in server `{}` unlifted.",
m.user.name, server_name
);
m.remove_role(&cache_http.http, ban_role).await?;
m.remove_role(cache_http.http(), ban_role).await?;
Ok(())
}