From 1a796322f34548a1565908fb313b8817c4587caf Mon Sep 17 00:00:00 2001
From: Denis Kasak <dkasak@termina.org.uk>
Date: Tue, 6 Nov 2018 18:25:56 +0100
Subject: [PATCH] Simplify Formatted.to_weechat logic.

---
 matrix/colors.py | 29 ++++++++++++-----------------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/matrix/colors.py b/matrix/colors.py
index 89b578d..88df27e 100644
--- a/matrix/colors.py
+++ b/matrix/colors.py
@@ -266,36 +266,33 @@ class Formatted(object):
     def to_weechat(self):
         # TODO BG COLOR
         def add_attribute(string, name, value):
-            if name == "bold" and value:
+            if not value:
+                return string
+            elif name == "bold":
                 return "{bold_on}{text}{bold_off}".format(
                     bold_on=W.color("bold"),
                     text=string,
                     bold_off=W.color("-bold"),
                 )
-
-            if name == "italic" and value:
+            elif name == "italic":
                 return "{italic_on}{text}{italic_off}".format(
                     italic_on=W.color("italic"),
                     text=string,
                     italic_off=W.color("-italic"),
                 )
-
-            if name == "underline" and value:
+            elif name == "underline":
                 return "{underline_on}{text}{underline_off}".format(
                     underline_on=W.color("underline"),
                     text=string,
                     underline_off=W.color("-underline"),
                 )
-
-            if name == "strikethrough" and value:
+            elif name == "strikethrough":
                 return string_strikethrough(string)
-
-            if name == "quote" and value:
+            elif name == "quote":
                 return self.textwrapper.fill(
                     W.string_remove_color(string.replace("\n", ""), "")
                 )
-
-            if name == "code" and value:
+            elif name == "code":
                 try:
                     lexer = get_lexer_by_name(value)
                 except ClassNotFound:
@@ -304,22 +301,20 @@ class Formatted(object):
                 # highlight adds a newline to the end of the string, remove it
                 # from the output
                 return highlight(string, lexer, WeechatFormatter())[:-1]
-
-            if name == "fgcolor" and value:
+            elif name == "fgcolor":
                 return "{color_on}{text}{color_off}".format(
                     color_on=W.color(value),
                     text=string,
                     color_off=W.color("resetcolor"),
                 )
-
-            if name == "bgcolor" and value:
+            elif name == "bgcolor":
                 return "{color_on}{text}{color_off}".format(
                     color_on=W.color("," + value),
                     text=string,
                     color_off=W.color("resetcolor"),
                 )
-
-            return string
+            else:
+                return string
 
         def format_string(formatted_string):
             text = formatted_string.text