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

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

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 079f62f80c..5e2b3fc6d7 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 => {