Commit 502d79e7 authored by Maxime Buquet's avatar Maxime Buquet

Merge branch 'fix-issue-history-no-mam' into 'master'

Fix an issue on join when the room has no MAM support

See merge request !136
parents f670e3ce 64561bcf
Pipeline #3237 passed with stages
in 6 minutes and 58 seconds
......@@ -159,7 +159,10 @@ class MucTab(ChatTab):
delta = to_utc(datetime.now()) - to_utc(self.last_connection)
seconds = delta.seconds + delta.days * 24 * 3600
else:
seconds = self._text_buffer.find_last_message()
last_message = self._text_buffer.find_last_message()
seconds = None
if last_message is not None:
seconds = (datetime.now() - last_message.time).seconds
muc.join_groupchat(
self.core,
self.jid.bare,
......
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