From 1167699ae656b02fc412555b1eee6ee2fa793606 Mon Sep 17 00:00:00 2001
From: Liam Fitzgerald <liam@urizen.co>
Date: Thu, 30 Apr 2020 12:40:26 +1000
Subject: [PATCH] chat-js: refactor unread message fetch

---
 pkg/interface/chat/src/js/components/chat.js | 88 ++++++++++----------
 1 file changed, 45 insertions(+), 43 deletions(-)

diff --git a/pkg/interface/chat/src/js/components/chat.js b/pkg/interface/chat/src/js/components/chat.js
index 9f5bf8a77..ca84931fc 100644
--- a/pkg/interface/chat/src/js/components/chat.js
+++ b/pkg/interface/chat/src/js/components/chat.js
@@ -23,6 +23,7 @@ function getNumPending(props) {
 }
 
 const ACTIVITY_TIMEOUT = 60000; // a minute
+const DEFAULT_BACKLOG_SIZE = 300;
 
 function scrollIsAtTop(container) {
   if ((navigator.userAgent.includes("Safari") &&
@@ -93,9 +94,6 @@ export class ChatScreen extends Component {
   }
 
   componentDidMount() {
-    this.askForMessages();
-    this.scrollToBottom();
-
     document.addEventListener("mousemove", this.handleActivity, false);
     document.addEventListener("mousedown", this.handleActivity, false);
     document.addEventListener("keypress", this.handleActivity, false);
@@ -120,8 +118,9 @@ export class ChatScreen extends Component {
 
     if(this.activityTimeout) {
       clearTimeout(this.activityTimeout);
-      this.activityTimeout = setTimeout(this.setInactive, ACTIVITY_TIMEOUT);
     }
+
+    this.activityTimeout = setTimeout(this.setInactive, ACTIVITY_TIMEOUT);
   }
 
   setInactive() {
@@ -129,6 +128,39 @@ export class ChatScreen extends Component {
     this.setState({ active: false, scrollLocked: true });
   }
 
+  receivedNewChat() {
+    const { props } = this;
+    this.hasAskedForMessages = false;
+
+    this.unreadMarker = null;
+    this.scrolledToMarker = false;
+
+    this.setState({ read: props.read });
+
+    const unread = props.length - props.read;
+    const unreadUnloaded = unread - props.envelopes.length;
+
+    if(unreadUnloaded + 20 > DEFAULT_BACKLOG_SIZE) {
+      this.askForMessages(unreadUnloaded + 20);
+    } else {
+      this.askForMessages(DEFAULT_BACKLOG_SIZE);
+    }
+
+    if(props.read === props.length){
+      this.scrolledToMarker = true;
+      this.setState(
+        {
+          scrollLocked: false,
+        },
+        () => {
+          this.scrollToBottom();
+        }
+      );
+    } else {
+      this.setState({ scrollLocked: true, numPages: Math.ceil(unread/100) });
+    }
+  }
+
   componentDidUpdate(prevProps, prevState) {
     const { props, state } = this;
 
@@ -136,23 +168,7 @@ export class ChatScreen extends Component {
       prevProps.match.params.station !== props.match.params.station ||
       prevProps.match.params.ship !== props.match.params.ship
     ) {
-      this.hasAskedForMessages = false;
-
-      if (props.envelopes.length < 100) {
-        this.askForMessages();
-      }
-
-      this.unreadMarker = null;
-      this.scrolledToMarker = false;
-      this.setState(
-        {
-          scrollLocked: false,
-          read: props.read,
-        },
-        () => {
-          this.scrollToBottom();
-        }
-      );
+      this.receivedNewChat();
     } else if (props.chatInitialized &&
                !(props.station in props.inbox) &&
                (!!props.chatSynced && !(props.station in props.chatSynced))) {
@@ -163,15 +179,15 @@ export class ChatScreen extends Component {
     ) {
       this.hasAskedForMessages = false;
     } else if(props.length !== prevProps.length &&
-       prevProps.length === prevProps.read &&
+       prevProps.length === prevState.read &&
        state.active
     ) {
-      this.setState({ read: props.length })
+      this.setState({ read: props.length });
       this.props.api.chat.read(this.props.station);
     }
 
     if(!prevProps.chatInitialized && props.chatInitialized) {
-      this.setState({ read: props.read })
+      this.receivedNewChat();
     }
 
     if (
@@ -189,16 +205,9 @@ export class ChatScreen extends Component {
     }
   }
 
-  askForMessages() {
+  askForMessages(size) {
     const { props, state } = this;
 
-    if (props.envelopes.length === 0) {
-      setTimeout(() => {
-        this.askForMessages();
-      }, 500);
-      return;
-    }
-
     if (
       props.envelopes.length >= props.length ||
       this.hasAskedForMessages ||
@@ -210,16 +219,8 @@ export class ChatScreen extends Component {
     let start =
       props.length - props.envelopes[props.envelopes.length - 1].number;
     if (start > 0) {
-      const unread = props.length - props.read;
-      const unloadedUnread = unread - props.envelopes.length;
-      const willLoadUnread = unloadedUnread > 280;
-      const offset = willLoadUnread ? unloadedUnread + 20 : 300;
-      const end = start + offset < props.length ? start + offset : props.length;
+      const end = start + size < props.length ? start + size : props.length;
       this.hasAskedForMessages = true;
-      if(willLoadUnread) {
-        // ensure unread marker is visible
-        this.setState({ numPages: Math.ceil(unread / 100) });
-      }
       props.subscription.fetchMessages(start + 1, end, props.station);
     }
   }
@@ -260,7 +261,7 @@ export class ChatScreen extends Component {
           scrollLocked: true
         },
         () => {
-          this.askForMessages();
+          this.askForMessages(DEFAULT_BACKLOG_SIZE);
         }
       );
     } else if (scrollIsAtBottom(e.target)) {
@@ -276,7 +277,8 @@ export class ChatScreen extends Component {
     if(ref && !this.scrolledToMarker) {
       this.setState({ scrollLocked: true }, () => {
         ref.scrollIntoView({ block: 'center' });
-        if(scrollIsAtBottom(ref.offsetParent)) {
+        if(ref.offsetParent &&
+           scrollIsAtBottom(ref.offsetParent)) {
           this.dismissUnread();
           this.setState({
             numPages: 1,