diff options
| author | mathieui <mathieui@mathieui.net> | 2020-05-23 16:38:05 +0200 |
|---|---|---|
| committer | mathieui <mathieui@mathieui.net> | 2020-05-23 16:38:05 +0200 |
| commit | e48780ddf0a6a80e0c36eaa8f8165c8d14ad63b1 (patch) | |
| tree | 534654be974749c2f4ea0bc99451fb8da5c61843 /poezio/core/core.py | |
| parent | 4c1ab027ac03ae3f0925eab03f43a5ad79d906d5 (diff) | |
| parent | faeab78c7e3c9f125cfbfe3dce0fb18c9b8649c4 (diff) | |
| download | poezio-e48780ddf0a6a80e0c36eaa8f8165c8d14ad63b1.tar.gz poezio-e48780ddf0a6a80e0c36eaa8f8165c8d14ad63b1.tar.bz2 poezio-e48780ddf0a6a80e0c36eaa8f8165c8d14ad63b1.tar.xz poezio-e48780ddf0a6a80e0c36eaa8f8165c8d14ad63b1.zip | |
Merge branch 'fix-history-fetch' into 'master'
Fix many MAM issues
Closes #3516, #3496, #3498, #3506, #3522, and #3493
See merge request poezio/poezio!105
Diffstat (limited to 'poezio/core/core.py')
| -rw-r--r-- | poezio/core/core.py | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/poezio/core/core.py b/poezio/core/core.py index 8ac88dd4..973c9103 100644 --- a/poezio/core/core.py +++ b/poezio/core/core.py @@ -2075,16 +2075,7 @@ class Core: # do not join rooms that do not have autojoin # but display them anyway if bm.autojoin: - muc.join_groupchat( - self, - bm.jid, - nick, - passwd=bm.password, - status=self.status.message, - show=self.status.show, - tab=tab) - if tab._text_buffer.last_message is None: - asyncio.ensure_future(mam.on_tab_open(tab)) + tab.join() def check_bookmark_storage(self, features): private = 'jabber:iq:private' in features |