Compare commits
2 commits
ff7994686d
...
3e1d1e4a1f
Author | SHA1 | Date | |
---|---|---|---|
3e1d1e4a1f | |||
880330576d |
5 changed files with 25 additions and 10 deletions
|
@ -138,6 +138,9 @@ pub struct Exprs {
|
|||
/// forgejo-guard configuration
|
||||
#[derive(Deserialize)]
|
||||
pub struct Config {
|
||||
/// Dry run, without banning the users
|
||||
#[serde(default)]
|
||||
pub dry_run: bool,
|
||||
/// Configuration for the forgejo guard itself
|
||||
pub forgejo: Forgejo,
|
||||
/// Configuration of the telegram bot
|
||||
|
|
|
@ -40,6 +40,7 @@ async fn try_main() -> error::GuardResult<()> {
|
|||
let (sus_sender, sus_receiver) = sync::mpsc::channel::<forgejo_api::ForgejoUser>(100);
|
||||
|
||||
tracing::info!("The instance: {}", config.forgejo.instance);
|
||||
tracing::info!("Dry run: {}", config.dry_run);
|
||||
tracing::debug!("The config exprs: {:#?}", config.expressions);
|
||||
|
||||
rust_i18n::set_locale(config.telegram.lang.as_str());
|
||||
|
|
|
@ -30,7 +30,8 @@ use teloxide::{
|
|||
|
||||
use crate::{config::Config, forgejo_api};
|
||||
|
||||
/// Inline keyboard with a single button that links to the Forgejo Guardian repository.
|
||||
/// Inline keyboard with a single button that links to the Forgejo Guardian
|
||||
/// repository.
|
||||
fn source_inline_keyboard(text: &str) -> InlineKeyboardMarkup {
|
||||
InlineKeyboardMarkup::new([[InlineKeyboardButton::new(
|
||||
text,
|
||||
|
@ -58,7 +59,8 @@ pub async fn callback_handler(
|
|||
match command {
|
||||
"b" => {
|
||||
// ban the user
|
||||
let button_text = if forgejo_api::ban_user(
|
||||
let button_text = if config.dry_run
|
||||
|| forgejo_api::ban_user(
|
||||
&Client::new(),
|
||||
&config.forgejo.instance,
|
||||
&config.forgejo.token,
|
||||
|
@ -67,6 +69,7 @@ pub async fn callback_handler(
|
|||
.await
|
||||
.is_ok()
|
||||
{
|
||||
tracing::info!("Suspicious user @{data} has been blocked");
|
||||
t!("messages.ban_success")
|
||||
} else {
|
||||
t!("messages.ban_failed")
|
||||
|
|
|
@ -26,7 +26,11 @@ pub trait ExprChecker {
|
|||
|
||||
impl ExprChecker for Expr {
|
||||
fn is_match<'a>(&'a self, user: &ForgejoUser) -> Option<Regex> {
|
||||
let one_of = |hay, exprs: &'a Vec<Regex>| exprs.iter().find(|re| re.is_match(hay));
|
||||
let one_of = |hay: &str, exprs: &'a Vec<Regex>| {
|
||||
exprs
|
||||
.iter()
|
||||
.find(|re| hay.split('\n').any(|line| re.is_match(line.trim())))
|
||||
};
|
||||
[
|
||||
one_of(&user.username, &self.usernames),
|
||||
one_of(&user.full_name, &self.full_names),
|
||||
|
|
|
@ -62,6 +62,10 @@ async fn check_new_user(
|
|||
) {
|
||||
if let Some(re) = config.expressions.ban.is_match(&user) {
|
||||
tracing::info!("@{} has been banned because `{re}`", user.username);
|
||||
if config.dry_run {
|
||||
return;
|
||||
}
|
||||
|
||||
if let Err(err) = forgejo_api::ban_user(
|
||||
request_client,
|
||||
&config.forgejo.instance,
|
||||
|
|
Loading…
Reference in a new issue