zio/bsky-app
2
0
Fork 0
Code Pull requests Releases Packages Activity

Fix 'load more' showing up incorrectly

Browse source
This commit is contained in:
Paul Frazee 2022-11-28 08:30:34 -06:00
parent f5ff0fd274
commit 9c4f62ffeb
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/state/models/feed-view.ts
View file

@ -7,6 +7,8 @@ import * as apilib from '../lib/api'
import {cleanError} from '../../lib/strings' import {cleanError} from '../../lib/strings'
import {isObj, hasProp} from '../lib/type-guards' import {isObj, hasProp} from '../lib/type-guards'
const PAGE_SIZE = 30
type FeedItem = GetTimeline.FeedItem | GetAuthorFeed.FeedItem type FeedItem = GetTimeline.FeedItem | GetAuthorFeed.FeedItem
type FeedItemWithThreadMeta = FeedItem & { type FeedItemWithThreadMeta = FeedItem & {
_isThreadParent?: boolean _isThreadParent?: boolean
@ -166,6 +168,7 @@ export class FeedModel {
params: GetTimeline.QueryParams | GetAuthorFeed.QueryParams params: GetTimeline.QueryParams | GetAuthorFeed.QueryParams
hasMore = true hasMore = true
loadMoreCursor: string | undefined loadMoreCursor: string | undefined
pollCursor: string | undefined
_loadPromise: Promise<void> | undefined _loadPromise: Promise<void> | undefined
_loadMorePromise: Promise<void> | undefined _loadMorePromise: Promise<void> | undefined
_loadLatestPromise: Promise<void> | undefined _loadLatestPromise: Promise<void> | undefined
@ -300,7 +303,7 @@ export class FeedModel {
const res = await this._getFeed({limit: 1}) const res = await this._getFeed({limit: 1})
this.setHasNewLatest( this.setHasNewLatest(
res.data.feed[0] && res.data.feed[0] &&
(this.feed.length === 0 || res.data.feed[0].uri !== this.feed[0]?.uri), (this.feed.length === 0 || res.data.feed[0].uri !== this.pollCursor),
) )
} }
@ -341,7 +344,7 @@ export class FeedModel {
private async _initialLoad(isRefreshing = false) { private async _initialLoad(isRefreshing = false) {
this._xLoading(isRefreshing) this._xLoading(isRefreshing)
try { try {
const res = await this._getFeed() const res = await this._getFeed({limit: PAGE_SIZE})
this._replaceAll(res) this._replaceAll(res)
this._xIdle() this._xIdle()
} catch (e: any) { } catch (e: any) {
@ -352,7 +355,7 @@ export class FeedModel {
private async _loadLatest() { private async _loadLatest() {
this._xLoading() this._xLoading()
try { try {
const res = await this._getFeed() const res = await this._getFeed({limit: PAGE_SIZE})
this._prependAll(res) this._prependAll(res)
this._xIdle() this._xIdle()
} catch (e: any) { } catch (e: any) {
@ -368,6 +371,7 @@ export class FeedModel {
try { try {
const res = await this._getFeed({ const res = await this._getFeed({
before: this.loadMoreCursor, before: this.loadMoreCursor,
limit: PAGE_SIZE,
}) })
this._appendAll(res) this._appendAll(res)
this._xIdle() this._xIdle()
@ -402,6 +406,7 @@ export class FeedModel {
private _replaceAll(res: GetTimeline.Response | GetAuthorFeed.Response) { private _replaceAll(res: GetTimeline.Response | GetAuthorFeed.Response) {
this.feed.length = 0 this.feed.length = 0
this.pollCursor = res.data.feed[0]?.uri
this._appendAll(res) this._appendAll(res)
} }
@ -434,6 +439,7 @@ export class FeedModel {
} }
private _prependAll(res: GetTimeline.Response | GetAuthorFeed.Response) { private _prependAll(res: GetTimeline.Response | GetAuthorFeed.Response) {
this.pollCursor = res.data.feed[0]?.uri
let counter = this.feed.length let counter = this.feed.length
const toPrepend = [] const toPrepend = []
for (const item of res.data.feed) { for (const item of res.data.feed) {
@ -493,8 +499,7 @@ function preprocessFeed(
for (let i = feed.length - 1; i >= 0; i--) { for (let i = feed.length - 1; i >= 0; i--) {
const item = feed[i] as FeedItemWithThreadMeta const item = feed[i] as FeedItemWithThreadMeta
// dont dedup the first item so that polling works properly if (dedup) {
if (dedup && i !== 0) {
if (reorg.find(item2 => item2.uri === item.uri)) { if (reorg.find(item2 => item2.uri === item.uri)) {
continue continue
} }