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

Adds profile media tab (#1137)

Browse source 
* add media tab

* fix loading state

* cleanup

* update naming

* upgrade api package

* fix load state

* add scroll view to tabs

* fix overflow on mobile web
This commit is contained in:
Eric Bailey 2023-08-10 12:50:37 -05:00 • committed by GitHub
parent 03d152675e
commit cc3fcb1645
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 109 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/state/models/feeds/posts.ts
View file

@ -74,24 +74,6 @@ export class PostsFeedModel {
return this.hasLoaded && !this.hasContent
}
get nonReplyFeed() {
if (this.feedType === 'author') {
return this.slices.filter(slice => {
const params = this.params as GetAuthorFeed.QueryParams
const item = slice.rootItem
const isRepost =
item?.reasonRepost?.by?.handle === params.actor ||
item?.reasonRepost?.by?.did === params.actor
const allow =
!item.postRecord?.reply || // not a reply
isRepost // but allow if it's a repost
return allow
})
} else {
return this.slices
}
}
setHasNewLatest(v: boolean) {
this.hasNewLatest = v
}

54
src/state/models/ui/profile.ts
View file

@ -6,8 +6,9 @@ import {ActorFeedsModel} from '../lists/actor-feeds'
import {ListsListModel} from '../lists/lists-list'
export enum Sections {
Posts = 'Posts',
PostsNoReplies = 'Posts',
PostsWithReplies = 'Posts & replies',
PostsWithMedia = 'Media',
CustomAlgorithms = 'Feeds',
Lists = 'Lists',
}
@ -46,6 +47,7 @@ export class ProfileUiModel {
this.feed = new PostsFeedModel(rootStore, 'author', {
actor: params.user,
limit: 10,
filter: 'posts_no_replies',
})
this.algos = new ActorFeedsModel(rootStore, {actor: params.user})
this.lists = new ListsListModel(rootStore, params.user)
@ -53,8 +55,9 @@ export class ProfileUiModel {
get currentView(): PostsFeedModel | ActorFeedsModel | ListsListModel {
if (
this.selectedView === Sections.Posts ||
this.selectedView === Sections.PostsWithReplies
this.selectedView === Sections.PostsNoReplies ||
this.selectedView === Sections.PostsWithReplies ||
this.selectedView === Sections.PostsWithMedia
) {
return this.feed
} else if (this.selectedView === Sections.Lists) {
@ -76,7 +79,11 @@ export class ProfileUiModel {
}
get selectorItems() {
const items = [Sections.Posts, Sections.PostsWithReplies]
const items = [
Sections.PostsNoReplies,
Sections.PostsWithReplies,
Sections.PostsWithMedia,
]
if (this.algos.hasLoaded && !this.algos.isEmpty) {
items.push(Sections.CustomAlgorithms)
}
@ -90,7 +97,7 @@ export class ProfileUiModel {
// If, for whatever reason, the selected view index is not available, default back to posts
// This can happen when the user was focused on a view but performed an action that caused
// the view to disappear (e.g. deleting the last list in their list of lists https://imgflip.com/i/7txu1y)
return this.selectorItems[this.selectedViewIndex] || Sections.Posts
return this.selectorItems[this.selectedViewIndex] || Sections.PostsNoReplies
}
get uiItems() {
@ -109,16 +116,22 @@ export class ProfileUiModel {
} else {
// not loading, no error, show content
if (
this.selectedView === Sections.Posts ||
this.selectedView === Sections.PostsNoReplies ||
this.selectedView === Sections.PostsWithReplies ||
this.selectedView === Sections.PostsWithMedia ||
this.selectedView === Sections.CustomAlgorithms
) {
if (this.feed.hasContent) {
if (this.selectedView === Sections.CustomAlgorithms) {
arr = this.algos.feeds
} else if (this.selectedView === Sections.Posts) {
arr = this.feed.nonReplyFeed
} else if (
this.selectedView === Sections.PostsNoReplies ||
this.selectedView === Sections.PostsWithReplies ||
this.selectedView === Sections.PostsWithMedia
) {
arr = this.feed.slices.slice()
} else {
// posts with replies is also default
arr = this.feed.slices.slice()
}
if (!this.feed.hasMore) {
@ -143,8 +156,9 @@ export class ProfileUiModel {
get showLoadingMoreFooter() {
if (
this.selectedView === Sections.Posts ||
this.selectedView === Sections.PostsWithReplies
this.selectedView === Sections.PostsNoReplies ||
this.selectedView === Sections.PostsWithReplies ||
this.selectedView === Sections.PostsWithMedia
) {
return this.feed.hasContent && this.feed.hasMore && this.feed.isLoading
} else if (this.selectedView === Sections.Lists) {
@ -157,7 +171,27 @@ export class ProfileUiModel {
// =
setSelectedViewIndex(index: number) {
// ViewSelector fires onSelectView on mount
if (index === this.selectedViewIndex) return
this.selectedViewIndex = index
let filter = 'posts_no_replies'
if (this.selectedView === Sections.PostsWithReplies) {
filter = 'posts_with_replies'
} else if (this.selectedView === Sections.PostsWithMedia) {
filter = 'posts_with_media'
}
this.feed = new PostsFeedModel(this.rootStore, 'author', {
actor: this.params.user,
limit: 10,
filter,
})
if (this.currentView instanceof PostsFeedModel) {
this.feed.setup()
}
}
async setup() {