From cb4beacf8a4063d5009fd69c4c89aceedc0b0387 Mon Sep 17 00:00:00 2001
From: Dragory <2606411+Dragory@users.noreply.github.com>
Date: Thu, 28 May 2020 00:55:09 +0300
Subject: [PATCH] automod: add affects_bots

---
 backend/src/plugins/Automod/Automod.ts | 11 ++++++++---
 backend/src/plugins/Automod/types.ts   |  1 +
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/backend/src/plugins/Automod/Automod.ts b/backend/src/plugins/Automod/Automod.ts
index 74cf4ece..cb68664d 100644
--- a/backend/src/plugins/Automod/Automod.ts
+++ b/backend/src/plugins/Automod/Automod.ts
@@ -260,6 +260,10 @@ export class AutomodPlugin extends ZeppelinPlugin<TConfigSchema, ICustomOverride
           rule["enabled"] = true;
         }
 
+        if (rule["affects_bots"] == null) {
+          rule["affects_bots"] = false;
+        }
+
         // Loop through the rule's triggers
         if (rule["triggers"]) {
           for (const trigger of rule["triggers"]) {
@@ -1509,7 +1513,6 @@ export class AutomodPlugin extends ZeppelinPlugin<TConfigSchema, ICustomOverride
    * Run automod actions on new messages
    */
   protected onMessageCreate(msg: SavedMessage) {
-    if (msg.is_bot) return;
     if (this.actionedMessageIds.includes(msg.id)) return;
 
     this.automodQueue.add(async () => {
@@ -1524,6 +1527,8 @@ export class AutomodPlugin extends ZeppelinPlugin<TConfigSchema, ICustomOverride
         channelId: msg.channel_id,
       });
       for (const [name, rule] of Object.entries(config.rules)) {
+        if (msg.is_bot && !rule.affects_bots) continue;
+
         const matchResult = await this.matchRuleToMessage(rule, msg);
         if (matchResult) {
           // Make sure the message still exists in our database when we try to apply actions on it.
@@ -1552,8 +1557,6 @@ export class AutomodPlugin extends ZeppelinPlugin<TConfigSchema, ICustomOverride
    */
   @d.event("guildMemberAdd")
   protected onMemberJoin(_, member: Member) {
-    if (member.user.bot) return;
-
     this.automodQueue.add(async () => {
       if (this.unloaded) return;
 
@@ -1568,6 +1571,8 @@ export class AutomodPlugin extends ZeppelinPlugin<TConfigSchema, ICustomOverride
       const config = this.getConfigForMember(member);
 
       for (const [name, rule] of Object.entries(config.rules)) {
+        if (member.user.bot && !rule.affects_bots) continue;
+
         const spamMatch = await this.matchOtherSpamInRule(rule, member.id);
         if (spamMatch) {
           await this.applyActionsOnMatch(rule, spamMatch);
diff --git a/backend/src/plugins/Automod/types.ts b/backend/src/plugins/Automod/types.ts
index e315122e..153d94ee 100644
--- a/backend/src/plugins/Automod/types.ts
+++ b/backend/src/plugins/Automod/types.ts
@@ -302,6 +302,7 @@ export const Rule = t.type({
   enabled: t.boolean,
   name: t.string,
   presets: tNullable(t.array(t.string)),
+  affects_bots: t.boolean,
   triggers: t.array(
     t.type({
       match_words: tNullable(MatchWordsTrigger),