Skip to content
This repository has been archived by the owner on Aug 7, 2024. It is now read-only.

Commit

Permalink
feat: media and logging channels and unban command
Browse files Browse the repository at this point in the history
  • Loading branch information
oSumAtrIX committed Aug 28, 2022
1 parent b7d333c commit 4ab4c7e
Show file tree
Hide file tree
Showing 12 changed files with 322 additions and 234 deletions.
4 changes: 3 additions & 1 deletion configuration.example.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
"mute": {
"role": 0,
"take": [0]
}
},
"media_channels": [0],
"logging_channel": 0
},
"administrators": {
"roles": [0],
Expand Down
4 changes: 3 additions & 1 deletion configuration.revanced.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
"mute": {
"role": 953984696491061289,
"take": [996121272897519687, 965267139902705744, 995126555867086938]
}
},
"media_channels": [954148665646260314],
"logging_channel": 952987428786941952
},
"administrators": {
"roles": [955220417969262612],
Expand Down
39 changes: 18 additions & 21 deletions configuration.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,17 @@
"description": "The id of the role."
},
"take": {
"type": "array",
"items": {
"type": "integer"
},
"description": "A list of role ids which will be revoked from the user.",
"minItems": 1,
"uniqueItems": true
"$ref": "#/$defs/roles"
}
}
},
"media_channels": {
"$ref": "#/$defs/channels",
"description": "A list of channel ids where only media is allowed."
},
"logging_channel": {
"type": "integer",
"description": "The id of the channel to send logs to."
}
}
},
Expand All @@ -39,13 +41,8 @@
"description": "A list of role ids. Users with these roles have administrative privileges over this Discord bot."
},
"users": {
"type": "array",
"items": {
"type": "integer"
},
"description": "A list of user ids. Users with these ids have administrative privileges over this Discord bot.",
"minItems": 1,
"uniqueItems": true
"$ref": "#/$defs/users",
"description": "A list of user ids. Users with these ids have administrative privileges over this Discord bot."
}
},
"description": "The list of administrators to control the Discord bot."
Expand Down Expand Up @@ -127,16 +124,16 @@
"type": "integer",
"description": "The color of the embed."
},
"users": {
"$ref": "#/$defs/ids"
},
"roles": {
"type": "array",
"items": {
"type": "integer"
},
"description": "A list of role ids.",
"uniqueItems": true,
"minItems": 1
"$ref": "#/$defs/ids"
},
"channels": {
"$ref": "#/$defs/ids"
},
"ids": {
"type": "array",
"items": {
"type": "integer"
Expand Down
39 changes: 26 additions & 13 deletions src/commands/moderation.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ pub async fn unmute(

respond_moderation(
&ctx,
ModerationKind::Unmute(
&ModerationKind::Unmute(
queue_unmute_member(
&ctx.discord().http,
&data.database,
Expand All @@ -44,6 +44,7 @@ pub async fn unmute(
.unwrap(),
),
&member.user,
&configuration,
)
.await
}
Expand Down Expand Up @@ -174,8 +175,9 @@ pub async fn mute(

respond_moderation(
&ctx,
ModerationKind::Mute(reason, format!("<t:{}:F>", unmute_time.timestamp()), result),
&ModerationKind::Mute(reason, format!("<t:{}:F>", unmute_time.timestamp()), result),
&member.user,
&configuration,
)
.await
}
Expand Down Expand Up @@ -300,24 +302,35 @@ pub async fn ban(
#[description = "Amount of days to delete messages"] dmd: Option<u8>,
#[description = "Reason for the ban"] reason: Option<String>,
) -> Result<(), Error> {
respond_moderation(
&ctx,
ModerationKind::Ban(
reason.clone(),
ban_moderation(&ctx, BanKind::Ban(user.clone(), dmd, reason)).await,
),
&user,
)
.await
handle_ban(&ctx, &BanKind::Ban(user, dmd, reason)).await
}

/// Unban a user.
#[poise::command(slash_command)]
pub async fn unban(ctx: Context<'_>, #[description = "User"] user: User) -> Result<(), Error> {
handle_ban(&ctx, &BanKind::Unban(user)).await
}

async fn handle_ban(ctx: &Context<'_>, kind: &BanKind) -> Result<(), Error> {
let data = ctx.data().read().await;

let ban_result = ban_moderation(&ctx, &kind).await;

let moderated_user;
respond_moderation(
&ctx,
ModerationKind::Unban(ban_moderation(&ctx, BanKind::Unban(user.clone())).await),
&user,
&match kind {
BanKind::Ban(user, _, reason) => {
moderated_user = user;
ModerationKind::Ban(reason.clone(), ban_result)
},
BanKind::Unban(user) => {
moderated_user = user;
ModerationKind::Unban(ban_result)
},
},
&moderated_user,
&data.configuration,
)
.await
}
140 changes: 5 additions & 135 deletions src/events/message_create.rs
Original file line number Diff line number Diff line change
@@ -1,140 +1,10 @@
use chrono::{DateTime, Duration, NaiveDateTime, Utc};
use poise::serenity_prelude::Attachment;
use regex::Regex;
use tracing::debug;

use super::*;
use crate::utils::bot::get_data_lock;
use crate::utils::ocr;

fn contains_match(regex: &[Regex], text: &str) -> bool {
regex.iter().any(|r| r.is_match(text))
}

async fn attachments_contains(attachments: &[Attachment], regex: &[Regex]) -> bool {
for attachment in attachments {
debug!("Checking attachment {}", &attachment.url);

if !&attachment.content_type.as_ref().unwrap().contains("image") {
continue;
}

if contains_match(
regex,
&ocr::get_text_from_image_url(&attachment.url).await.unwrap(),
) {
return true;
}
}
false
}
use crate::utils::autorespond::auto_respond;
use crate::utils::media_channel::handle_media_channel;

pub async fn message_create(ctx: &serenity::Context, new_message: &serenity::Message) {
debug!("Received message: {}", new_message.content);

if new_message.guild_id.is_none() || new_message.author.bot {
return;
}

let data_lock = get_data_lock(ctx).await;
let responses = &data_lock.read().await.configuration.message_responses;

for response in responses {
// check if the message was sent in a channel that is included in the responder
if !response
.includes
.channels
.iter()
.any(|&channel_id| channel_id == new_message.channel_id.0)
{
continue;
}

let excludes = &response.excludes;
// check if the message was sent by a user that is not excluded from the responder
if excludes
.roles
.iter()
.any(|&role_id| role_id == new_message.author.id.0)
{
continue;
}

let message = &new_message.content;
let contains_attachments = !new_message.attachments.is_empty();

// check if the message does not match any of the excludes
if contains_match(&excludes.match_field.text, message) {
continue;
}

if contains_attachments
&& !excludes.match_field.ocr.is_empty()
&& attachments_contains(&new_message.attachments, &excludes.match_field.ocr).await
{
continue;
}

// check if the message does match any of the includes
if !(contains_match(&response.includes.match_field.text, message)
|| (contains_attachments
&& !response.includes.match_field.ocr.is_empty()
&& attachments_contains(
&new_message.attachments,
&response.includes.match_field.ocr,
)
.await))
{
continue;
}

let min_age = response.condition.user.server_age;

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(joined_at, 0), Utc);
let but_joined_at = Utc::now() - Duration::days(min_age);

if must_joined_at <= but_joined_at {
return;
}

new_message
.channel_id
.send_message(&ctx.http, |m| {
m.reference_message(new_message);
match &response.response.embed {
Some(embed) => m.embed(|e| {
e.title(&embed.title)
.description(&embed.description)
.color(embed.color)
.fields(embed.fields.iter().map(|field| {
(field.name.clone(), field.value.clone(), field.inline)
}))
.footer(|f| {
f.text(&embed.footer.text);
f.icon_url(&embed.footer.icon_url)
})
.thumbnail(&embed.thumbnail.url)
.image(&embed.image.url)
.author(|a| {
a.name(&embed.author.name).icon_url(&embed.author.icon_url)
})
}),
None => m.content(response.response.message.as_ref().unwrap()),
}
})
.await
.expect("Could not reply to message author.");
}
let is_media_channel = handle_media_channel(ctx, new_message).await;
if !is_media_channel {
auto_respond(ctx, new_message).await;
}
}
1 change: 1 addition & 0 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ async fn main() {
moderation::unmute(),
moderation::purge(),
moderation::ban(),
moderation::unban(),
misc::reply(),
];
poise::set_qualified_names(&mut commands);
Expand Down
2 changes: 2 additions & 0 deletions src/model/application.rs
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,8 @@ impl Configuration {
pub struct General {
pub embed_color: i32,
pub mute: Mute,
pub media_channels: Vec<u64>,
pub logging_channel: u64,
}

#[derive(Default, Serialize, Deserialize)]
Expand Down
Loading

0 comments on commit 4ab4c7e

Please sign in to comment.