From 5d8e2c4edcf89588baecebe4e35995305470bc26 Mon Sep 17 00:00:00 2001 From: Krytarik Raido Date: Thu, 7 Jan 2021 17:34:04 +0100 Subject: [PATCH] Bugtracker: Add 'tickets' type to SourceForge tracker. --- Bugtracker/__init__.py | 2 +- Bugtracker/plugin.py | 4 ++-- Bugtracker/trackers.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Bugtracker/__init__.py b/Bugtracker/__init__.py index 2fe79f9..4c0d020 100644 --- a/Bugtracker/__init__.py +++ b/Bugtracker/__init__.py @@ -23,7 +23,7 @@ import supybot import supybot.world as world from importlib import reload -__version__ = "4.7.1" +__version__ = "4.8.0" __author__ = supybot.Author("Krytarik Raido", "krytarik", "krytarik@gmail.com") __contributors__ = { supybot.Author("Dennis Kaarsemaker", "Seveas", "dennis@kaarsemaker.net"): ['Original Author'], diff --git a/Bugtracker/plugin.py b/Bugtracker/plugin.py index de48648..4f4e26d 100644 --- a/Bugtracker/plugin.py +++ b/Bugtracker/plugin.py @@ -407,7 +407,7 @@ class Bugtracker(callbacks.PluginRegexp): irc.reply(report) def bugUrlSnarfer(self, irc, msg, match): - r"(https?://)?((bugs\.debian\.org|pad\.lv)/|\S+/(show_bug\.cgi\?id=|bugreport\.cgi\?bug=|view\.php\?id=|bug=|bugs/|\+bug/|ticket/|feature-requests/|patches/|todo/|issues/|pulls?/|merge_requests/))(?P\d+)" + r"(https?://)?((bugs\.debian\.org|pad\.lv)/|\S+/(show_bug\.cgi\?id=|bugreport\.cgi\?bug=|view\.php\?id=|bug=|bugs/|\+bug/|tickets?/|feature-requests/|patches/|todo/|issues/|pulls?/|merge_requests/))(?P\d+)" self.urlSnarfer(irc, msg, match, 'bug') def commitUrlSnarfer(self, irc, msg, match): @@ -551,7 +551,7 @@ class Bugtracker(callbacks.PluginRegexp): bugtype = re.match(r'\S+/(feature-)?(?Prequest|patch|todo|issue|pull|merge|ticket|commit)(_requests)?(e?s)?/([^\s?]*\?([^\s?&]+&)?id=)?[a-f0-9]+$', url) if do_tracker and tracker.trackertype not in ('github', 'gitlab', 'gitea', 'cgit'): - if re.match(r'\S+/(bugs|feature-requests|patches|todo|issues|pulls?|merge_requests|ticket|commits?)$', tracker.description): + if re.match(r'\S+/(bugs|feature-requests|patches|todo|issues|pulls?|merge_requests|tickets?|commits?)$', tracker.description): report = '%s %s' % (tracker.description, bugid) else: if bugtype: diff --git a/Bugtracker/trackers.py b/Bugtracker/trackers.py index 8d56528..67a86e9 100644 --- a/Bugtracker/trackers.py +++ b/Bugtracker/trackers.py @@ -389,7 +389,7 @@ class Debbugs(IBugtracker): class SourceForge(IBugtracker): def get_tracker(self, url): try: - match = re.match(r'sourceforge\.net/p/[^\s/]+/(bugs|feature-requests|patches|todo)', url) + match = re.match(r'sourceforge\.net/p/[^\s/]+/(bugs|tickets|feature-requests|patches|todo)', url) desc = match.group(0) name = desc.lower() url = 'https://%s' % desc