From f296c535340e52ec0cc029879ab42776286104f7 Mon Sep 17 00:00:00 2001 From: Krytarik Raido Date: Wed, 15 Sep 2021 20:23:04 +0200 Subject: [PATCH] Bugtracker: Allow colon and hash as sole delimiters on term snarfing. --- Bugtracker/__init__.py | 2 +- Bugtracker/plugin.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Bugtracker/__init__.py b/Bugtracker/__init__.py index 98f119e..fa06b4f 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.8.1" +__version__ = "4.9.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 3ef78ba..d6036a1 100644 --- a/Bugtracker/plugin.py +++ b/Bugtracker/plugin.py @@ -309,11 +309,11 @@ class Bugtracker(callbacks.PluginRegexp): return msg def bugSnarfer(self, irc, msg, match): - r"(?P[a-z][^\s:]*(\s+(bug|ticket|issue|pull|pr|merge|mr)('?s)?)?):*\s+#?(?P\d+(?!\d*[-.]\d+)(\s*([,\s]+|[,\s]*(and|und|en|et|ir|[&+]+))\s*#?\d+(?!\d*[-.]\d+))*)" + r"(?P[a-z][^\s:]*(\s+(bug|ticket|issue|pull|pr|merge|mr)('?s)?)?)(:+\s*#?|\s+#?|\s*#)(?P\d+(?!\d*[-.]\d+)(\s*([,\s]+|[,\s]*(and|und|en|et|ir|[&+]+))\s*#?\d+(?!\d*[-.]\d+))*)" self.termSnarfer(irc, msg, match, 'bug') def commitSnarfer(self, irc, msg, match): - r"(?P[a-z][^\s:]*(\s+(commit)('?s)?)?):*\s+#?(?P[a-f0-9]{7,}(?![a-f0-9]*[-.][a-f0-9]{7,})(\s*([,\s]+|[,\s]*(and|und|en|et|ir|[&+]+))\s*#?[a-f0-9]{7,}(?![a-f0-9]*[-.][a-f0-9]{7,}))*)" + r"(?P[a-z][^\s:]*(\s+(commit)('?s)?)?)(:+\s*#?|\s+#?|\s*#)(?P[a-f0-9]{7,}(?![a-f0-9]*[-.][a-f0-9]{7,})(\s*([,\s]+|[,\s]*(and|und|en|et|ir|[&+]+))\s*#?[a-f0-9]{7,}(?![a-f0-9]*[-.][a-f0-9]{7,}))*)" self.termSnarfer(irc, msg, match, 'commit') def termSnarfer(self, irc, msg, match, termtype):