Fix public timeline page not paginating correctly (#10245)

6 years ago · da45b8b4c9
parent 65fffeac3f
commit da45b8b4c9
1 changed files with 7 additions and 3 deletions
--- 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 => {