forked from
jollywhoppers.com/witchsky.app
Bluesky app fork with some witchin' additions 💫
Disambiguate feed component naming (#7040)
* Rename posts/Feed* -> posts/PostFeed*
* Rename notifications/Feed* -> notifications/NotificationFeed*
+33
-33
+2
-2
src/components/StarterPack/Main/PostsList.tsx
+2
-2
src/components/StarterPack/Main/PostsList.tsx
···
5
5
6
6
import {isNative} from '#/platform/detection'
7
7
import {FeedDescriptor} from '#/state/queries/post-feed'
8
-
import {Feed} from '#/view/com/posts/Feed'
8
+
import {PostFeed} from '#/view/com/posts/PostFeed'
9
9
import {EmptyState} from '#/view/com/util/EmptyState'
10
10
import {ListRef} from '#/view/com/util/List'
11
11
import {SectionRef} from '#/screens/Profile/Sections/types'
···
38
38
39
39
return (
40
40
<View>
41
-
<Feed
41
+
<PostFeed
42
42
feed={feed}
43
43
pollInterval={60e3}
44
44
scrollElRef={scrollElRef}
+2
-2
src/screens/Profile/Sections/Feed.tsx
+2
-2
src/screens/Profile/Sections/Feed.tsx
···
10
10
import {FeedDescriptor} from '#/state/queries/post-feed'
11
11
import {RQKEY as FEED_RQKEY} from '#/state/queries/post-feed'
12
12
import {truncateAndInvalidate} from '#/state/queries/util'
13
-
import {Feed} from '#/view/com/posts/Feed'
13
+
import {PostFeed} from '#/view/com/posts/PostFeed'
14
14
import {EmptyState} from '#/view/com/util/EmptyState'
15
15
import {ListRef} from '#/view/com/util/List'
16
16
import {LoadLatestBtn} from '#/view/com/util/load-latest/LoadLatestBtn'
···
74
74
75
75
return (
76
76
<View>
77
-
<Feed
77
+
<PostFeed
78
78
testID="postsFeed"
79
79
enabled={isFocused}
80
80
feed={feed}
+1
-1
src/state/feed-feedback.tsx
+1
-1
src/state/feed-feedback.tsx
···
7
7
import {logEvent} from '#/lib/statsig/statsig'
8
8
import {logger} from '#/logger'
9
9
import {FeedDescriptor, FeedPostSliceItem} from '#/state/queries/post-feed'
10
-
import {getFeedPostSlice} from '#/view/com/posts/Feed'
10
+
import {getFeedPostSlice} from '#/view/com/posts/PostFeed'
11
11
import {useAgent} from './session'
12
12
13
13
type StateContext = {
+1
-1
src/state/queries/post-feed.ts
+1
-1
src/state/queries/post-feed.ts
···
33
33
import {DEFAULT_LOGGED_OUT_PREFERENCES} from '#/state/queries/preferences/const'
34
34
import {useAgent} from '#/state/session'
35
35
import * as userActionHistory from '#/state/userActionHistory'
36
-
import {KnownError} from '#/view/com/posts/FeedErrorMessage'
36
+
import {KnownError} from '#/view/com/posts/PostFeedErrorMessage'
37
37
import {useFeedTuners} from '../preferences/feed-tuners'
38
38
import {useModerationOpts} from '../preferences/moderation-opts'
39
39
import {usePreferencesQuery} from './preferences'
+2
-2
src/view/com/feeds/FeedPage.tsx
+2
-2
src/view/com/feeds/FeedPage.tsx
···
21
21
import {useSetMinimalShellMode} from '#/state/shell'
22
22
import {useComposerControls} from '#/state/shell/composer'
23
23
import {useHeaderOffset} from '#/components/hooks/useHeaderOffset'
24
-
import {Feed} from '../posts/Feed'
24
+
import {PostFeed} from '../posts/PostFeed'
25
25
import {FAB} from '../util/fab/FAB'
26
26
import {ListMethods} from '../util/List'
27
27
import {LoadLatestBtn} from '../util/load-latest/LoadLatestBtn'
···
112
112
<View testID={testID}>
113
113
<MainScrollProvider>
114
114
<FeedFeedbackProvider value={feedFeedback}>
115
-
<Feed
115
+
<PostFeed
116
116
testID={testID ? `${testID}-feed` : undefined}
117
117
enabled={isPageFocused || shouldPrefetch}
118
118
feed={feed}
+3
-3
src/view/com/notifications/Feed.tsx
src/view/com/notifications/NotificationFeed.tsx
+3
-3
src/view/com/notifications/Feed.tsx
src/view/com/notifications/NotificationFeed.tsx
···
21
21
import {List, ListRef} from '#/view/com/util/List'
22
22
import {NotificationFeedLoadingPlaceholder} from '#/view/com/util/LoadingPlaceholder'
23
23
import {LoadMoreRetryBtn} from '#/view/com/util/LoadMoreRetryBtn'
24
-
import {FeedItem} from './FeedItem'
24
+
import {NotificationFeedItem} from './NotificationFeedItem'
25
25
26
26
const EMPTY_FEED_ITEM = {_reactKey: '__empty__'}
27
27
const LOAD_MORE_ERROR_ITEM = {_reactKey: '__load_more_error__'}
28
28
const LOADING_ITEM = {_reactKey: '__loading__'}
29
29
30
-
export function Feed({
30
+
export function NotificationFeed({
31
31
scrollElRef,
32
32
onPressTryAgain,
33
33
onScrolledDownChange,
···
136
136
)
137
137
}
138
138
return (
139
-
<FeedItem
139
+
<NotificationFeedItem
140
140
item={item}
141
141
moderationOpts={moderationOpts!}
142
142
hideTopBorder={index === 0}
+3
-3
src/view/com/notifications/FeedItem.tsx
src/view/com/notifications/NotificationFeedItem.tsx
+3
-3
src/view/com/notifications/FeedItem.tsx
src/view/com/notifications/NotificationFeedItem.tsx
···
76
76
moderation: ModerationDecision
77
77
}
78
78
79
-
let FeedItem = ({
79
+
let NotificationFeedItem = ({
80
80
item,
81
81
moderationOpts,
82
82
hideTopBorder,
···
494
494
</Link>
495
495
)
496
496
}
497
-
FeedItem = memo(FeedItem)
498
-
export {FeedItem}
497
+
NotificationFeedItem = memo(NotificationFeedItem)
498
+
export {NotificationFeedItem}
499
499
500
500
function ExpandListPressable({
501
501
hasMultipleAuthors,
+7
-7
src/view/com/posts/Feed.tsx
src/view/com/posts/PostFeed.tsx
+7
-7
src/view/com/posts/Feed.tsx
src/view/com/posts/PostFeed.tsx
···
37
37
import {PostFeedLoadingPlaceholder} from '../util/LoadingPlaceholder'
38
38
import {LoadMoreRetryBtn} from '../util/LoadMoreRetryBtn'
39
39
import {DiscoverFallbackHeader} from './DiscoverFallbackHeader'
40
-
import {FeedErrorMessage} from './FeedErrorMessage'
41
-
import {FeedItem} from './FeedItem'
42
40
import {FeedShutdownMsg} from './FeedShutdownMsg'
41
+
import {PostFeedErrorMessage} from './PostFeedErrorMessage'
42
+
import {PostFeedItem} from './PostFeedItem'
43
43
import {ViewFullThread} from './ViewFullThread'
44
44
45
45
type FeedRow =
···
101
101
// const REFRESH_AFTER = STALE.HOURS.ONE
102
102
const CHECK_LATEST_AFTER = STALE.SECONDS.THIRTY
103
103
104
-
let Feed = ({
104
+
let PostFeed = ({
105
105
feed,
106
106
feedParams,
107
107
ignoreFilterFor,
···
444
444
return renderEmptyState()
445
445
} else if (row.type === 'error') {
446
446
return (
447
-
<FeedErrorMessage
447
+
<PostFeedErrorMessage
448
448
feedDesc={feed}
449
449
error={error ?? undefined}
450
450
onPressTryAgain={onPressTryAgain}
···
480
480
const indexInSlice = row.indexInSlice
481
481
const item = slice.items[indexInSlice]
482
482
return (
483
-
<FeedItem
483
+
<PostFeedItem
484
484
post={item.post}
485
485
record={item.record}
486
486
reason={indexInSlice === 0 ? slice.reason : undefined}
···
576
576
</View>
577
577
)
578
578
}
579
-
Feed = memo(Feed)
580
-
export {Feed}
579
+
PostFeed = memo(PostFeed)
580
+
export {PostFeed}
581
581
582
582
const styles = StyleSheet.create({
583
583
feedFooter: {paddingTop: 20},
+1
-1
src/view/com/posts/FeedErrorMessage.tsx
src/view/com/posts/PostFeedErrorMessage.tsx
+1
-1
src/view/com/posts/FeedErrorMessage.tsx
src/view/com/posts/PostFeedErrorMessage.tsx
+1
-1
src/view/com/posts/FeedItem.tsx
src/view/com/posts/PostFeedItem.tsx
+1
-1
src/view/com/posts/FeedItem.tsx
src/view/com/posts/PostFeedItem.tsx
+4
-4
src/view/screens/DebugMod.tsx
+4
-4
src/view/screens/DebugMod.tsx
···
44
44
import * as Layout from '#/components/Layout'
45
45
import {H1, H3, P, Text} from '#/components/Typography'
46
46
import {ScreenHider} from '../../components/moderation/ScreenHider'
47
-
import {FeedItem as NotifFeedItem} from '../com/notifications/FeedItem'
47
+
import {NotificationFeedItem} from '../com/notifications/NotificationFeedItem'
48
48
import {PostThreadItem} from '../com/post-thread/PostThreadItem'
49
-
import {FeedItem} from '../com/posts/FeedItem'
49
+
import {PostFeedItem} from '../com/posts/PostFeedItem'
50
50
import {ProfileCard} from '../com/profile/ProfileCard'
51
51
52
52
const LABEL_VALUES: (keyof typeof LABELS)[] = Object.keys(
···
817
817
)
818
818
}
819
819
return (
820
-
<FeedItem
820
+
<PostFeedItem
821
821
post={post}
822
822
record={post.record as AppBskyFeedPost.Record}
823
823
moderation={moderation}
···
872
872
</P>
873
873
)
874
874
}
875
-
return <NotifFeedItem item={notif} moderationOpts={moderationOpts} />
875
+
return <NotificationFeedItem item={notif} moderationOpts={moderationOpts} />
876
876
}
877
877
878
878
function MockAccountCard({
+2
-2
src/view/screens/Notifications.tsx
+2
-2
src/view/screens/Notifications.tsx
···
23
23
import {truncateAndInvalidate} from '#/state/queries/util'
24
24
import {useSetMinimalShellMode} from '#/state/shell'
25
25
import {useComposerControls} from '#/state/shell/composer'
26
-
import {Feed} from '#/view/com/notifications/Feed'
26
+
import {NotificationFeed} from '#/view/com/notifications/NotificationFeed'
27
27
import {FAB} from '#/view/com/util/fab/FAB'
28
28
import {ListMethods} from '#/view/com/util/List'
29
29
import {LoadLatestBtn} from '#/view/com/util/load-latest/LoadLatestBtn'
···
156
156
</Layout.Header.Outer>
157
157
158
158
<MainScrollProvider>
159
-
<Feed
159
+
<NotificationFeed
160
160
onScrolledDownChange={setIsScrolledDown}
161
161
scrollElRef={scrollElRef}
162
162
overridePriorityNotifications={params?.show === 'all'}
+2
-2
src/view/screens/ProfileFeed.tsx
+2
-2
src/view/screens/ProfileFeed.tsx
···
39
39
import {useSession} from '#/state/session'
40
40
import {useComposerControls} from '#/state/shell/composer'
41
41
import {PagerWithHeader} from '#/view/com/pager/PagerWithHeader'
42
-
import {Feed} from '#/view/com/posts/Feed'
42
+
import {PostFeed} from '#/view/com/posts/PostFeed'
43
43
import {ProfileSubpageHeader} from '#/view/com/profile/ProfileSubpageHeader'
44
44
import {EmptyState} from '#/view/com/util/EmptyState'
45
45
import {FAB} from '#/view/com/util/fab/FAB'
···
480
480
return (
481
481
<View>
482
482
<FeedFeedbackProvider value={feedFeedback}>
483
-
<Feed
483
+
<PostFeed
484
484
enabled={isFocused}
485
485
feed={feed}
486
486
pollInterval={60e3}
+2
-2
src/view/screens/ProfileList.tsx
+2
-2
src/view/screens/ProfileList.tsx
···
54
54
import {useComposerControls} from '#/state/shell/composer'
55
55
import {ListMembers} from '#/view/com/lists/ListMembers'
56
56
import {PagerWithHeader} from '#/view/com/pager/PagerWithHeader'
57
-
import {Feed} from '#/view/com/posts/Feed'
57
+
import {PostFeed} from '#/view/com/posts/PostFeed'
58
58
import {ProfileSubpageHeader} from '#/view/com/profile/ProfileSubpageHeader'
59
59
import {EmptyState} from '#/view/com/util/EmptyState'
60
60
import {FAB} from '#/view/com/util/fab/FAB'
···
789
789
790
790
return (
791
791
<View>
792
-
<Feed
792
+
<PostFeed
793
793
testID="listFeed"
794
794
enabled={isFocused}
795
795
feed={feed}