ReVanced/revanced-discord-bot
1
0
Fork 0
mirror of https://github.com/revanced/revanced-discord-bot.git synced 2025-04-30 06:24:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(moderation): properly schedule unmutes

Browse Source
This commit is contained in:
Ax333l 2023-01-04 14:53:50 +01:00
parent 6b08dfd68c
commit 503e095bd0
2 changed files with 30 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/commands/moderation.rs
View File

@ -246,23 +246,7 @@ pub async fn mute(
let discord = ctx.discord(); let discord = ctx.discord();
let cache = &discord.cache; let cache = &discord.cache;
if let Some(pending_unmute) = data.pending_unmutes.get(&id.0) {
trace!("Cancelling pending unmute for {}", id.0);
pending_unmute.abort();
}
let unmute_time = if !mute_duration.is_zero() { let unmute_time = if !mute_duration.is_zero() {
data.pending_unmutes.insert(
id.0,
queue_unmute_member(
discord.clone(),
data.database.clone(),
guild_id,
id,
mute.role,
mute_duration.num_seconds() as u64,
),
);
Some((now + mute_duration).timestamp() as u64) Some((now + mute_duration).timestamp() as u64)
} else { } else {
None None
@ -303,6 +287,11 @@ pub async fn mute(
) )
.await?; .await?;
if let Some(pending_unmute) = data.pending_unmutes.get(&id.0) {
trace!("Cancelling pending unmute for {}", id.0);
pending_unmute.abort();
}
if unmute_time.is_none() { if unmute_time.is_none() {
data.database data.database
.update::<Muted>( .update::<Muted>(
@ -312,6 +301,18 @@ pub async fn mute(
None, None,
) )
.await?; .await?;
} else {
data.pending_unmutes.insert(
id.0,
queue_unmute_member(
discord.clone(),
data.database.clone(),
guild_id,
id,
mute.role,
mute_duration.num_seconds() as u64,
),
);
} }
Ok(()) Ok(())
} }

37
src/events/ready.rs
View File

@ -1,5 +1,4 @@
use chrono::Utc; use chrono::Utc;
use tracing::trace;
use super::*; use super::*;
use crate::db::model::Muted; use crate::db::model::Muted;
@ -24,34 +23,24 @@ pub async fn load_muted_members(ctx: &serenity::Context, _: &serenity::Ready) {
.await .await
.unwrap(); .unwrap();
let http_ref = &ctx.http;
while cursor.advance().await.unwrap() { while cursor.advance().await.unwrap() {
let current: Muted = cursor.deserialize_current().unwrap(); let current: Muted = cursor.deserialize_current().unwrap();
let Some(expires) = current.expires else { continue }; let Some(expires) = current.expires else { continue };
let guild_id = current.guild_id.unwrap().parse::<u64>().unwrap(); let guild_id = current.guild_id.unwrap().parse::<u64>().unwrap();
let member_id = current.user_id.unwrap().parse::<u64>().unwrap(); let user_id = current.user_id.unwrap().parse::<u64>().unwrap();
if let Ok(guild) = http_ref.get_guild(guild_id).await { let amount_left = std::cmp::max(expires as i64 - Utc::now().timestamp(), 0);
if let Ok(member) = guild.member(http_ref, member_id).await {
let amount_left = std::cmp::max(expires as i64 - Utc::now().timestamp(), 0);
data.pending_unmutes.insert( data.pending_unmutes.insert(
member.user.id.0, user_id,
queue_unmute_member( queue_unmute_member(
ctx.clone(), ctx.clone(),
data.database.clone(), data.database.clone(),
member.guild_id, serenity::GuildId(guild_id),
member.user.id, serenity::UserId(user_id),
mute_role_id, mute_role_id,
amount_left as u64, // i64 as u64 is handled properly here amount_left as u64, // i64 as u64 is handled properly here
), ),
); );
} else {
trace!("Failed to find member {} in guild {}", member_id, guild_id);
}
} else {
trace!("Guild {} unavailable", guild_id);
}
} }
} }