diff options
| author |  jesopo | 2019-02-20 14:46:40 +0000 |
|---|---|---|
| committer | jesopo | 2019-02-20 14:46:40 +0000 |
| commit | 81d82413d4924bd376c9b61a752f248fece0b02a (patch) | |
| tree | 39176b56aacb76ac2205dcf31b5c3967cbfddae0 | |
| parent | Pass `key` through to _get_settings (rest_api.py) (diff) | |
draft/message-tags-0.3 (JSON tags) was rejected
| -rw-r--r-- | modules/line_handler.py | 5 | ||||
| -rw-r--r-- | src/utils/irc/__init__.py | 16 |
2 files changed, 8 insertions, 13 deletions
diff --git a/modules/line_handler.py b/modules/line_handler.py index 0c50509f..dcb6ce10 100644 --- a/modules/line_handler.py +++ b/modules/line_handler.py @@ -6,9 +6,8 @@ RE_MODES = re.compile(r"[-+]\w+") CAPABILITIES = {"multi-prefix", "chghost", "invite-notify", "account-tag", "account-notify", "extended-join", "away-notify", "userhost-in-names", - "draft/message-tags-0.2", "draft/message-tags-0.3", "server-time", - "cap-notify", "batch", "draft/labeled-response", "draft/rename", - "echo-message", "draft/setname"} + "draft/message-tags-0.2", "server-time", "cap-notify", "batch", + "draft/labeled-response", "draft/rename", "echo-message", "draft/setname"} LABELED_BATCH = { "labeled-response": "label", diff --git a/src/utils/irc/__init__.py b/src/utils/irc/__init__.py index 9c19f911..610a6bb3 100644 --- a/src/utils/irc/__init__.py +++ b/src/utils/irc/__init__.py @@ -116,16 +116,12 @@ def parse_line(line: str) -> IRCParsedLine: if line[0] == "@": tags_prefix, line = line[1:].split(" ", 1) - if tags_prefix[0] == "{": - tags_prefix = message_tag_unescape(tags_prefix) - tags = json.loads(tags_prefix) - else: - for tag in filter(None, tags_prefix.split(";")): - tag, sep, value = tag.partition("=") - if sep: - tags[tag] = message_tag_unescape(value) - else: - tags[tag] = None + for tag in filter(None, tags_prefix.split(";")): + tag, sep, value = tag.partition("=") + if sep: + tags[tag] = message_tag_unescape(value) + else: + tags[tag] = None line, trailing_separator, trailing_split = line.partition(" :") |