about summary refs log tree commit diff
path: root/app/javascript
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2019-03-12 21:53:56 +0100
committerGitHub <noreply@github.com>2019-03-12 21:53:56 +0100
commitda45b8b4c9bf00495bb967dda38064ac74b85ead (patch)
treefa8c75eca8ea1fad6f1b476471e08b36fb7930da /app/javascript
parent65fffeac3f960f9c74d693525a73ac14b201bf2b (diff)
Fix public timeline page not paginating correctly (#10245)
Diffstat (limited to 'app/javascript')
-rw-r--r--app/javascript/mastodon/features/standalone/public_timeline/index.js10
1 files changed, 7 insertions, 3 deletions
diff --git a/app/javascript/mastodon/features/standalone/public_timeline/index.js b/app/javascript/mastodon/features/standalone/public_timeline/index.js
index 5a67492ac..10129e606 100644
--- a/app/javascript/mastodon/features/standalone/public_timeline/index.js
+++ b/app/javascript/mastodon/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 => {