forked from
jollywhoppers.com/witchsky.app
Bluesky app fork with some witchin' additions 💫
Apply Following settings to Lists (#5313)
* Apply Following settings to Lists
* Remove dead code
+2
-28
+1
-1
src/components/StarterPack/Main/PostsList.tsx
+1
-1
src/components/StarterPack/Main/PostsList.tsx
···
18
18
19
19
export const PostsList = React.forwardRef<SectionRef, ProfilesListProps>(
20
20
function PostsListImpl({listUri, headerHeight, scrollElRef}, ref) {
21
-
const feed: FeedDescriptor = `list|${listUri}|as_following`
21
+
const feed: FeedDescriptor = `list|${listUri}`
22
22
const {_} = useLingui()
23
23
24
24
const onScrollToTop = useCallback(() => {
+1
-25
src/state/preferences/feed-tuners.tsx
+1
-25
src/state/preferences/feed-tuners.tsx
···
21
21
if (feedDesc.startsWith('feedgen')) {
22
22
return [FeedTuner.preferredLangOnly(langPrefs.contentLanguages)]
23
23
}
24
-
if (feedDesc.startsWith('list')) {
25
-
let feedTuners = []
26
-
if (feedDesc.endsWith('|as_following')) {
27
-
// Same as Following tuners below, copypaste for now.
28
-
feedTuners.push(FeedTuner.removeOrphans)
29
-
if (preferences?.feedViewPrefs.hideReposts) {
30
-
feedTuners.push(FeedTuner.removeReposts)
31
-
}
32
-
if (preferences?.feedViewPrefs.hideReplies) {
33
-
feedTuners.push(FeedTuner.removeReplies)
34
-
} else {
35
-
feedTuners.push(
36
-
FeedTuner.followedRepliesOnly({
37
-
userDid: currentAccount?.did || '',
38
-
}),
39
-
)
40
-
}
41
-
if (preferences?.feedViewPrefs.hideQuotePosts) {
42
-
feedTuners.push(FeedTuner.removeQuotePosts)
43
-
}
44
-
feedTuners.push(FeedTuner.dedupThreads)
45
-
}
46
-
return feedTuners
47
-
}
48
-
if (feedDesc === 'following') {
24
+
if (feedDesc === 'following' || feedDesc.startsWith('list')) {
49
25
const feedTuners = [FeedTuner.removeOrphans]
50
26
51
27
if (preferences?.feedViewPrefs.hideReposts) {
-2
src/state/queries/post-feed.ts
-2
src/state/queries/post-feed.ts
···
51
51
| 'posts_with_media'
52
52
type FeedUri = string
53
53
type ListUri = string
54
-
type ListFilter = 'as_following' // Applies current Following settings. Currently client-side.
55
54
56
55
export type FeedDescriptor =
57
56
| 'following'
···
59
58
| `feedgen|${FeedUri}`
60
59
| `likes|${ActorDid}`
61
60
| `list|${ListUri}`
62
-
| `list|${ListUri}|${ListFilter}`
63
61
export interface FeedParams {
64
62
mergeFeedEnabled?: boolean
65
63
mergeFeedSources?: string[]