From 1fcf57cf13e71c35d3d34847f91e759d00e98a80 Mon Sep 17 00:00:00 2001
From: Dragory <2606411+Dragory@users.noreply.github.com>
Date: Thu, 28 May 2020 03:28:25 +0300
Subject: [PATCH] automod: add guild info to matched invites

---
 backend/src/plugins/Automod/Automod.ts | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/backend/src/plugins/Automod/Automod.ts b/backend/src/plugins/Automod/Automod.ts
index cb68664d..e4aa1344 100644
--- a/backend/src/plugins/Automod/Automod.ts
+++ b/backend/src/plugins/Automod/Automod.ts
@@ -428,9 +428,9 @@ export class AutomodPlugin extends ZeppelinPlugin<TConfigSchema, ICustomOverride
   }
 
   /**
-   * @return Matched invite code
+   * @return Info about matched invite
    */
-  protected async evaluateMatchInvitesTrigger(trigger: TMatchInvitesTrigger, str: string): Promise<null | string> {
+  protected async evaluateMatchInvitesTrigger(trigger: TMatchInvitesTrigger, str: string): Promise<null | any> {
     const inviteCodes = getInviteCodesInString(str);
     if (inviteCodes.length === 0) return null;
 
@@ -438,22 +438,22 @@ export class AutomodPlugin extends ZeppelinPlugin<TConfigSchema, ICustomOverride
 
     for (const code of uniqueInviteCodes) {
       if (trigger.include_invite_codes && trigger.include_invite_codes.includes(code)) {
-        return code;
+        return { code };
       }
       if (trigger.exclude_invite_codes && !trigger.exclude_invite_codes.includes(code)) {
-        return code;
+        return { code };
       }
     }
 
     for (const inviteCode of uniqueInviteCodes) {
       const invite = await this.resolveInvite(inviteCode);
-      if (!invite) return inviteCode;
+      if (!invite) return { code: inviteCode };
 
       if (trigger.include_guilds && trigger.include_guilds.includes(invite.guild.id)) {
-        return inviteCode;
+        return { code: inviteCode, invite };
       }
       if (trigger.exclude_guilds && !trigger.exclude_guilds.includes(invite.guild.id)) {
-        return inviteCode;
+        return { code: inviteCode, invite };
       }
     }
 
@@ -1499,7 +1499,10 @@ export class AutomodPlugin extends ZeppelinPlugin<TConfigSchema, ICustomOverride
     } else if (matchResult.trigger === "match_regex") {
       return `regex \`${disableInlineCode(matchResult.matchedValue)}\``;
     } else if (matchResult.trigger === "match_invites") {
-      return `invite code \`${disableInlineCode(matchResult.matchedValue)}\``;
+      if (matchResult.matchedValue.invite) {
+        return `invite code \`${matchResult.matchedValue.code}\` (**${matchResult.matchedValue.invite.guild.name}**, \`${matchResult.matchedValue.invite.guild.id}\`)`;
+      }
+      return `invite code \`${disableInlineCode(matchResult.matchedValue.code)}\``;
     } else if (matchResult.trigger === "match_links") {
       return `link \`${disableInlineCode(matchResult.matchedValue)}\``;
     } else if (matchResult.trigger === "match_attachment_type") {