diff --git a/classes.py b/classes.py index c48ceef..75f7c4b 100644 --- a/classes.py +++ b/classes.py @@ -166,7 +166,7 @@ class PyLinkNetworkCore(utils.DeprecatedAttributesObject, utils.CamelCaseToSnake # Acting extbans such as +b m:n!u@h on InspIRCd self.extbans_acting = {} # Matching extbans such as R:account on InspIRCd and $a:account on TS6. - self. extbans_matching = {} + self.extbans_matching = {} # This max nick length starts off as the config value, but may be # overwritten later by the protocol module if such information is diff --git a/protocols/inspircd.py b/protocols/inspircd.py index 0252b8a..0bdd54a 100644 --- a/protocols/inspircd.py +++ b/protocols/inspircd.py @@ -411,9 +411,15 @@ class InspIRCdProtocol(TS6BaseProtocol): self._send_with_prefix(self.sid, 'ENDBURST') # Extban definitions - self.extbans_acting = {'quiet': 'm:', 'ban_nonick': 'n:'} + self.extbans_acting = {'quiet': 'm:', 'ban_nonick': 'N:', 'ban_blockcolor': 'c:', + 'ban_partmsgs': 'p:', 'ban_invites': 'A:', 'ban_blockcaps': 'B:', + 'ban_noctcp': 'C:', 'ban_nokicks': 'Q:', 'ban_stripcolor': 'S:', + 'ban_nonotice': 'T:'} self.extbans_matching = {'ban_inchannel': 'j:', 'ban_realname': 'r:', 'ban_server': 's:', - 'ban_certfp': 'z:', 'ban_opertype': 'O:', 'ban_account': 'R:'} + 'ban_certfp': 'z:', 'ban_opertype': 'O:', 'ban_account': 'R:', + # Note: InspIRCd /helpop refers to this as an acting extban, but + # it actually behaves as a matching one... + 'ban_unregistered_matching': 'U:'} def handle_capab(self, source, command, args): """ diff --git a/protocols/unreal.py b/protocols/unreal.py index 39ddf5c..b2db9f8 100644 --- a/protocols/unreal.py +++ b/protocols/unreal.py @@ -373,7 +373,7 @@ class UnrealProtocol(TS6BaseProtocol): self._send_with_prefix(self.sid, 'EOS') # Extban definitions - self.extbans_acting = {'quiet': '~q:', 'ban_nonick': '~n:'} + self.extbans_acting = {'quiet': '~q:', 'ban_nonick': '~n:', 'ban_nojoins': '~j:'} self.extbans_matching = {'ban_account': '~a:', 'ban_inchannel': '~c:', 'ban_opertype': '~o:', 'ban_realname': '~r:', 'ban_account_legacy': '~R:', 'ban_certfp': '~S:'}