Reorganize custom-feed state models and add the missing _reactKey attribute

src/view/com/algos/AlgoItem.tsx

@@ -12,7 +12,7 @@ import {colors, s} from 'lib/styles'
 import {UserAvatar} from '../util/UserAvatar'
 import {Button} from '../util/forms/Button'
 import {observer} from 'mobx-react-lite'
-import {AlgoItemModel} from 'state/models/feeds/algo/algo-item'
+import {CustomFeedModel} from 'state/models/feeds/custom-feed'
 import {useFocusEffect, useNavigation} from '@react-navigation/native'
 import {NavigationProp} from 'lib/routes/types'
 import {useStores} from 'state/index'
@@ -28,7 +28,7 @@ const AlgoItem = observer(
     showBottom = true,
     reloadOnFocus = false,
   }: {
-    item: AlgoItemModel
+    item: CustomFeedModel
     style?: StyleProp<ViewStyle>
     showBottom?: boolean
     reloadOnFocus?: boolean

src/view/com/algos/SavedFeedItem.tsx

@@ -3,12 +3,18 @@ import {View, TouchableOpacity, StyleSheet} from 'react-native'
 import {FontAwesomeIcon} from '@fortawesome/react-native-fontawesome'
 import {colors} from 'lib/styles'
 import {observer} from 'mobx-react-lite'
-import {AlgoItemModel} from 'state/models/feeds/algo/algo-item'
-import {SavedFeedsModel} from 'state/models/feeds/algo/saved'
+import {CustomFeedModel} from 'state/models/feeds/custom-feed'
+import {SavedFeedsModel} from 'state/models/ui/saved-feeds'
 import AlgoItem from './AlgoItem'
 
 export const SavedFeedItem = observer(
-  ({item, savedFeeds}: {item: AlgoItemModel; savedFeeds: SavedFeedsModel}) => {
+  ({
+    item,
+    savedFeeds,
+  }: {
+    item: CustomFeedModel
+    savedFeeds: SavedFeedsModel
+  }) => {
     const isPinned = savedFeeds.isPinned(item)
 
     return (

src/view/com/algos/useCustomFeed.ts

@@ -1,10 +1,10 @@
 import {useEffect, useState} from 'react'
 import {useStores} from 'state/index'
-import {AlgoItemModel} from 'state/models/feeds/algo/algo-item'
+import {CustomFeedModel} from 'state/models/feeds/custom-feed'
 
 export function useCustomFeed(uri: string) {
   const store = useStores()
-  const [item, setItem] = useState<AlgoItemModel>()
+  const [item, setItem] = useState<CustomFeedModel>()
   useEffect(() => {
     async function fetchView() {
       const res = await store.agent.app.bsky.feed.getFeedGenerator({
@@ -16,7 +16,7 @@ export function useCustomFeed(uri: string) {
     async function buildFeedItem() {
       const view = await fetchView()
       if (view) {
-        const temp = new AlgoItemModel(store, view)
+        const temp = new CustomFeedModel(store, view)
         setItem(temp)
       }
     }

src/view/com/util/post-embeds/index.tsx

@@ -26,7 +26,7 @@ import {getYoutubeVideoId} from 'lib/strings/url-helpers'
 import QuoteEmbed from './QuoteEmbed'
 import {AutoSizedImage} from '../images/AutoSizedImage'
 import AlgoItem from 'view/com/algos/AlgoItem'
-import {AlgoItemModel} from 'state/models/feeds/algo/algo-item'
+import {CustomFeedModel} from 'state/models/feeds/custom-feed'
 
 type Embed =
   | AppBskyEmbedRecord.View
@@ -172,7 +172,7 @@ export function PostEmbeds({
   ) {
     return (
       <AlgoItem
-        item={new AlgoItemModel(store, embed.record)}
+        item={new CustomFeedModel(store, embed.record)}
         style={[pal.view, pal.border, styles.extOuter]}
         reloadOnFocus={true}
       />

src/view/screens/PinnedFeeds.tsx

@@ -26,7 +26,7 @@ import DraggableFlatList, {
 } from 'react-native-draggable-flatlist'
 import {SavedFeedItem} from 'view/com/algos/SavedFeedItem'
 import {FontAwesomeIcon} from '@fortawesome/react-native-fontawesome'
-import {AlgoItemModel} from 'state/models/feeds/algo/algo-item'
+import {CustomFeedModel} from 'state/models/feeds/custom-feed'
 
 type Props = NativeStackScreenProps<CommonNavigatorParams, 'PinnedFeeds'>
 
@@ -101,7 +101,7 @@ export const PinnedFeeds = withAuthRequired(
 )
 
 const PinnedItem = observer(
-  ({item, drag}: {item: AlgoItemModel; drag: () => void}) => {
+  ({item, drag}: {item: CustomFeedModel; drag: () => void}) => {
     const pal = usePalette('default')
     const rootStore = useStores()
     const savedFeeds = useMemo(() => rootStore.me.savedFeeds, [rootStore])

src/view/screens/Profile.tsx

@@ -26,7 +26,7 @@ import {s, colors} from 'lib/styles'
 import {useAnalytics} from 'lib/analytics'
 import {ComposeIcon2} from 'lib/icons'
 import AlgoItem from 'view/com/algos/AlgoItem'
-import {AlgoItemModel} from 'state/models/feeds/algo/algo-item'
+import {CustomFeedModel} from 'state/models/feeds/custom-feed'
 import {useSetTitle} from 'lib/hooks/useSetTitle'
 import {combinedDisplayName} from 'lib/strings/display-names'
 
@@ -188,7 +188,7 @@ export const ProfileScreen = withAuthRequired(
             return (
               <FeedSlice slice={item} ignoreMuteFor={uiState.profile.did} />
             )
-          } else if (item instanceof AlgoItemModel) {
+          } else if (item instanceof CustomFeedModel) {
             return <AlgoItem item={item} />
           }
         }

src/view/screens/SavedFeeds.tsx

@@ -21,7 +21,7 @@ import {CenteredView} from 'view/com/util/Views'
 import {Text} from 'view/com/util/text/Text'
 import {isDesktopWeb, isWeb} from 'platform/detection'
 import {s} from 'lib/styles'
-import {SavedFeedsModel} from 'state/models/feeds/algo/saved'
+import {SavedFeedsModel} from 'state/models/ui/saved-feeds'
 import {Link} from 'view/com/util/Link'
 import {UserAvatar} from 'view/com/util/UserAvatar'
 import {SavedFeedItem} from 'view/com/algos/SavedFeedItem'