From 7485c7f7d7b79f037cd853dd96a44e9ee1af31fe Mon Sep 17 00:00:00 2001
From: Dragory <2606411+Dragory@users.noreply.github.com>
Date: Wed, 8 Apr 2020 21:05:46 +0300
Subject: [PATCH] automod: allow warn/mute/kick/ban for username, nickname, and
 custom status matching

---
 backend/src/plugins/Automod/Automod.ts | 36 +++++++++++++++++++++++---
 1 file changed, 32 insertions(+), 4 deletions(-)

diff --git a/backend/src/plugins/Automod/Automod.ts b/backend/src/plugins/Automod/Automod.ts
index f616901c..2d2dfbc1 100644
--- a/backend/src/plugins/Automod/Automod.ts
+++ b/backend/src/plugins/Automod/Automod.ts
@@ -1030,7 +1030,14 @@ export class AutomodPlugin extends ZeppelinPlugin<TConfigSchema, ICustomOverride
       };
 
       let membersToWarn = [];
-      if (matchResult.type === "message" || matchResult.type === "embed" || matchResult.type === "other") {
+      if (
+        matchResult.type === "message" ||
+        matchResult.type === "embed" ||
+        matchResult.type === "other" ||
+        matchResult.type === "username" ||
+        matchResult.type === "nickname" ||
+        matchResult.type === "customstatus"
+      ) {
         membersToWarn = [await this.getMember(matchResult.userId)];
       } else if (matchResult.type === "textspam" || matchResult.type === "otherspam") {
         for (const id of spamUserIdsToAction) {
@@ -1057,7 +1064,14 @@ export class AutomodPlugin extends ZeppelinPlugin<TConfigSchema, ICustomOverride
       const contactMethods = this.readContactMethodsFromAction(rule.actions.mute);
 
       let userIdsToMute = [];
-      if (matchResult.type === "message" || matchResult.type === "embed" || matchResult.type === "other") {
+      if (
+        matchResult.type === "message" ||
+        matchResult.type === "embed" ||
+        matchResult.type === "other" ||
+        matchResult.type === "username" ||
+        matchResult.type === "nickname" ||
+        matchResult.type === "customstatus"
+      ) {
         userIdsToMute = [matchResult.userId];
       } else if (matchResult.type === "textspam" || matchResult.type === "otherspam") {
         userIdsToMute.push(...spamUserIdsToAction);
@@ -1081,7 +1095,14 @@ export class AutomodPlugin extends ZeppelinPlugin<TConfigSchema, ICustomOverride
       const contactMethods = this.readContactMethodsFromAction(rule.actions.kick);
 
       let membersToKick = [];
-      if (matchResult.type === "message" || matchResult.type === "embed" || matchResult.type === "other") {
+      if (
+        matchResult.type === "message" ||
+        matchResult.type === "embed" ||
+        matchResult.type === "other" ||
+        matchResult.type === "username" ||
+        matchResult.type === "nickname" ||
+        matchResult.type === "customstatus"
+      ) {
         membersToKick = [await this.getMember(matchResult.userId)];
       } else if (matchResult.type === "textspam" || matchResult.type === "otherspam") {
         for (const id of spamUserIdsToAction) {
@@ -1107,7 +1128,14 @@ export class AutomodPlugin extends ZeppelinPlugin<TConfigSchema, ICustomOverride
       const contactMethods = this.readContactMethodsFromAction(rule.actions.ban);
 
       let userIdsToBan = [];
-      if (matchResult.type === "message" || matchResult.type === "embed" || matchResult.type === "other") {
+      if (
+        matchResult.type === "message" ||
+        matchResult.type === "embed" ||
+        matchResult.type === "other" ||
+        matchResult.type === "username" ||
+        matchResult.type === "nickname" ||
+        matchResult.type === "customstatus"
+      ) {
         userIdsToBan = [matchResult.userId];
       } else if (matchResult.type === "textspam" || matchResult.type === "otherspam") {
         userIdsToBan.push(...spamUserIdsToAction);