| ... |
... |
@@ -581,27 +581,6 @@ def _fetch_n_lines_history(self, |
|
581
|
581
|
else:
|
|
582
|
582
|
timestamp = row.db_timestamp
|
|
583
|
583
|
|
|
584
|
|
- messages = app.storage.archive.get_conversation_before_after(
|
|
585
|
|
- self.contact.account,
|
|
586
|
|
- self.contact.jid,
|
|
587
|
|
- before,
|
|
588
|
|
- timestamp,
|
|
589
|
|
- n_lines)
|
|
590
|
|
-
|
|
591
|
|
- if not messages:
|
|
592
|
|
- self._scrolled_view.set_history_complete(before, True)
|
|
593
|
|
- self._scrolled_view.block_signals(False)
|
|
594
|
|
- return
|
|
595
|
|
-
|
|
596
|
|
- self.add_messages(messages)
|
|
597
|
|
-
|
|
598
|
|
- if len(messages) < n_lines:
|
|
599
|
|
- self._scrolled_view.set_history_complete(before, True)
|
|
600
|
|
-
|
|
601
|
|
- # if self._scrolled_view.get_autoscroll():
|
|
602
|
|
- # if self._scrolled_view.reduce_message_count(before):
|
|
603
|
|
- # self._scrolled_view.set_history_complete(before, False)
|
|
604
|
|
-
|
|
605
|
584
|
assert self._contact is not None
|
|
606
|
585
|
for event in app.storage.events.load(self._contact, before, timestamp):
|
|
607
|
586
|
if isinstance(event, events.MUCUserJoined):
|
| ... |
... |
@@ -639,6 +618,23 @@ def _fetch_n_lines_history(self, |
|
639
|
618
|
else:
|
|
640
|
619
|
raise ValueError('Unknown event: %s' % event)
|
|
641
|
620
|
|
|
|
621
|
+ messages = app.storage.archive.get_conversation_before_after(
|
|
|
622
|
+ self.contact.account,
|
|
|
623
|
+ self.contact.jid,
|
|
|
624
|
+ before,
|
|
|
625
|
+ timestamp,
|
|
|
626
|
+ n_lines)
|
|
|
627
|
+
|
|
|
628
|
+ if not messages:
|
|
|
629
|
+ self._scrolled_view.set_history_complete(before, True)
|
|
|
630
|
+ self._scrolled_view.block_signals(False)
|
|
|
631
|
+ return
|
|
|
632
|
+
|
|
|
633
|
+ self.add_messages(messages)
|
|
|
634
|
+
|
|
|
635
|
+ if len(messages) < n_lines:
|
|
|
636
|
+ self._scrolled_view.set_history_complete(before, True)
|
|
|
637
|
+
|
|
642
|
638
|
self._scrolled_view.block_signals(False)
|
|
643
|
639
|
|
|
644
|
640
|
def add_messages(self, messages: list[ConversationRow]):
|