diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/line_handler.py | 12 | ||||
| -rw-r--r-- | modules/stats.py | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/modules/line_handler.py b/modules/line_handler.py index d9ddbaad..c6448066 100644 --- a/modules/line_handler.py +++ b/modules/line_handler.py @@ -113,7 +113,7 @@ class Module(ModuleManager.BaseModule): event["server"].isupport.update(isupport) if "NAMESX" in isupport and not "multi-prefix" in event[ - "server"].capabilities: + "server"].agreed_capabilities: event["server"].send("PROTOCTL NAMESX") if "PREFIX" in isupport: @@ -198,7 +198,7 @@ class Module(ModuleManager.BaseModule): modes.add(event["server"].prefix_symbols[nickname[0]]) nickname = nickname[1:] - if "userhost-in-names" in event["server"].capabilities: + if "userhost-in-names" in event["server"].agreed_capabilities: hostmask = utils.irc.seperate_hostmask(nickname) nickname = hostmask.nickname user = event["server"].get_user(hostmask.nickname) @@ -356,13 +356,13 @@ class Module(ModuleManager.BaseModule): event["server"].send_capability_queue() elif subcommand == "del": for capability in capabilities.keys(): - event["server"].capabilities.discard(capability) + event["server"].agreed_capabilities.discard(capability) del event["server"].server_capabilities[capability] self._event(event, "cap.del", server=event["server"], capabilities=capabilities) elif subcommand == "ack": - event["server"].capabilities.update(capabilities) + event["server"].agreed_capabilities.update(capabilities) self._event(event, "cap.ack", capabilities=capabilities, server=event["server"]) @@ -452,7 +452,7 @@ class Module(ModuleManager.BaseModule): def privmsg(self, event): if event["direction"] == Direction.SEND: from_self = True - if "echo-message" in event["server"].capabilities: + if "echo-message" in event["server"].agreed_capabilities: return else: if event["prefix"]: @@ -530,7 +530,7 @@ class Module(ModuleManager.BaseModule): def notice(self, event): if event["direction"] == Direction.SEND: from_self = True - if "echo-message" in event["server"].capabilities: + if "echo-message" in event["server"].agreed_capabilities: return else: if event["prefix"]: diff --git a/modules/stats.py b/modules/stats.py index 8e533443..742574f4 100644 --- a/modules/stats.py +++ b/modules/stats.py @@ -62,7 +62,7 @@ class Module(ModuleManager.BaseModule): "channels": { c.name: self._channel_stats(c) for c in server.channels }, - "capabilities": list(server.capabilities) + "capabilities": list(server.agreed_capabilities) } @utils.hook("api.get.servers") @@ -125,4 +125,4 @@ class Module(ModuleManager.BaseModule): :help: List negotiated IRCv3 capabilities """ event["stdout"].write("IRCv3 capabilities: %s" % - ", ".join(event["server"].capabilities)) + ", ".join(event["server"].agreed_capabilities)) |