From 3130ed82bfec77deb4348314127d8ca1ce7e781b Mon Sep 17 00:00:00 2001 From: aikaterna <20862007+aikaterna@users.noreply.github.com> Date: Wed, 22 Apr 2020 11:29:19 -0700 Subject: [PATCH] [NoLinks] Move regex --- nolinks/nolinks.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/nolinks/nolinks.py b/nolinks/nolinks.py index f83f60e..72534e0 100644 --- a/nolinks/nolinks.py +++ b/nolinks/nolinks.py @@ -2,6 +2,9 @@ import discord import re from redbot.core import Config, commands, checks +LINKS = re.compile( + "(([\w]+:)?//)?(([\d\w]|%[a-fA-f\d]{2,2})+(:([\d\w]|%[a-fA-f\d]{2,2})+)?@)?([\d\w][-\d\w]{0,253}[\d\w]\.)+[\w]{2,63}(:[\d]+)?(/([-+_~.\d\w]|%[a-fA-f\d]{2,2})*)*(\?(&?([-+_~.\d\w]|%[a-fA-f\d]{2,2})=?)*)?(#([-+_~.\d\w]|%[a-fA-f\d]{2,2})*)?" + ) class NoLinks(commands.Cog): def __init__(self, bot): @@ -142,10 +145,4 @@ class NoLinks(commands.Cog): @staticmethod def _match_url(url): - regex = re.compile( - "(([\w]+:)?//)?(([\d\w]|%[a-fA-f\d]{2,2})+(:([\d\w]|%[a-fA-f\d]{2,2})+)?@)?([\d\w][-\d\w]{0,253}[\d\w]\.)+[\w]{2,63}(:[\d]+)?(/([-+_~.\d\w]|%[a-fA-f\d]{2,2})*)*(\?(&?([-+_~.\d\w]|%[a-fA-f\d]{2,2})=?)*)?(#([-+_~.\d\w]|%[a-fA-f\d]{2,2})*)?" - ) - if regex.match(url): - return True - else: - return False + return LINKS.match(url)