aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTollef Fog Heen <tfheen@err.no>2016-10-09 09:36:48 +0200
committerGitHub <noreply@github.com>2016-10-09 09:36:48 +0200
commit1316cbc95a6315a65f090bc2f7c85cce06071001 (patch)
tree28173236d29ae8f493b138191190d8957ef5dbc7
parenta6525e3da5e1a11eb9941860f7875ee1def9243e (diff)
parent73dcd2c7326dc3fad8f69d57e4cc89a915ad5431 (diff)
downloadwee-slack-1316cbc95a6315a65f090bc2f7c85cce06071001.tar.gz
Merge pull request #266 from irth/master
use the correct colors for nick_prefix/nick_suffix
-rw-r--r--wee_slack.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/wee_slack.py b/wee_slack.py
index 4850350..f0572dc 100644
--- a/wee_slack.py
+++ b/wee_slack.py
@@ -674,7 +674,12 @@ class Channel(object):
name = prefix_same_nick
else:
nick_prefix = w.config_string(w.config_get('weechat.look.nick_prefix'))
+ nick_prefix_color_name = w.config_string(w.config_get('weechat.color.chat_nick_prefix'))
+ nick_prefix_color = w.color(nick_prefix_color_name)
+
nick_suffix = w.config_string(w.config_get('weechat.look.nick_suffix'))
+ nick_suffix_color_name = w.config_string(w.config_get('weechat.color.chat_nick_prefix'))
+ nick_suffix_color = w.color(nick_suffix_color_name)
if self.server.users.find(user):
name = self.server.users.find(user).formatted_name()
@@ -683,7 +688,7 @@ class Channel(object):
else:
name = user
self.last_active_user = None
- name = nick_prefix + name + nick_suffix
+ name = nick_prefix_color + nick_prefix + w.color("reset") + name + nick_suffix_color + nick_suffix + w.color("reset")
name = name.decode('utf-8')
# colorize nicks in each line
chat_color = w.config_string(w.config_get('weechat.color.chat'))