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

Explicitly denote when an :arbitrary arg is present in an IRCLine

Browse source
This commit is contained in:
jesopo 2018-11-08 10:36:40 +00:00
parent f15e3c8ffe
commit 3d00a1e15a
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/utils/irc.py
View file

@ -71,11 +71,12 @@ class IRCArgs(object):
class IRCLine(object): class IRCLine(object):
def __init__(self, tags: dict, prefix: typing.Optional[str], command: str, def __init__(self, tags: dict, prefix: typing.Optional[str], command: str,
args: IRCArgs): args: IRCArgs, has_arbitrary: bool):
self.tags = tags self.tags = tags
self.prefix = prefix self.prefix = prefix
self.command = command self.command = command
self.args = args self.args = args
self.has_arbitrary = has_arbitrary
def parse_line(line: str) -> IRCLine: def parse_line(line: str) -> IRCLine:
tags = {} tags = {}
@ -94,8 +95,11 @@ def parse_line(line: str) -> IRCLine:
else: else:
tags[tag] = None tags[tag] = None
line, _, arbitrary_split = line.partition(" :") line, arb_sep, arbitrary_split = line.partition(" :")
arbitrary = arbitrary_split or None has_arbitrary = bool(arb_sep)
arbitrary = None # type: typing.Optional[str]
if has_arbitrary:
arbitrary = arbitrary_split
if line[0] == ":": if line[0] == ":":
prefix_str, line = line[1:].split(" ", 1) prefix_str, line = line[1:].split(" ", 1)
@ -109,7 +113,7 @@ def parse_line(line: str) -> IRCLine:
if arbitrary: if arbitrary:
args.append(arbitrary) args.append(arbitrary)
return IRCLine(tags, prefix, command, IRCArgs(args)) return IRCLine(tags, prefix, command, IRCArgs(args), has_arbitrary)
COLOR_WHITE, COLOR_BLACK, COLOR_BLUE, COLOR_GREEN = 0, 1, 2, 3 COLOR_WHITE, COLOR_BLACK, COLOR_BLUE, COLOR_GREEN = 0, 1, 2, 3
COLOR_RED, COLOR_BROWN, COLOR_PURPLE, COLOR_ORANGE = 4, 5, 6, 7 COLOR_RED, COLOR_BROWN, COLOR_PURPLE, COLOR_ORANGE = 4, 5, 6, 7