Merge remote-tracking branch 'origin/mr/46'

MAM refactoring!

2 files changed, 6 insertions, 5 deletions

diff --git a/poezio/tabs/basetabs.py b/poezio/tabs/basetabs.py
index 22601ec7..e3ae7d9d 100644
--- a/poezio/tabs/basetabs.py
+++ b/poezio/tabs/basetabs.py
@@ -15,6 +15,7 @@ revolving around chats.
 
 import logging
 import string
+import asyncio
 import time
 from datetime import datetime
 from xml.etree import cElementTree as ET
@@ -916,10 +917,9 @@ class ChatTab(Tab):
         return self.text_win.scroll_down(1)
 
     def on_scroll_up(self):
-        if self.query_status:
-            return self.text_win.scroll_up(self.text_win.height - 1)
-        else:
-            return mam.mam_scroll(tab=self, action='scroll')
+        if not self.query_status:
+            asyncio.ensure_future(mam.on_scroll_up(tab=self))
+        return self.text_win.scroll_up(self.text_win.height - 1)
 
     def on_scroll_down(self):
         return self.text_win.scroll_down(self.text_win.height - 1)
diff --git a/poezio/tabs/muctab.py b/poezio/tabs/muctab.py
index d9c09b7c..3e754ae6 100644
--- a/poezio/tabs/muctab.py
+++ b/poezio/tabs/muctab.py
@@ -10,6 +10,7 @@ user list, and updates private tabs when necessary.
 import bisect
 import curses
 import logging
+import asyncio
 import os
 import random
 import re
@@ -157,7 +158,7 @@ class MucTab(ChatTab):
             status=status.message,
             show=status.show,
             seconds=seconds)
-        mam.mam_scroll(self, action='query')
+        asyncio.ensure_future(mam.on_tab_open(self))
 
     def leave_room(self, message: str):
         if self.joined: