Fix ghoul message spam
This commit is contained in:
parent
c6786a77f7
commit
2901ed3be2
2
Cargo.lock
generated
2
Cargo.lock
generated
@ -1093,7 +1093,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "fren"
|
name = "fren"
|
||||||
version = "2.4.0"
|
version = "2.4.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"axum 0.8.1",
|
"axum 0.8.1",
|
||||||
"base64 0.22.1",
|
"base64 0.22.1",
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "fren"
|
name = "fren"
|
||||||
version = "2.4.0"
|
version = "2.4.1"
|
||||||
edition = "2024"
|
edition = "2024"
|
||||||
|
|
||||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||||
|
|||||||
@ -12,6 +12,7 @@ use rand::{Rng, rng};
|
|||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
use std::fmt::Debug;
|
use std::fmt::Debug;
|
||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
|
use crate::discord::get_role;
|
||||||
|
|
||||||
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
|
#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
|
||||||
#[serde(tag = "type")]
|
#[serde(tag = "type")]
|
||||||
@ -243,6 +244,14 @@ impl Listener {
|
|||||||
trigger_event.channel_id.say(ctx.http(), msg).await?;
|
trigger_event.channel_id.say(ctx.http(), msg).await?;
|
||||||
}
|
}
|
||||||
Action::Ghoulify { hours } => {
|
Action::Ghoulify { hours } => {
|
||||||
|
// slight hack to prevent ghoul spamming
|
||||||
|
let ghoul_role = get_role(&ctx.http, data.cfg.guild_id, &UserRole::Ghoul.to_string()).await?;
|
||||||
|
if let Ok(user) = data.cfg.guild_id.member(&ctx.http(), trigger_event.triggerer).await
|
||||||
|
&& let Some(ghoul_role) = ghoul_role
|
||||||
|
&& user.roles.contains(&ghoul_role) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
User::add_role(
|
User::add_role(
|
||||||
ctx.http(),
|
ctx.http(),
|
||||||
&data.db,
|
&data.db,
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user