Skip to content

extendedmodlog & spam: make URLs unclickable #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

extendedmodlog & spam: make URLs unclickable #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d6475a
extendedmodlog: make URLs unclickable
xLive Sep 5, 2025
3988337
spam: make URLs unclickable
xLive Sep 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions extendedmodlog/eventmixin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import asyncio
import datetime
import logging
from typing import Sequence, Union, cast, Optional, Tuple
from typing import Sequence, Union, cast, Optional, Tuple, Pattern
import re

import discord
from discord.ext.commands.converter import Converter
Expand All @@ -20,6 +21,9 @@
_ = Translator("ExtendedModLog", __file__)
logger = logging.getLogger("red.trusty-cogs.ExtendedModLog")

LINK_RE: Pattern = re.compile(
r"https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_\+.~#?&//=]*)", re.I
)

class CommandPrivs(Converter):
"""
Expand Down Expand Up @@ -380,8 +384,9 @@ async def _cached_message_delete(
channel=message_channel,
)
if embed_links:
filtered_content = LINK_RE.sub(r"\g<0>​", message.content) # make urls unclickable
embed = discord.Embed(
description=f"{message.author.mention}: {message.content}",
description=f"{message.author.mention}: {filtered_content}",
colour=await self.get_event_colour(guild, "message_delete"),
timestamp=time,
)
Expand Down
10 changes: 7 additions & 3 deletions spam/spam.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@
r"(?:https?\:\/\/)?discord(?:\.gg|(?:app)?\.com\/invite)\/([a-zA-Z0-9]+)", re.I
)

LINK_RE: Pattern = re.compile(
r"https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_\+.~#?&//=]*)", re.I
)


class spam(commands.Cog):
""" MTA:SA Spam Cog """
Expand Down Expand Up @@ -189,7 +193,7 @@ async def on_message(self, ctx):
if feed:
embed = discord.Embed(colour=discord.Colour(0xf5a623), description="Spam protection deleted an invite (Whitelist) in <#"+str(ctx.channel.id)+">")
embed.add_field(name="**Author:**", value="<@"+str(ctx.author.id)+">", inline=False)
embed.add_field(name="**Message:**", value=ctx.content, inline=False)
embed.add_field(name="**Message:**", value=LINK_RE.sub(r"\g<0>​", ctx.content), inline=False) # make urls unclickable
await self.bot.get_channel(int(await self.config.guild(ctx.guild).feed())).send(embed=embed)
return

Expand All @@ -201,7 +205,7 @@ async def on_message(self, ctx):
if feed:
embed = discord.Embed(colour=discord.Colour(0xf5a623), description="Spam protection deleted an invite (Blocked) in <#"+str(ctx.channel.id)+">")
embed.add_field(name="**Author:**", value="<@"+str(ctx.author.id)+">", inline=False)
embed.add_field(name="**Message:**", value=ctx.content, inline=False)
embed.add_field(name="**Message:**", value=LINK_RE.sub(r"\g<0>​", ctx.content), inline=False) # make urls unclickable
await self.bot.get_channel(int(await self.config.guild(ctx.guild).feed())).send(embed=embed)
return await ctx.delete()

Expand All @@ -212,7 +216,7 @@ async def on_message(self, ctx):
if feed:
embed = discord.Embed(colour=discord.Colour(0xf5a623), description="Spam protection deleted a message in <#"+str(ctx.channel.id)+">")
embed.add_field(name="**Author:**", value="<@"+str(ctx.author.id)+">", inline=False)
embed.add_field(name="**Message:**", value=ctx.content, inline=False)
embed.add_field(name="**Message:**", value=LINK_RE.sub(r"\g<0>​", ctx.content), inline=False) # make urls unclickable
await self.bot.get_channel(int(await self.config.guild(ctx.guild).feed())).send(embed=embed)
await ctx.delete()
return
Expand Down