summaryrefslogtreecommitdiff
path: root/src/room.py
diff options
context:
space:
mode:
authorFlorent Le Coz <louiz@louiz.org>2011-09-16 16:00:59 +0200
committerFlorent Le Coz <louiz@louiz.org>2011-09-16 16:00:59 +0200
commit24848892256f77edbdcbfcc9c4f90586876b3334 (patch)
tree2f8f3bee99f529c8ff54aaf61ecc15d6270406de /src/room.py
parent489852a59379733df6b8902e57ce93f6f63d27e7 (diff)
parenta3959bd12c2324f6e80e75e6f684cae65adaec5e (diff)
downloadpoezio-24848892256f77edbdcbfcc9c4f90586876b3334.tar.gz
poezio-24848892256f77edbdcbfcc9c4f90586876b3334.tar.bz2
poezio-24848892256f77edbdcbfcc9c4f90586876b3334.tar.xz
poezio-24848892256f77edbdcbfcc9c4f90586876b3334.zip
merge
Diffstat (limited to 'src/room.py')
-rw-r--r--src/room.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/room.py b/src/room.py
index 58b96adb..83b00e62 100644
--- a/src/room.py
+++ b/src/room.py
@@ -99,9 +99,10 @@ class Room(TextBuffer):
in the room anymore
"""
self.log_message(txt, time, nickname)
+ special_message = False
if txt.startswith('/me '):
txt = "\x192* \x195" + nickname + ' ' + txt[4:]
- nickname = None
+ special_message = True
user = self.get_user_by_name(nickname) if nickname is not None else None
if user:
user.set_last_talked(datetime.now())
@@ -119,6 +120,9 @@ class Room(TextBuffer):
highlight = self.do_highlight(txt, time, nickname)
if highlight:
nick_color = highlight
+ if special_message:
+ txt = '\x195%s' % (txt,)
+ nickname = None
time = time or datetime.now()
message = Message(txt='%s\x19o'%(txt.replace('\t', ' '),), nick_color=nick_color,
time=time, str_time=time.strftime("%Y-%m-%d %H:%M:%S")\