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

Hold on to tags and type for BATCHes

Browse source
This commit is contained in:
jesopo 2019-02-11 22:15:12 +00:00
parent b37a50ed7a
commit 2f5a232c4e
2 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
modules/line_handler.py
View file

@ -8,6 +8,7 @@ CAPABILITIES = {"multi-prefix", "chghost", "invite-notify", "account-tag",
"account-notify", "extended-join", "away-notify", "userhost-in-names", "account-notify", "extended-join", "away-notify", "userhost-in-names",
"draft/message-tags-0.2", "draft/message-tags-0.3", "server-time", "draft/message-tags-0.2", "draft/message-tags-0.3", "server-time",
"cap-notify", "batch", "draft/labeled-response", "draft/rename"} "cap-notify", "batch", "draft/labeled-response", "draft/rename"}
LABELED_BATCH = ["draft/labeled-response", "labeled-response"]
class Direction(enum.Enum): class Direction(enum.Enum):
SEND = 0 SEND = 0
@ -38,7 +39,7 @@ class Module(ModuleManager.BaseModule):
line = utils.irc.parse_line(event["line"]) line = utils.irc.parse_line(event["line"])
if "batch" in line.tags and line.tags["batch"] in event[ if "batch" in line.tags and line.tags["batch"] in event[
"server"].batches: "server"].batches:
server.batches[tag["batch"]].append(line) server.batches[tag["batch"]].lines.append(line)
else: else:
self._handle(event["server"], line) self._handle(event["server"], line)
@ -554,12 +555,15 @@ class Module(ModuleManager.BaseModule):
def batch(self, event): def batch(self, event):
identifier = event["args"][0] identifier = event["args"][0]
modifier, identifier = identifier[0], identifier[1:] modifier, identifier = identifier[0], identifier[1:]
batch_type = event["args"][1]
if modifier == "+": if modifier == "+":
event["server"].batches[identifier] = [] event["server"].batches[identifier] = utils.irc.IRCBatch(identifier,
batch_type, event["tags"])
else: else:
lines = event["server"].batches[identifier] batch = event["server"].batches[identifier]
del event["server"].batches[identifier] del event["server"].batches[identifier]
for line in lines: for line in batch.lines:
self._handle(line) self._handle(line)
# IRCv3 CHGHOST, a user's username and/or hostname has changed # IRCv3 CHGHOST, a user's username and/or hostname has changed

7
src/utils/irc.py
View file

@ -286,3 +286,10 @@ def parse_ctcp(s: str) -> typing.Optional[CTCPMessage]:
return CTCPMessage(ctcp_command, ctcp_message) return CTCPMessage(ctcp_command, ctcp_message)
return None return None
class IRCBatch(object):
def __init__(self, identifier: str, batch_type: str, tags: dict):
self.id = identifier
self.type = batch_type
self.tags = tags
self.lines = [] # type: typing.List[IRCParsedLine]