From 458db4333a859511c4b2d3c895811b253309577b Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Tue, 12 Mar 2019 21:53:56 +0100
Subject: [Glitch] Fix public timeline page not paginating correctly

Port da45b8b4c9bf00495bb967dda38064ac74b85ead to glitch-soc
---
 .../glitch/features/standalone/public_timeline/index.js        | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'app/javascript/flavours/glitch/features/standalone/public_timeline')

diff --git a/app/javascript/flavours/glitch/features/standalone/public_timeline/index.js b/app/javascript/flavours/glitch/features/standalone/public_timeline/index.js
index 079f62f80..5e2b3fc6d 100644
--- a/app/javascript/flavours/glitch/features/standalone/public_timeline/index.js
+++ b/app/javascript/flavours/glitch/features/standalone/public_timeline/index.js
@@ -60,9 +60,13 @@ class PublicTimeline extends React.PureComponent {
     }
   }
 
-  handleLoadMore = maxId => {
-    const { dispatch, local } = this.props;
-    dispatch(local ? expandCommunityTimeline({ maxId }) : expandPublicTimeline({ maxId }));
+  handleLoadMore = () => {
+    const { dispatch, statusIds, local } = this.props;
+    const maxId = statusIds.last();
+
+    if (maxId) {
+      dispatch(local ? expandCommunityTimeline({ maxId }) : expandPublicTimeline({ maxId }));
+    }
   }
 
   setRef = c => {
-- 
cgit