From a3c6e4d365d1359c20180c10b6b94169cc151e63 Mon Sep 17 00:00:00 2001
From: Eduard Kuzmenko <thanwords24@gmail.com>
Date: Sun, 27 Feb 2022 15:12:00 +0200
Subject: [PATCH] Fix loading extra page of messages Adjust load messages
 length

---
 src/components/chat/bubbles.ts | 13 +++++++------
 src/helpers/scrollSaver.ts     |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/components/chat/bubbles.ts b/src/components/chat/bubbles.ts
index 5e0b892b..f4987386 100644
--- a/src/components/chat/bubbles.ts
+++ b/src/components/chat/bubbles.ts
@@ -2418,7 +2418,7 @@ export default class ChatBubbles {
 
       //if(dialog && lastMsgID && lastMsgID !== topMessage && (this.bubbles[lastMsgID] || this.firstUnreadBubble)) {
       if(savedPosition) {
-        scrollable.scrollTop = savedPosition.top;
+        scrollable.scrollTop = scrollable.lastScrollPosition = savedPosition.top;
         /* const mountedByLastMsgId = this.getMountedBubble(lastMsgId);
         let bubble: HTMLElement = mountedByLastMsgId?.bubble;
         if(!bubble?.parentElement) {
@@ -2434,9 +2434,9 @@ export default class ChatBubbles {
         const fromUp = maxBubbleId > 0 && (maxBubbleId < lastMsgId || lastMsgId < 0);
         const followingUnread = readMaxId === lastMsgId && !isTarget;
         if(!fromUp && samePeer) {
-          scrollable.scrollTop = 99999;
+          scrollable.scrollTop = scrollable.lastScrollPosition = 99999;
         } else if(fromUp/*  && (samePeer || forwardingUnread) */) {
-          scrollable.scrollTop = 0;
+          scrollable.scrollTop = scrollable.lastScrollPosition = 0;
         }
 
         const mountedByLastMsgId = this.getMountedBubble(lastMsgId);
@@ -2453,7 +2453,7 @@ export default class ChatBubbles {
           }
         }
       } else {
-        scrollable.scrollTop = 99999;
+        scrollable.scrollTop = scrollable.lastScrollPosition = 99999;
       }
 
       this.onScroll();
@@ -4463,10 +4463,11 @@ export default class ChatBubbles {
   public getHistory(maxId = 0, reverse = false, isBackLimit = false, additionMsgId = 0, justLoad = false): {cached: boolean, promise: Promise<boolean>} {
     const peerId = this.peerId;
 
+    const isBroadcast = this.appPeersManager.isBroadcast(peerId);
     //console.time('appImManager call getHistory');
-    const pageCount = Math.min(30, windowSize.height / 38/*  * 1.25 */ | 0);
+    const pageCount = Math.min(30, windowSize.height / 75/*  * 1.25 */ | 0);
     //const loadCount = Object.keys(this.bubbles).length > 0 ? 50 : pageCount;
-    const realLoadCount = Object.keys(this.bubbles).length > 0/*  || additionMsgId */ ? Math.max(40, pageCount) : pageCount;//const realLoadCount = 50;
+    const realLoadCount = isBroadcast ? 20 : (Object.keys(this.bubbles).length > 0 ? Math.max(35, pageCount) : pageCount);
     //const realLoadCount = pageCount;//const realLoadCount = 50;
     let loadCount = realLoadCount;
     
diff --git a/src/helpers/scrollSaver.ts b/src/helpers/scrollSaver.ts
index 4dfa021d..a502262b 100644
--- a/src/helpers/scrollSaver.ts
+++ b/src/helpers/scrollSaver.ts
@@ -74,7 +74,7 @@ export default class ScrollSaver {
       //isTouchSupported && isApple && (container.container.style.overflow = '');
 
       scrollable.lastScrollPosition = newScrollTop;
-      scrollable.lastScrollDirection = 0;
+      // scrollable.lastScrollDirection = 0;
 
       if(IS_SAFARI/*  && !isAppleMobile */) { // * fix blinking and jumping
         reflowScrollableElement(container);