Firepup650/bitbot-3.11-fork
2
0
Fork 0
Code Issues Pull requests Activity Actions

Refactor CAPs in to objects

Browse source
This commit is contained in:
jesopo 2019-05-11 15:11:09 +01:00
parent 90f375d764
commit 295f7a751c
2 changed files with 35 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
modules/line_handler/ircv3.py
View file

@ -1,13 +1,31 @@
from src import utils from src import utils
CAPABILITIES = {"multi-prefix", "chghost", "invite-notify", "account-tag", CAPABILITIES = [
"account-notify", "extended-join", "away-notify", "userhost-in-names", utils.irc.Capability("multi-prefix"),
"draft/message-tags-0.2", "message-tags", "server-time", "cap-notify", utils.irc.Capability("chghost"),
"batch", "draft/labeled-response", "draft/rename", "echo-message", utils.irc.Capability("invite-notify"),
"draft/setname"} utils.irc.Capability("account-tag"),
utils.irc.Capability("account-notify"),
utils.irc.Capability("extended-join"),
utils.irc.Capability("away-notify"),
utils.irc.Capability("userhost-in-names"),
utils.irc.Capability("message-tags", "draft/message-tags-0.2"),
utils.irc.Capability("server-time"),
utils.irc.Capability("cap-notify"),
utils.irc.Capability("batch"),
utils.irc.Capability("echo-message"),
utils.irc.Capability(None, "draft/labeled-response"),
utils.irc.Capability(None, "draft/rename"),
utils.irc.Capability(None, "draft/setname")
]
def _match_caps(capabilities): def _match_caps(capabilities):
return set(capabilities) & CAPABILITIES matched = []
for capability in CAPABILITIES:
available = capability.available(capabilities)
if available:
matched.append(available)
return matched
def cap(events, event): def cap(events, event):
capabilities = utils.parse.keyvalue(event["args"][-1]) capabilities = utils.parse.keyvalue(event["args"][-1])

11
src/utils/irc/__init__.py
View file

@ -275,3 +275,14 @@ class IRCSendBatch(IRCBatch):
self._add_line(utils.irc.protocol.message(target, message, tags)) self._add_line(utils.irc.protocol.message(target, message, tags))
def notice(self, target: str, message: str, tags: dict={}): def notice(self, target: str, message: str, tags: dict={}):
self._add_line(utils.irc.protocol.notice(target, message, tags)) self._add_line(utils.irc.protocol.notice(target, message, tags))
class Capability(object):
def __init__(self, name, draft_name=None):
self._caps = set([name, draft_name])
self._name = name
self._draft_name = draft_name
def available(self, capabilities: typing.List[str]) -> str:
match = list(set(capabilities)&self._caps)
return match[0] if match else None
def enabled(self, capability: str) -> bool:
return capability in self._caps