diff --git a/SpiffyTitles/__init__.py b/SpiffyTitles/__init__.py index ac5812a..f9245aa 100644 --- a/SpiffyTitles/__init__.py +++ b/SpiffyTitles/__init__.py @@ -37,7 +37,7 @@ import supybot.world as world # Use this for the version of this plugin. You may wish to put a CVS keyword # in here if you're keeping the plugin in CVS or some similar system. -__version__ = "2020.06.06+git" +__version__ = "2020.06.25+git" # XXX Replace this with an appropriate author or supybot.Author instance. __author__ = supybot.Author("butterscotchstallion", "butterscotchstallion", "") diff --git a/SpiffyTitles/config.py b/SpiffyTitles/config.py index 288f8fb..933db37 100644 --- a/SpiffyTitles/config.py +++ b/SpiffyTitles/config.py @@ -70,8 +70,7 @@ conf.registerChannelValue( SpiffyTitles, "urlRegularExpression", registry.String( - r"http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+~]|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+", - _("""This regular expression will be used to match URLs"""), + r"", _("""If set, this regular expression will be used to match URLs"""), ), ) diff --git a/SpiffyTitles/plugin.py b/SpiffyTitles/plugin.py index 248267a..c957491 100644 --- a/SpiffyTitles/plugin.py +++ b/SpiffyTitles/plugin.py @@ -560,6 +560,8 @@ class SpiffyTitles(callbacks.Plugin): Find the first string that looks like a URL from the message """ url_re = self.registryValue("urlRegularExpression", channel) + if not url_re: + url_re = utils.web._httpUrlRe matches = re.findall(url_re, input) return matches