From 81d9c267d358ede6a5fc4acdc53c1b5b02e1ff56 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 31 Aug 2019 01:18:29 +0530 Subject: Moved scroll_up code back to basetabs, added amount parameter to change no. of msgs per query. --- poezio/tabs/basetabs.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'poezio/tabs') diff --git a/poezio/tabs/basetabs.py b/poezio/tabs/basetabs.py index 22601ec7..eb64ed2f 100644 --- a/poezio/tabs/basetabs.py +++ b/poezio/tabs/basetabs.py @@ -916,10 +916,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: + mam.mam_scroll(tab=self, action='scroll') + 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) -- cgit v1.2.3 From 17e7f0768a1ae2eceae78dca677d165d86a067d6 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 5 Sep 2019 15:40:46 +0530 Subject: Reorganize MAM --- poezio/tabs/basetabs.py | 3 ++- poezio/tabs/muctab.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'poezio/tabs') diff --git a/poezio/tabs/basetabs.py b/poezio/tabs/basetabs.py index eb64ed2f..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 @@ -917,7 +918,7 @@ class ChatTab(Tab): def on_scroll_up(self): if not self.query_status: - mam.mam_scroll(tab=self, action='scroll') + 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): 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: -- cgit v1.2.3