Various: Mirror changes to checkIgnored() function.

* Bugtracker
* Encyclopedia
* PackageInfo

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'],

Bugtracker/plugin.py

@@ -42,9 +42,12 @@ def defaultIgnored(hostmask):
 def checkIgnored(hostmask, channel):
     try:
         user = ircdb.users.getUser(hostmask)
-        if user._checkCapability('owner'):
+        try:
-            return False
+            if user._checkCapability('trusted'):
-        elif user.ignore:
+                return False
+        except KeyError:
+            pass
+        if user.ignore:
             return True
     except KeyError:
         pass

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'],

Encyclopedia/plugin.py

@@ -45,9 +45,12 @@ def defaultIgnored(hostmask):
 def checkIgnored(hostmask, channel):
     try:
         user = ircdb.users.getUser(hostmask)
-        if user._checkCapability('owner'):
+        try:
-            return False
+            if user._checkCapability('trusted'):
-        elif user.ignore:
+                return False
+        except KeyError:
+            pass
+        if user.ignore:
             return True
     except KeyError:
         pass

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'],

PackageInfo/plugin.py

@@ -42,9 +42,12 @@ def defaultIgnored(hostmask):
 def checkIgnored(hostmask, channel):
     try:
         user = ircdb.users.getUser(hostmask)
-        if user._checkCapability('owner'):
+        try:
-            return False
+            if user._checkCapability('trusted'):
-        elif user.ignore:
+                return False
+        except KeyError:
+            pass
+        if user.ignore:
             return True
     except KeyError:
         pass