Updated SortingQueryBuilder for ExploreTimeline, GroupCollectionTimeline, GroupTimeline

• Updated:
- SortingQueryBuilder for ExploreTimeline, GroupCollectionTimeline, GroupTimeline

• TODO
- Test on a lot of data to ensure no repeats
- Test reducers/timeline updates to appending and concating non status.id sorted results

app/javascript/gabsocial/features/group_collection_timeline.js

@@ -24,9 +24,9 @@ import GroupsCollection from './groups_collection'
 class GroupCollectionTimeline extends React.PureComponent {
 
 	state = {
-		//keep track of loads for if no user, 
-		//only allow 2 loads before showing sign up msg
-		loadCount: 0,
+		//keep track of page loads for if no user, 
+		//only allow 2 page loads before showing sign up msg
+		page: 1,
 	}
 
 	componentDidMount() {
@@ -61,17 +61,14 @@ class GroupCollectionTimeline extends React.PureComponent {
 			sortByValue,
 			sortByTopValue,
 		} = this.props
-		const { loadCount } = this.state
-
-		if (!!maxId && !me) {
-			this.setState({ loadCount: this.state.loadCount + 1 })
-			if (loadCount >= 2) return false
-		} else if (!maxId && loadCount !== 0) {
-			this.setState({ loadCount: 0 })
-		}
+		const { page } = this.state
+		
+		const newPage = !!maxId ? this.state.page + 1 : 1
+		if (!!maxId && !me && page >= 2) return false
+		this.setState({ page: newPage })
 
 		const sortBy = getSortBy(sortByValue, sortByTopValue)
-		const options = { sortBy, maxId }
+		const options = { sortBy, maxId, page: newPage }
 
 		this.props.onExpandGroupCollectionTimeline(collectionType, options)
 	}
@@ -82,7 +79,7 @@ class GroupCollectionTimeline extends React.PureComponent {
 			intl,
 			hasNoGroupMembers,
 		} = this.props
-		const { loadCount } = this.state
+		const { page } = this.state
 
 		const emptyMessage = !!me && collectionType === 'member' && hasNoGroupMembers ? (
 			<div className={[_s.d, _s.w100PC]}>
@@ -93,7 +90,7 @@ class GroupCollectionTimeline extends React.PureComponent {
 			</div>
 		) : intl.formatMessage(messages.empty)
 
-		const canLoadMore = loadCount < 2 && !me || !!me
+		const canLoadMore = page < 2 && !me || !!me
 
 		return (
 			<React.Fragment>