Disambiguate feed component naming (#7040)

* Rename posts/Feed* -> posts/PostFeed*

* Rename notifications/Feed* -> notifications/NotificationFeed*
This commit is contained in:
dan
2024-12-10 20:57:53 +00:00
committed by GitHub
parent e052f5e198
commit d00879e628
14 changed files with 33 additions and 33 deletions
@@ -5,7 +5,7 @@ import {useLingui} from '@lingui/react'
import {isNative} from '#/platform/detection' import {isNative} from '#/platform/detection'
import {FeedDescriptor} from '#/state/queries/post-feed' import {FeedDescriptor} from '#/state/queries/post-feed'
import {Feed} from '#/view/com/posts/Feed' import {PostFeed} from '#/view/com/posts/PostFeed'
import {EmptyState} from '#/view/com/util/EmptyState' import {EmptyState} from '#/view/com/util/EmptyState'
import {ListRef} from '#/view/com/util/List' import {ListRef} from '#/view/com/util/List'
import {SectionRef} from '#/screens/Profile/Sections/types' import {SectionRef} from '#/screens/Profile/Sections/types'
@@ -38,7 +38,7 @@ export const PostsList = React.forwardRef<SectionRef, ProfilesListProps>(
return ( return (
<View> <View>
<Feed <PostFeed
feed={feed} feed={feed}
pollInterval={60e3} pollInterval={60e3}
scrollElRef={scrollElRef} scrollElRef={scrollElRef}
+2 -2
View File
@@ -10,7 +10,7 @@ import {isNative} from '#/platform/detection'
import {FeedDescriptor} from '#/state/queries/post-feed' import {FeedDescriptor} from '#/state/queries/post-feed'
import {RQKEY as FEED_RQKEY} from '#/state/queries/post-feed' import {RQKEY as FEED_RQKEY} from '#/state/queries/post-feed'
import {truncateAndInvalidate} from '#/state/queries/util' import {truncateAndInvalidate} from '#/state/queries/util'
import {Feed} from '#/view/com/posts/Feed' import {PostFeed} from '#/view/com/posts/PostFeed'
import {EmptyState} from '#/view/com/util/EmptyState' import {EmptyState} from '#/view/com/util/EmptyState'
import {ListRef} from '#/view/com/util/List' import {ListRef} from '#/view/com/util/List'
import {LoadLatestBtn} from '#/view/com/util/load-latest/LoadLatestBtn' import {LoadLatestBtn} from '#/view/com/util/load-latest/LoadLatestBtn'
@@ -74,7 +74,7 @@ export const ProfileFeedSection = React.forwardRef<
return ( return (
<View> <View>
<Feed <PostFeed
testID="postsFeed" testID="postsFeed"
enabled={isFocused} enabled={isFocused}
feed={feed} feed={feed}
+1 -1
View File
@@ -7,7 +7,7 @@ import {PROD_DEFAULT_FEED} from '#/lib/constants'
import {logEvent} from '#/lib/statsig/statsig' import {logEvent} from '#/lib/statsig/statsig'
import {logger} from '#/logger' import {logger} from '#/logger'
import {FeedDescriptor, FeedPostSliceItem} from '#/state/queries/post-feed' import {FeedDescriptor, FeedPostSliceItem} from '#/state/queries/post-feed'
import {getFeedPostSlice} from '#/view/com/posts/Feed' import {getFeedPostSlice} from '#/view/com/posts/PostFeed'
import {useAgent} from './session' import {useAgent} from './session'
type StateContext = { type StateContext = {
+1 -1
View File
@@ -33,7 +33,7 @@ import {STALE} from '#/state/queries'
import {DEFAULT_LOGGED_OUT_PREFERENCES} from '#/state/queries/preferences/const' import {DEFAULT_LOGGED_OUT_PREFERENCES} from '#/state/queries/preferences/const'
import {useAgent} from '#/state/session' import {useAgent} from '#/state/session'
import * as userActionHistory from '#/state/userActionHistory' import * as userActionHistory from '#/state/userActionHistory'
import {KnownError} from '#/view/com/posts/FeedErrorMessage' import {KnownError} from '#/view/com/posts/PostFeedErrorMessage'
import {useFeedTuners} from '../preferences/feed-tuners' import {useFeedTuners} from '../preferences/feed-tuners'
import {useModerationOpts} from '../preferences/moderation-opts' import {useModerationOpts} from '../preferences/moderation-opts'
import {usePreferencesQuery} from './preferences' import {usePreferencesQuery} from './preferences'
+2 -2
View File
@@ -21,7 +21,7 @@ import {useSession} from '#/state/session'
import {useSetMinimalShellMode} from '#/state/shell' import {useSetMinimalShellMode} from '#/state/shell'
import {useComposerControls} from '#/state/shell/composer' import {useComposerControls} from '#/state/shell/composer'
import {useHeaderOffset} from '#/components/hooks/useHeaderOffset' import {useHeaderOffset} from '#/components/hooks/useHeaderOffset'
import {Feed} from '../posts/Feed' import {PostFeed} from '../posts/PostFeed'
import {FAB} from '../util/fab/FAB' import {FAB} from '../util/fab/FAB'
import {ListMethods} from '../util/List' import {ListMethods} from '../util/List'
import {LoadLatestBtn} from '../util/load-latest/LoadLatestBtn' import {LoadLatestBtn} from '../util/load-latest/LoadLatestBtn'
@@ -112,7 +112,7 @@ export function FeedPage({
<View testID={testID}> <View testID={testID}>
<MainScrollProvider> <MainScrollProvider>
<FeedFeedbackProvider value={feedFeedback}> <FeedFeedbackProvider value={feedFeedback}>
<Feed <PostFeed
testID={testID ? `${testID}-feed` : undefined} testID={testID ? `${testID}-feed` : undefined}
enabled={isPageFocused || shouldPrefetch} enabled={isPageFocused || shouldPrefetch}
feed={feed} feed={feed}
@@ -21,13 +21,13 @@ import {ErrorMessage} from '#/view/com/util/error/ErrorMessage'
import {List, ListRef} from '#/view/com/util/List' import {List, ListRef} from '#/view/com/util/List'
import {NotificationFeedLoadingPlaceholder} from '#/view/com/util/LoadingPlaceholder' import {NotificationFeedLoadingPlaceholder} from '#/view/com/util/LoadingPlaceholder'
import {LoadMoreRetryBtn} from '#/view/com/util/LoadMoreRetryBtn' import {LoadMoreRetryBtn} from '#/view/com/util/LoadMoreRetryBtn'
import {FeedItem} from './FeedItem' import {NotificationFeedItem} from './NotificationFeedItem'
const EMPTY_FEED_ITEM = {_reactKey: '__empty__'} const EMPTY_FEED_ITEM = {_reactKey: '__empty__'}
const LOAD_MORE_ERROR_ITEM = {_reactKey: '__load_more_error__'} const LOAD_MORE_ERROR_ITEM = {_reactKey: '__load_more_error__'}
const LOADING_ITEM = {_reactKey: '__loading__'} const LOADING_ITEM = {_reactKey: '__loading__'}
export function Feed({ export function NotificationFeed({
scrollElRef, scrollElRef,
onPressTryAgain, onPressTryAgain,
onScrolledDownChange, onScrolledDownChange,
@@ -136,7 +136,7 @@ export function Feed({
) )
} }
return ( return (
<FeedItem <NotificationFeedItem
item={item} item={item}
moderationOpts={moderationOpts!} moderationOpts={moderationOpts!}
hideTopBorder={index === 0} hideTopBorder={index === 0}
@@ -76,7 +76,7 @@ interface Author {
moderation: ModerationDecision moderation: ModerationDecision
} }
let FeedItem = ({ let NotificationFeedItem = ({
item, item,
moderationOpts, moderationOpts,
hideTopBorder, hideTopBorder,
@@ -494,8 +494,8 @@ let FeedItem = ({
</Link> </Link>
) )
} }
FeedItem = memo(FeedItem) NotificationFeedItem = memo(NotificationFeedItem)
export {FeedItem} export {NotificationFeedItem}
function ExpandListPressable({ function ExpandListPressable({
hasMultipleAuthors, hasMultipleAuthors,
@@ -37,9 +37,9 @@ import {List, ListRef} from '../util/List'
import {PostFeedLoadingPlaceholder} from '../util/LoadingPlaceholder' import {PostFeedLoadingPlaceholder} from '../util/LoadingPlaceholder'
import {LoadMoreRetryBtn} from '../util/LoadMoreRetryBtn' import {LoadMoreRetryBtn} from '../util/LoadMoreRetryBtn'
import {DiscoverFallbackHeader} from './DiscoverFallbackHeader' import {DiscoverFallbackHeader} from './DiscoverFallbackHeader'
import {FeedErrorMessage} from './FeedErrorMessage'
import {FeedItem} from './FeedItem'
import {FeedShutdownMsg} from './FeedShutdownMsg' import {FeedShutdownMsg} from './FeedShutdownMsg'
import {PostFeedErrorMessage} from './PostFeedErrorMessage'
import {PostFeedItem} from './PostFeedItem'
import {ViewFullThread} from './ViewFullThread' import {ViewFullThread} from './ViewFullThread'
type FeedRow = type FeedRow =
@@ -101,7 +101,7 @@ export function getFeedPostSlice(feedRow: FeedRow): FeedPostSlice | null {
// const REFRESH_AFTER = STALE.HOURS.ONE // const REFRESH_AFTER = STALE.HOURS.ONE
const CHECK_LATEST_AFTER = STALE.SECONDS.THIRTY const CHECK_LATEST_AFTER = STALE.SECONDS.THIRTY
let Feed = ({ let PostFeed = ({
feed, feed,
feedParams, feedParams,
ignoreFilterFor, ignoreFilterFor,
@@ -444,7 +444,7 @@ let Feed = ({
return renderEmptyState() return renderEmptyState()
} else if (row.type === 'error') { } else if (row.type === 'error') {
return ( return (
<FeedErrorMessage <PostFeedErrorMessage
feedDesc={feed} feedDesc={feed}
error={error ?? undefined} error={error ?? undefined}
onPressTryAgain={onPressTryAgain} onPressTryAgain={onPressTryAgain}
@@ -480,7 +480,7 @@ let Feed = ({
const indexInSlice = row.indexInSlice const indexInSlice = row.indexInSlice
const item = slice.items[indexInSlice] const item = slice.items[indexInSlice]
return ( return (
<FeedItem <PostFeedItem
post={item.post} post={item.post}
record={item.record} record={item.record}
reason={indexInSlice === 0 ? slice.reason : undefined} reason={indexInSlice === 0 ? slice.reason : undefined}
@@ -576,8 +576,8 @@ let Feed = ({
</View> </View>
) )
} }
Feed = memo(Feed) PostFeed = memo(PostFeed)
export {Feed} export {PostFeed}
const styles = StyleSheet.create({ const styles = StyleSheet.create({
feedFooter: {paddingTop: 20}, feedFooter: {paddingTop: 20},
@@ -30,7 +30,7 @@ export enum KnownError {
Unknown = 'Unknown', Unknown = 'Unknown',
} }
export function FeedErrorMessage({ export function PostFeedErrorMessage({
feedDesc, feedDesc,
error, error,
onPressTryAgain, onPressTryAgain,
@@ -70,7 +70,7 @@ interface FeedItemProps {
isParentNotFound?: boolean isParentNotFound?: boolean
} }
export function FeedItem({ export function PostFeedItem({
post, post,
record, record,
reason, reason,
+4 -4
View File
@@ -44,9 +44,9 @@ import {
import * as Layout from '#/components/Layout' import * as Layout from '#/components/Layout'
import {H1, H3, P, Text} from '#/components/Typography' import {H1, H3, P, Text} from '#/components/Typography'
import {ScreenHider} from '../../components/moderation/ScreenHider' import {ScreenHider} from '../../components/moderation/ScreenHider'
import {FeedItem as NotifFeedItem} from '../com/notifications/FeedItem' import {NotificationFeedItem} from '../com/notifications/NotificationFeedItem'
import {PostThreadItem} from '../com/post-thread/PostThreadItem' import {PostThreadItem} from '../com/post-thread/PostThreadItem'
import {FeedItem} from '../com/posts/FeedItem' import {PostFeedItem} from '../com/posts/PostFeedItem'
import {ProfileCard} from '../com/profile/ProfileCard' import {ProfileCard} from '../com/profile/ProfileCard'
const LABEL_VALUES: (keyof typeof LABELS)[] = Object.keys( const LABEL_VALUES: (keyof typeof LABELS)[] = Object.keys(
@@ -817,7 +817,7 @@ function MockPostFeedItem({
) )
} }
return ( return (
<FeedItem <PostFeedItem
post={post} post={post}
record={post.record as AppBskyFeedPost.Record} record={post.record as AppBskyFeedPost.Record}
moderation={moderation} moderation={moderation}
@@ -872,7 +872,7 @@ function MockNotifItem({
</P> </P>
) )
} }
return <NotifFeedItem item={notif} moderationOpts={moderationOpts} /> return <NotificationFeedItem item={notif} moderationOpts={moderationOpts} />
} }
function MockAccountCard({ function MockAccountCard({
+2 -2
View File
@@ -23,7 +23,7 @@ import {
import {truncateAndInvalidate} from '#/state/queries/util' import {truncateAndInvalidate} from '#/state/queries/util'
import {useSetMinimalShellMode} from '#/state/shell' import {useSetMinimalShellMode} from '#/state/shell'
import {useComposerControls} from '#/state/shell/composer' import {useComposerControls} from '#/state/shell/composer'
import {Feed} from '#/view/com/notifications/Feed' import {NotificationFeed} from '#/view/com/notifications/NotificationFeed'
import {FAB} from '#/view/com/util/fab/FAB' import {FAB} from '#/view/com/util/fab/FAB'
import {ListMethods} from '#/view/com/util/List' import {ListMethods} from '#/view/com/util/List'
import {LoadLatestBtn} from '#/view/com/util/load-latest/LoadLatestBtn' import {LoadLatestBtn} from '#/view/com/util/load-latest/LoadLatestBtn'
@@ -156,7 +156,7 @@ export function NotificationsScreen({route: {params}}: Props) {
</Layout.Header.Outer> </Layout.Header.Outer>
<MainScrollProvider> <MainScrollProvider>
<Feed <NotificationFeed
onScrolledDownChange={setIsScrolledDown} onScrolledDownChange={setIsScrolledDown}
scrollElRef={scrollElRef} scrollElRef={scrollElRef}
overridePriorityNotifications={params?.show === 'all'} overridePriorityNotifications={params?.show === 'all'}
+2 -2
View File
@@ -39,7 +39,7 @@ import {truncateAndInvalidate} from '#/state/queries/util'
import {useSession} from '#/state/session' import {useSession} from '#/state/session'
import {useComposerControls} from '#/state/shell/composer' import {useComposerControls} from '#/state/shell/composer'
import {PagerWithHeader} from '#/view/com/pager/PagerWithHeader' import {PagerWithHeader} from '#/view/com/pager/PagerWithHeader'
import {Feed} from '#/view/com/posts/Feed' import {PostFeed} from '#/view/com/posts/PostFeed'
import {ProfileSubpageHeader} from '#/view/com/profile/ProfileSubpageHeader' import {ProfileSubpageHeader} from '#/view/com/profile/ProfileSubpageHeader'
import {EmptyState} from '#/view/com/util/EmptyState' import {EmptyState} from '#/view/com/util/EmptyState'
import {FAB} from '#/view/com/util/fab/FAB' import {FAB} from '#/view/com/util/fab/FAB'
@@ -480,7 +480,7 @@ const FeedSection = React.forwardRef<SectionRef, FeedSectionProps>(
return ( return (
<View> <View>
<FeedFeedbackProvider value={feedFeedback}> <FeedFeedbackProvider value={feedFeedback}>
<Feed <PostFeed
enabled={isFocused} enabled={isFocused}
feed={feed} feed={feed}
pollInterval={60e3} pollInterval={60e3}
+2 -2
View File
@@ -54,7 +54,7 @@ import {useSetMinimalShellMode} from '#/state/shell'
import {useComposerControls} from '#/state/shell/composer' import {useComposerControls} from '#/state/shell/composer'
import {ListMembers} from '#/view/com/lists/ListMembers' import {ListMembers} from '#/view/com/lists/ListMembers'
import {PagerWithHeader} from '#/view/com/pager/PagerWithHeader' import {PagerWithHeader} from '#/view/com/pager/PagerWithHeader'
import {Feed} from '#/view/com/posts/Feed' import {PostFeed} from '#/view/com/posts/PostFeed'
import {ProfileSubpageHeader} from '#/view/com/profile/ProfileSubpageHeader' import {ProfileSubpageHeader} from '#/view/com/profile/ProfileSubpageHeader'
import {EmptyState} from '#/view/com/util/EmptyState' import {EmptyState} from '#/view/com/util/EmptyState'
import {FAB} from '#/view/com/util/fab/FAB' import {FAB} from '#/view/com/util/fab/FAB'
@@ -789,7 +789,7 @@ const FeedSection = React.forwardRef<SectionRef, FeedSectionProps>(
return ( return (
<View> <View>
<Feed <PostFeed
testID="listFeed" testID="listFeed"
enabled={isFocused} enabled={isFocused}
feed={feed} feed={feed}