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

feat add: roles whitelisting for auto responder

Browse Source
This commit is contained in:
oSumAtrIX 2023-07-10 00:02:40 +02:00
parent e49dd61b26
commit 3aab088c36
No known key found for this signature in database
GPG Key ID: A9B3094ACDB604B4
2 changed files with 35 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/model/application.rs
View File

@ -146,6 +146,7 @@ pub struct Author {
#[derive(Serialize, Deserialize)] #[derive(Serialize, Deserialize)]
pub struct Includes { pub struct Includes {
pub channels: Option<Vec<u64>>, pub channels: Option<Vec<u64>>,
pub roles: Option<Vec<u64>>,
#[serde(rename = "match", with = "serde_regex")] #[serde(rename = "match", with = "serde_regex")]
pub match_field: Vec<Regex>, pub match_field: Vec<Regex>,
} }

49
src/utils/message_response.rs
View File

@ -18,13 +18,46 @@ pub async fn handle_message_response(ctx: &serenity::Context, new_message: &sere
let responses = &data_lock.read().await.configuration.message_responses; let responses = &data_lock.read().await.configuration.message_responses;
let message = &new_message.content; let message = &new_message.content;
let mut guild_message = None;
let member = &new_message.member.as_ref().unwrap();
let member_roles = &member.roles;
let joined_at = member.joined_at.unwrap().unix_timestamp();
let must_joined_at = DateTime::<Utc>::from_utc(
NaiveDateTime::from_timestamp_opt(joined_at, 0).unwrap(),
Utc,
);
for response in responses { for response in responses {
if let Some(includes) = &response.includes { if let Some(includes) = &response.includes {
if let Some(roles) = &includes.roles {
// check if the role is whitelisted
if !roles.iter().any(|&role_id| {
member_roles
.iter()
.any(|&member_role| role_id == member_role.0)
}) {
continue;
}
}
if let Some(channels) = &includes.channels { if let Some(channels) = &includes.channels {
// check if the channel is whitelisted, if not, check if the channel is a thread, if it is check if the parent id is whitelisted // check if the channel is whitelisted, if not, check if the channel is a thread, if it is check if the parent id is whitelisted
if !channels.contains(&new_message.channel_id.0) { if !channels.contains(&new_message.channel_id.0) {
if response.thread_options.is_some() { if response.thread_options.is_some() {
let Some(parent_id) = new_message.channel(&ctx.http).await.unwrap().guild().unwrap().parent_id else { continue; }; if guild_message.is_none() {
guild_message = Some(
new_message
.channel(&ctx.http)
.await
.unwrap()
.guild()
.unwrap(),
);
};
let Some(parent_id) = guild_message.as_ref().unwrap().parent_id else { continue; };
if !channels.contains(&parent_id.0) { if !channels.contains(&parent_id.0) {
continue; continue;
} }
@ -44,7 +77,6 @@ pub async fn handle_message_response(ctx: &serenity::Context, new_message: &sere
if let Some(excludes) = &response.excludes { if let Some(excludes) = &response.excludes {
// check if the role is blacklisted // check if the role is blacklisted
if let Some(roles) = &excludes.roles { if let Some(roles) = &excludes.roles {
let member_roles = &new_message.member.as_ref().unwrap().roles;
if roles.iter().any(|&role_id| { if roles.iter().any(|&role_id| {
member_roles member_roles
.iter() .iter()
@ -59,19 +91,6 @@ pub async fn handle_message_response(ctx: &serenity::Context, new_message: &sere
let min_age = condition.user.server_age; let min_age = condition.user.server_age;
if min_age != 0 { if min_age != 0 {
let joined_at = ctx
.http
.get_member(new_message.guild_id.unwrap().0, new_message.author.id.0)
.await
.unwrap()
.joined_at
.unwrap()
.unix_timestamp();
let must_joined_at = DateTime::<Utc>::from_utc(
NaiveDateTime::from_timestamp_opt(joined_at, 0).unwrap(),
Utc,
);
let but_joined_at = Utc::now() - Duration::days(min_age); let but_joined_at = Utc::now() - Duration::days(min_age);
if must_joined_at <= but_joined_at { if must_joined_at <= but_joined_at {