From 02d1a8aa3ed65b98e35e5db6ee43ca22f6013b31 Mon Sep 17 00:00:00 2001 From: dave Date: Tue, 27 Mar 2018 20:18:32 -0700 Subject: [PATCH] fix url matching --- pyircbot/modules/LinkTitler.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pyircbot/modules/LinkTitler.py b/pyircbot/modules/LinkTitler.py index 0f51056..ebe449f 100755 --- a/pyircbot/modules/LinkTitler.py +++ b/pyircbot/modules/LinkTitler.py @@ -76,7 +76,7 @@ class LinkTitler(ModuleBase): # subreddits # generic - matches = re.compile(r'(https?://([a-zA-Z0-9_\-\.]+/([A-Za-z0-9\-\._~:\/?#[]@!$&\'\(\)\*\+\,\;=]+)?))') \ + matches = re.compile(r'(https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_\+.~#?&//=]*))') \ .findall(trailing) if matches: done = [] @@ -103,8 +103,6 @@ class LinkTitler(ModuleBase): self.nicesize(int(headers["Content-Length"])) if "Content-Length" in headers else "unknown size")) - return - def get_reddit_submission(self, subid): r = praw.Reddit(**self.config["reddit"]) return r.submission(id=subid)