Have invite filter send guild info with mod-alert.

2 files changed, 43 insertions, 7 deletions

diff --git a/bot/cogs/filtering.py b/bot/cogs/filtering.py
index 6b4469ceb..d3dc0f66e 100644
--- a/bot/cogs/filtering.py
+++ b/bot/cogs/filtering.py
@@ -1,6 +1,6 @@
 import logging
 import re
-from typing import Optional
+from typing import Optional, Union
 
 import discord.errors
 from dateutil.relativedelta import relativedelta
@@ -189,7 +189,25 @@ class Filtering:
 
                         log.debug(message)
 
-                        additional_embeds = msg.embeds if filter_name == "watch_rich_embeds" else None
+                        additional_embeds = None
+                        additional_embeds_msg = None
+
+                        if filter_name == "filter_invites":
+                            additional_embeds = []
+                            for invite, data in triggered.items():
+                                embed = discord.Embed(description=(
+                                    f"**Members:**\n{data['members']}\n"
+                                    f"**Active:**\n{data['active']}"
+                                ))
+                                embed.set_author(name=data["name"])
+                                embed.set_thumbnail(url=data["icon"])
+                                embed.set_footer(text=f"Guild Invite Code: {invite}")
+                                additional_embeds.append(embed)
+                            additional_embeds_msg = "For the following guild(s):"
+
+                        elif filter_name == "watch_rich_embeds":
+                            additional_embeds = msg.embeds
+                            additional_embeds_msg = "With the following embed(s):"
 
                         # Send pretty mod log embed to mod-alerts
                         await self.mod_log.send_log_message(
@@ -201,6 +219,7 @@ class Filtering:
                             channel_id=Channels.mod_alerts,
                             ping_everyone=Filter.ping_everyone,
                             additional_embeds=additional_embeds,
+                            additional_embeds_msg=additional_embeds_msg
                         )
 
                         break  # We don't want multiple filters to trigger
@@ -282,7 +301,7 @@ class Filtering:
 
         return bool(re.search(ZALGO_RE, text))
 
-    async def _has_invites(self, text: str) -> bool:
+    async def _has_invites(self, text: str) -> Union[dict, bool]:
         """
         Returns True if the text contains an invite which is not on the guild_invite_whitelist in
         config.yml
@@ -295,10 +314,13 @@ class Filtering:
         text = text.replace("\\", "")
 
         invites = re.findall(INVITE_RE, text, re.IGNORECASE)
+        invite_data = dict()
         for invite in invites:
+            if invite in invite_data:
+                continue
 
             response = await self.bot.http_session.get(
-                f"{URLs.discord_invite_api}/{invite}"
+                f"{URLs.discord_invite_api}/{invite}", params={"with_counts": "true"}
             )
             response = await response.json()
             guild = response.get("guild")
@@ -311,8 +333,20 @@ class Filtering:
             guild_id = int(guild.get("id"))
 
             if guild_id not in Filter.guild_invite_whitelist:
-                return True
-        return False
+                guild_icon_hash = guild["icon"]
+                guild_icon = (
+                    "https://cdn.discordapp.com/icons/"
+                    f"{guild_id}/{guild_icon_hash}.png?size=512"
+                )
+
+                invite_data[invite] = {
+                    "name": guild["name"],
+                    "icon": guild_icon,
+                    "members": response["approximate_member_count"],
+                    "active": response["approximate_presence_count"]
+                }
+
+        return invite_data if invite_data else False
 
     @staticmethod
     async def _has_rich_embed(msg: Message):
diff --git a/bot/cogs/modlog.py b/bot/cogs/modlog.py
index 495795b6d..65efda5ed 100644
--- a/bot/cogs/modlog.py
+++ b/bot/cogs/modlog.py
@@ -115,6 +115,7 @@ class ModLog:
             files: Optional[List[File]] = None,
             content: Optional[str] = None,
             additional_embeds: Optional[List[Embed]] = None,
+            additional_embeds_msg: Optional[str] = None,
             timestamp_override: Optional[datetime.datetime] = None,
             footer: Optional[str] = None,
     ):
@@ -143,7 +144,8 @@ class ModLog:
         log_message = await channel.send(content=content, embed=embed, files=files)
 
         if additional_embeds:
-            await channel.send("With the following embed(s):")
+            if additional_embeds_msg:
+                await channel.send(additional_embeds_msg)
             for additional_embed in additional_embeds:
                 await channel.send(embed=additional_embed)