Commit f51d4951 authored by Maxime Buquet's avatar Maxime Buquet

Merge branch 'muc_subject' into 'master'

Corrected the value of timestamp for MUC subject. Fixes #3451

Closes #3451

See merge request poezio/poezio!25
parents 4128cc84 24a0df30
......@@ -1314,6 +1314,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:
......@@ -1325,6 +1326,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)
......@@ -1345,13 +1347,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
......
......@@ -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
......
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