From 95c8c5e9f7063e0fd2dda0a1a0879a335c452058 Mon Sep 17 00:00:00 2001 From: Krytarik Raido Date: Mon, 26 Oct 2020 01:23:04 +0100 Subject: [PATCH] Various: Mirror changes to checkIgnored() function. * Bugtracker * Encyclopedia * PackageInfo --- Bugtracker/__init__.py | 2 +- Bugtracker/plugin.py | 9 ++++++--- Encyclopedia/__init__.py | 2 +- Encyclopedia/plugin.py | 9 ++++++--- PackageInfo/__init__.py | 2 +- PackageInfo/plugin.py | 9 ++++++--- 6 files changed, 21 insertions(+), 12 deletions(-) diff --git a/Bugtracker/__init__.py b/Bugtracker/__init__.py index f81c0a9..fb33627 100644 --- a/Bugtracker/__init__.py +++ b/Bugtracker/__init__.py @@ -24,7 +24,7 @@ import supybot.world as world from imp import reload -__version__ = "4.5.0" +__version__ = "4.6.0" __author__ = supybot.Author("Krytarik Raido", "krytarik", "krytarik@tuxgarage.com") __contributors__ = { supybot.Author("Dennis Kaarsemaker", "Seveas", "dennis@kaarsemaker.net"): ['Original Author'], diff --git a/Bugtracker/plugin.py b/Bugtracker/plugin.py index 1b20fa0..de48648 100644 --- a/Bugtracker/plugin.py +++ b/Bugtracker/plugin.py @@ -42,9 +42,12 @@ def defaultIgnored(hostmask): def checkIgnored(hostmask, channel): try: user = ircdb.users.getUser(hostmask) - if user._checkCapability('owner'): - return False - elif user.ignore: + try: + if user._checkCapability('trusted'): + return False + except KeyError: + pass + if user.ignore: return True except KeyError: pass diff --git a/Encyclopedia/__init__.py b/Encyclopedia/__init__.py index d99bd41..30231a7 100644 --- a/Encyclopedia/__init__.py +++ b/Encyclopedia/__init__.py @@ -24,7 +24,7 @@ import supybot import supybot.world as world from imp import reload -__version__ = "3.0" +__version__ = "3.1" __author__ = supybot.Author("Krytarik Raido", "krytarik", "krytarik@tuxgarage.com") __contributors__ = { supybot.Author("Dennis Kaarsemaker", "Seveas", "dennis@kaarsemaker.net"): ['Original Author'], diff --git a/Encyclopedia/plugin.py b/Encyclopedia/plugin.py index 1f766e4..5fdcd38 100644 --- a/Encyclopedia/plugin.py +++ b/Encyclopedia/plugin.py @@ -45,9 +45,12 @@ def defaultIgnored(hostmask): def checkIgnored(hostmask, channel): try: user = ircdb.users.getUser(hostmask) - if user._checkCapability('owner'): - return False - elif user.ignore: + try: + if user._checkCapability('trusted'): + return False + except KeyError: + pass + if user.ignore: return True except KeyError: pass diff --git a/PackageInfo/__init__.py b/PackageInfo/__init__.py index c19b160..442093a 100644 --- a/PackageInfo/__init__.py +++ b/PackageInfo/__init__.py @@ -22,7 +22,7 @@ import supybot import supybot.world as world from imp import reload -__version__ = "1.9.0" +__version__ = "2.0.0" __author__ = supybot.Author("Krytarik Raido", "krytarik", "krytarik@tuxgarage.com") __contributors__ = { supybot.Author("Dennis Kaarsemaker", "Seveas", "dennis@kaarsemaker.net"): ['Original Concept'], diff --git a/PackageInfo/plugin.py b/PackageInfo/plugin.py index 06f4a88..e2ec9eb 100644 --- a/PackageInfo/plugin.py +++ b/PackageInfo/plugin.py @@ -42,9 +42,12 @@ def defaultIgnored(hostmask): def checkIgnored(hostmask, channel): try: user = ircdb.users.getUser(hostmask) - if user._checkCapability('owner'): - return False - elif user.ignore: + try: + if user._checkCapability('trusted'): + return False + except KeyError: + pass + if user.ignore: return True except KeyError: pass