diff options
| author | Maxime Buquet <pep@bouah.net> | 2019-03-23 21:50:42 +0100 |
|---|---|---|
| committer | Maxime Buquet <pep@bouah.net> | 2019-03-23 21:50:42 +0100 |
| commit | f51d4951988c50fb306b607cc2b7f8361451f434 (patch) | |
| tree | 83ace2a5d0ce77d5f259935f9207fa01b3929c61 | |
| parent | 4128cc847b398b5f1460ee38408f6643a6ff2ade (diff) | |
| parent | 24a0df30f022f47d8b2cf4b0d7791b94125a3027 (diff) | |
| download | poezio-f51d4951988c50fb306b607cc2b7f8361451f434.tar.gz poezio-f51d4951988c50fb306b607cc2b7f8361451f434.tar.bz2 poezio-f51d4951988c50fb306b607cc2b7f8361451f434.tar.xz poezio-f51d4951988c50fb306b607cc2b7f8361451f434.zip | |
Merge branch 'muc_subject' into 'master'
Corrected the value of timestamp for MUC subject. Fixes #3451
Closes #3451
See merge request poezio/poezio!25
| -rw-r--r-- | poezio/core/handlers.py | 6 | ||||
| -rw-r--r-- | 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 4d27d75b..030a43e5 100644 --- a/poezio/core/handlers.py +++ b/poezio/core/handlers.py @@ -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 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 |