Philipp Hörist pushed to branch master at gajim / gajim

Commits: 74235280 by Philipp Hörist at 2022-10-08T16:32:13+02:00 fix: Control: Load events before messages

Fixes #11129

- - - - -

1 changed file:

- gajim/gtk/control.py

Changes:

===================================== gajim/gtk/control.py ===================================== @@ -581,27 +581,6 @@ def _fetch_n_lines_history(self, else: timestamp = row.db_timestamp

- messages = app.storage.archive.get_conversation_before_after( - self.contact.account, - self.contact.jid, - before, - timestamp, - n_lines) - - if not messages: - self._scrolled_view.set_history_complete(before, True) - self._scrolled_view.block_signals(False) - return - - self.add_messages(messages) - - if len(messages) < n_lines: - self._scrolled_view.set_history_complete(before, True) - - # if self._scrolled_view.get_autoscroll(): - # if self._scrolled_view.reduce_message_count(before): - # self._scrolled_view.set_history_complete(before, False) - assert self._contact is not None for event in app.storage.events.load(self._contact, before, timestamp): if isinstance(event, events.MUCUserJoined): @@ -639,6 +618,23 @@ def _fetch_n_lines_history(self, else: raise ValueError('Unknown event: %s' % event)

+ messages = app.storage.archive.get_conversation_before_after( + self.contact.account, + self.contact.jid, + before, + timestamp, + n_lines) + + if not messages: + self._scrolled_view.set_history_complete(before, True) + self._scrolled_view.block_signals(False) + return + + self.add_messages(messages) + + if len(messages) < n_lines: + self._scrolled_view.set_history_complete(before, True) + self._scrolled_view.block_signals(False)

def add_messages(self, messages: list[ConversationRow]):

View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/742352807960c05cc6d30dea616ef7b8c...