From 2fc948ab240cf2e1128fcd34685329855b4f1750 Mon Sep 17 00:00:00 2001
From: jesopo
Date: Wed, 14 Nov 2018 22:35:13 +0000
Subject: Don't eat commas when there's no background color or when a comma
 directly follows a background color

---
 src/utils/irc.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/utils/irc.py b/src/utils/irc.py
index f3b692a3..af30c6fd 100644
--- a/src/utils/irc.py
+++ b/src/utils/irc.py
@@ -162,11 +162,16 @@ def _color_tokens(s: str) -> typing.List[str]:
                 else:
                     foreground += char
                 continue
-            elif char == ",":
+            elif char == "," and not background:
                 background += char
                 continue
             else:
-                matches.append("\x03%s%s" % (foreground, background))
+                color = foreground
+                if len(background) > 1:
+                    color += background
+
+                if color:
+                    matches.append("\x03%s" % color)
                 is_color = False
                 foreground = ""
                 background = ""
-- 
cgit v1.3.1-10-gc9f91