summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/logging.py5
-rw-r--r--src/room.py2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/logging.py b/src/logging.py
index aa466348..42a82760 100644
--- a/src/logging.py
+++ b/src/logging.py
@@ -68,7 +68,10 @@ class Logger(object):
makedirs(dir)
except:pass
fd = open(dir+room, 'a')
- fd.write(datetime.now().strftime('%d-%m-%y [%H:%M:%S] ')+nick+': '+msg+'\n')
+ if nick:
+ fd.write(datetime.now().strftime('%d-%m-%y [%H:%M:%S] ')+nick.encode('utf-8')+': '+msg.encode('utf-8')+'\n')
+ else:
+ fd.write(datetime.now().strftime('%d-%m-%y [%H:%M:%S] ')+'* '+msg.encode('utf-8')+'\n')
fd.close()
logger = Logger()
diff --git a/src/room.py b/src/room.py
index 8cd7a0f8..28f8cfad 100644
--- a/src/room.py
+++ b/src/room.py
@@ -64,6 +64,8 @@ class Room(object):
when we receive an history message said by someone who is not
in the room anymore
"""
+ if time == None and self.joined: # don't log the history messages
+ logger.message(self.name, nickname, txt)
user = self.get_user_by_name(nickname) if nickname is not None else None
if user:
user.set_last_talked(datetime.now())