fix /recolor with the new nick_color method

parent d712d2e1
......@@ -26,7 +26,7 @@ class Message(object):
The color can be a single number OR a list of numbers, for
specials cases like join or quit messages.
"""
def __init__(self, txt, time=None, nickname=None, nick_color=None, color=None, colorized=False):
def __init__(self, txt, time=None, nickname=None, nick_color=None, color=None, colorized=False, user=None):
"""
time is a datetime object, None means 'now'.
If no nickname is specified, it's an information.
......@@ -37,9 +37,10 @@ class Message(object):
self.nick_color = nick_color
self.color = color
self.colorized = colorized
self.user = user
def __repr__(self):
return "<Message txt=%s, nickname=%s, time=%s, user=%s, colorized=%s>" % (self.txt, self.nickname, str(self.time), str(self.nick_color), self.colorized)
return "<Message txt=%s, nickname=%s, time=%s, user=%s, colorized=%s>" % (self.txt, self.nickname, str(self.time), str(self.user), self.colorized)
def __str__(self):
return self.__repr__()
......
......@@ -117,7 +117,7 @@ class Room(TextBuffer):
color = theme.COLOR_INFORMATION_TEXT
time = time if time is not None else datetime.now()
nick_color = nick_color or user.color if user else None
message = Message(txt, time, nickname, nick_color, color, colorized)
message = Message(txt, time, nickname, nick_color, color, colorized, user=user)
while len(self.messages) > MESSAGE_NB_LIMIT:
self.messages.pop(0)
self.messages.append(message)
......
......@@ -470,7 +470,7 @@ class TextWin(Win):
else:
limit = self.width-offset-1
this_line_was_broken_by_space = False
color = message.nick_color
color = message.user.color if message.user else message.nick_color
if not first:
nick = None
time = None
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment