From 158fba30f96600bd0e05a4c4152f123c28e44d4b Mon Sep 17 00:00:00 2001 From: Dan Abramov Date: Thu, 27 Jun 2024 18:04:23 +0100 Subject: [PATCH] Apply Following settings to Lists --- src/components/StarterPack/Main/PostsList.tsx | 2 +- src/state/preferences/feed-tuners.tsx | 34 +------------------ 2 files changed, 2 insertions(+), 34 deletions(-) diff --git a/src/components/StarterPack/Main/PostsList.tsx b/src/components/StarterPack/Main/PostsList.tsx index c19c6bc63e..0ff84ff459 100644 --- a/src/components/StarterPack/Main/PostsList.tsx +++ b/src/components/StarterPack/Main/PostsList.tsx @@ -18,7 +18,7 @@ interface ProfilesListProps { export const PostsList = React.forwardRef( function PostsListImpl({listUri, headerHeight, scrollElRef}, ref) { - const feed: FeedDescriptor = `list|${listUri}|as_following` + const feed: FeedDescriptor = `list|${listUri}` const {_} = useLingui() const onScrollToTop = useCallback(() => { diff --git a/src/state/preferences/feed-tuners.tsx b/src/state/preferences/feed-tuners.tsx index ca0fefe915..e411b3dbd5 100644 --- a/src/state/preferences/feed-tuners.tsx +++ b/src/state/preferences/feed-tuners.tsx @@ -18,39 +18,8 @@ export function useFeedTuners(feedDesc: FeedDescriptor) { FeedTuner.preferredLangOnly(langPrefs.contentLanguages), ] } - if (feedDesc.startsWith('list')) { + if (feedDesc.startsWith('list') || feedDesc === 'following') { const feedTuners = [] - - if (feedDesc.endsWith('|as_following')) { - // Same as Following tuners below, copypaste for now. - if (preferences?.feedViewPrefs.hideReposts) { - feedTuners.push(FeedTuner.removeReposts) - } else { - feedTuners.push(FeedTuner.dedupReposts) - } - if (preferences?.feedViewPrefs.hideReplies) { - feedTuners.push(FeedTuner.removeReplies) - } else { - feedTuners.push( - FeedTuner.thresholdRepliesOnly({ - userDid: currentAccount?.did || '', - minLikes: preferences?.feedViewPrefs.hideRepliesByLikeCount || 0, - followedOnly: - !!preferences?.feedViewPrefs.hideRepliesByUnfollowed, - }), - ) - } - if (preferences?.feedViewPrefs.hideQuotePosts) { - feedTuners.push(FeedTuner.removeQuotePosts) - } - } else { - feedTuners.push(FeedTuner.dedupReposts) - } - return feedTuners - } - if (feedDesc === 'following') { - const feedTuners = [] - if (preferences?.feedViewPrefs.hideReposts) { feedTuners.push(FeedTuner.removeReposts) } else { @@ -70,7 +39,6 @@ export function useFeedTuners(feedDesc: FeedDescriptor) { if (preferences?.feedViewPrefs.hideQuotePosts) { feedTuners.push(FeedTuner.removeQuotePosts) } - return feedTuners } return []