From 24a0df30f022f47d8b2cf4b0d7791b94125a3027 Mon Sep 17 00:00:00 2001 From: Madhur Garg Date: Thu, 21 Mar 2019 02:41:39 +0530 Subject: Corrected the value of timestamp for MUC subject. Fixes #3451 Corrected the value of timestamp for MUC subject. Fixes #3451 Corrects the value of timestamp for messages with delay tag. Fixes #3451 --- poezio/core/handlers.py | 6 ++++-- poezio/text_buffer.py | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/poezio/core/handlers.py b/poezio/core/handlers.py index 9cdfb59a..6fa9935b 100644 --- a/poezio/core/handlers.py +++ b/poezio/core/handlers.py @@ -1318,6 +1318,7 @@ class HandlerCore: room_from = message.get_mucroom() tab = self.core.tabs.by_name_and_class(room_from, tabs.MucTab) subject = message['subject'] + time = message['delay']['stamp'] if subject is None or not tab: return if subject != tab.topic: @@ -1329,6 +1330,7 @@ class HandlerCore: 'text_col': dump_tuple(theme.COLOR_NORMAL_TEXT), 'subject': subject, 'user': '', + 'str_time': time, } if nick_from: user = tab.get_user_by_name(nick_from) @@ -1349,13 +1351,13 @@ class HandlerCore: tab.add_message( "%(user)s set the subject to: \x19%(text_col)s}%(subject)s" % fmt, - time=None, + str_time=time, typ=2) else: tab.add_message( "\x19%(info_col)s}The subject is: \x19%(text_col)s}%(subject)s" % fmt, - time=None, + str_time=time, typ=2) tab.topic = subject tab.topic_from = nick_from diff --git a/poezio/text_buffer.py b/poezio/text_buffer.py index 448adff3..f942c48e 100644 --- a/poezio/text_buffer.py +++ b/poezio/text_buffer.py @@ -56,7 +56,7 @@ class Message: if str_time is None: str_time = time.strftime("%H:%M:%S") else: - str_time = '' + str_time = str_time.strftime("%Y-%m-%d %H:%M:%S") self.txt = txt.replace('\t', ' ') + '\x19o' self.nick_color = nick_color -- cgit v1.2.3