ReVanced/revanced-discord-bot
1
0
Fork 0
mirror of https://github.com/revanced/revanced-discord-bot.git synced 2025-05-29 05:10:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat: use Mutex instead of Cell

Browse Source
This commit is contained in:
Ushie 2023-05-13 01:28:09 +03:00 committed by oSumAtrIX
parent 128f43b232
commit 63f8cdd509
No known key found for this signature in database
GPG Key ID: A9B3094ACDB604B4
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/utils/moderation.rs
View File

@ -1,8 +1,9 @@
use std::cell::Cell;
use std::cmp; use std::cmp;
use std::ops::DerefMut;
use std::sync::Arc; use std::sync::Arc;
use mongodb::options::FindOptions; use mongodb::options::FindOptions;
use std::sync::Mutex;
use poise::serenity_prelude::{ChannelId, GuildChannel, GuildId, Mentionable, User, UserId}; use poise::serenity_prelude::{ChannelId, GuildChannel, GuildId, Mentionable, User, UserId};
use tokio::task::JoinHandle; use tokio::task::JoinHandle;
use tracing::{debug, error, warn}; use tracing::{debug, error, warn};
@ -123,7 +124,7 @@ pub async fn respond_moderation<'a>(
configuration: &Configuration, configuration: &Configuration,
) -> Result<(), Error> { ) -> Result<(), Error> {
let current_user = ctx.serenity_context().http.get_current_user().await?; let current_user = ctx.serenity_context().http.get_current_user().await?;
let send_as_ephemeral = Cell::new(false); let send_as_ephemeral = Mutex::new(false);
let create_embed = |f: &mut serenity::CreateEmbed| { let create_embed = |f: &mut serenity::CreateEmbed| {
let mut moderated_user: Option<&User> = None; let mut moderated_user: Option<&User> = None;
@ -134,7 +135,8 @@ pub async fn respond_moderation<'a>(
let embed = match error { let embed = match error {
Some(err) => { Some(err) => {
send_as_ephemeral.set(true); let mut send_as_ephemeral = send_as_ephemeral.lock().unwrap().deref_mut();
*send_as_ephemeral = true;
f.title(format!("Failed to mute {}", user.tag())) f.title(format!("Failed to mute {}", user.tag()))
.field("Exception", err.to_string(), false) .field("Exception", err.to_string(), false)
.field( .field(
@ -165,7 +167,8 @@ pub async fn respond_moderation<'a>(
moderated_user = Some(user); moderated_user = Some(user);
match error { match error {
Some(err) => { Some(err) => {
send_as_ephemeral.set(true); let mut send_as_ephemeral = send_as_ephemeral.lock().unwrap().deref_mut();
*send_as_ephemeral = true;
f.title(format!("Failed to unmute {}", user.tag())) f.title(format!("Failed to unmute {}", user.tag()))
.field("Exception", err.to_string(), false) .field("Exception", err.to_string(), false)
.field( .field(
@ -189,7 +192,8 @@ pub async fn respond_moderation<'a>(
moderated_user = Some(user); moderated_user = Some(user);
let f = match error { let f = match error {
Some(err) => { Some(err) => {
send_as_ephemeral.set(true); let mut send_as_ephemeral = send_as_ephemeral.lock().unwrap().deref_mut();
*send_as_ephemeral = true;
f.title(format!("Failed to ban {}", user.tag())) f.title(format!("Failed to ban {}", user.tag()))
.field("Exception", err.to_string(), false) .field("Exception", err.to_string(), false)
.field( .field(
@ -218,7 +222,8 @@ pub async fn respond_moderation<'a>(
moderated_user = Some(user); moderated_user = Some(user);
match error { match error {
Some(err) => { Some(err) => {
send_as_ephemeral.set(true); let mut send_as_ephemeral = send_as_ephemeral.lock().unwrap().deref_mut();
*send_as_ephemeral = true;
f.title(format!("Failed to unban {}", user.tag())) f.title(format!("Failed to unban {}", user.tag()))
.field("Exception", err.to_string(), false) .field("Exception", err.to_string(), false)
.field( .field(
@ -240,7 +245,8 @@ pub async fn respond_moderation<'a>(
}, },
ModerationKind::Lock(channel, author, error) => match error { ModerationKind::Lock(channel, author, error) => match error {
Some(err) => { Some(err) => {
send_as_ephemeral.set(true); let mut send_as_ephemeral = send_as_ephemeral.lock().unwrap().deref_mut();
*send_as_ephemeral = true;
f.title(format!("Failed to lock {} ", channel.name())) f.title(format!("Failed to lock {} ", channel.name()))
.field("Exception", err.to_string(), false) .field("Exception", err.to_string(), false)
.field( .field(
@ -266,7 +272,8 @@ pub async fn respond_moderation<'a>(
}, },
ModerationKind::Unlock(channel, author, error) => match error { ModerationKind::Unlock(channel, author, error) => match error {
Some(err) => { Some(err) => {
send_as_ephemeral.set(true); let mut send_as_ephemeral = send_as_ephemeral.lock().unwrap().deref_mut();
*send_as_ephemeral = true;
f.title(format!("Failed to unlock {}", channel.name())) f.title(format!("Failed to unlock {}", channel.name()))
.field("Exception", err.to_string(), false) .field("Exception", err.to_string(), false)
.field( .field(
@ -305,7 +312,9 @@ pub async fn respond_moderation<'a>(
let reply = ctx let reply = ctx
.send(|reply| { .send(|reply| {
reply.ephemeral(send_as_ephemeral.get()).embed(|embed| { reply
.ephemeral(*send_as_ephemeral.lock().unwrap())
.embed(|embed| {
create_embed(embed); create_embed(embed);
embed embed
}) })