From b550698ed8b42616222fe529dd882bfc370df154 Mon Sep 17 00:00:00 2001 From: khsaad04 Date: Mon, 9 Sep 2024 23:30:29 +0600 Subject: [PATCH 1/4] delete warning messages for sending invites after 5s --- cogs/listeners.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cogs/listeners.py b/cogs/listeners.py index 616f73c..b21aaf3 100644 --- a/cogs/listeners.py +++ b/cogs/listeners.py @@ -270,7 +270,7 @@ async def invite_in_message_edit(self, _: discord.Message, after: discord.Messag if re.search(invite_regex, after.content): await after.delete() return await after.channel.send( - "Please don't send invite links in this server!" + "Please don't send invite links in this server!", delete_after=5 ) @commands.Cog.listener("on_message") @@ -293,7 +293,7 @@ async def invite_in_message(self, message: discord.Message): # why are we checking again? await message.delete() return await message.channel.send( - "Please don't send invite links in this server!" + "Please don't send invite links in this server!", delete_after=5 ) @commands.Cog.listener("on_message") From 03659e82675542d4c91c1bc0dc7b57e205a16c58 Mon Sep 17 00:00:00 2001 From: khsaad04 Date: Mon, 9 Sep 2024 23:31:15 +0600 Subject: [PATCH 2/4] add World of Coding to whitelist for check_invites --- ext/helpers.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ext/helpers.py b/ext/helpers.py index 2af2567..35f4ad1 100644 --- a/ext/helpers.py +++ b/ext/helpers.py @@ -38,6 +38,7 @@ async def check_invite(bot, content, channel): 267624335836053506, # Python 412754940885467146, # Blurple 613425648685547541, # Discord Developers + 661257119588417627, # World of Coding ] pattern = r"discord(?:(?:(?:app)?\.com)\/invite|\.gg)/([a-zA-z0-9\-]{2,})\b" matches = re.findall(pattern, content, re.MULTILINE) @@ -779,4 +780,4 @@ def invert_string(text): def gemini_split_string(string, chunk_size=1000): - return [string[i:i+chunk_size] for i in range(0, len(string), chunk_size)] \ No newline at end of file + return [string[i:i+chunk_size] for i in range(0, len(string), chunk_size)] From 059b85d3f5db0167f86eb2a27a1b346821b54866 Mon Sep 17 00:00:00 2001 From: khsaad04 Date: Mon, 9 Sep 2024 23:31:53 +0600 Subject: [PATCH 3/4] check if channel is fetched before sending message --- cogs/tasks.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cogs/tasks.py b/cogs/tasks.py index a020ce9..1fd7c0f 100644 --- a/cogs/tasks.py +++ b/cogs/tasks.py @@ -116,7 +116,8 @@ async def send_cat_pic(self): url = cat_pic ) - await channel.send(embed = embed) + if channel: + await channel.send(embed = embed) @send_cat_pic.before_loop async def log_cat_pic_loop(self): From 4393c5fb1ce406ec86c1f73b70786194e5886781 Mon Sep 17 00:00:00 2001 From: Ayu Itz <77532758+iayushanand@users.noreply.github.com> Date: Tue, 10 Sep 2024 14:24:00 +0530 Subject: [PATCH 4/4] adding cat reaction fix to this pr --- cogs/listeners.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cogs/listeners.py b/cogs/listeners.py index b21aaf3..6a42673 100644 --- a/cogs/listeners.py +++ b/cogs/listeners.py @@ -68,7 +68,7 @@ async def check_cat_message(self, message: discord.Message): """ Checks if a message has 'cat' or 'placeholder' in it and reacts with '' """ - if 'cat' in message.content or 'placeholder' in message.content: + if 'cat' in message.content.lower().split() or 'placeholder' in message.content.lower().split(): await message.add_reaction('') @commands.Cog.listener("on_message")