From 3d09008bfde3352212ab69105063150a175b8d5d Mon Sep 17 00:00:00 2001
From: Paul Frazee <pfrazee@gmail.com>
Date: Wed, 17 May 2023 14:03:08 -0500
Subject: [PATCH] Reorganize custom feeds in the view layer

---
 src/{view/com/algos => lib/hooks}/useCustomFeed.ts        | 0
 src/state/models/ui/profile.ts                            | 4 ----
 src/view/com/{algos/AlgoItem.tsx => feeds/CustomFeed.tsx} | 4 ++--
 src/view/com/{algos => feeds}/SavedFeedItem.tsx           | 4 ++--
 src/view/com/util/post-embeds/index.tsx                   | 4 ++--
 src/view/screens/CustomFeed.tsx                           | 2 +-
 src/view/screens/PinnedFeeds.tsx                          | 2 +-
 src/view/screens/Profile.tsx                              | 4 ++--
 src/view/screens/SavedFeeds.tsx                           | 2 +-
 9 files changed, 11 insertions(+), 15 deletions(-)
 rename src/{view/com/algos => lib/hooks}/useCustomFeed.ts (100%)
 rename src/view/com/{algos/AlgoItem.tsx => feeds/CustomFeed.tsx} (98%)
 rename src/view/com/{algos => feeds}/SavedFeedItem.tsx (95%)

diff --git a/src/view/com/algos/useCustomFeed.ts b/src/lib/hooks/useCustomFeed.ts
similarity index 100%
rename from src/view/com/algos/useCustomFeed.ts
rename to src/lib/hooks/useCustomFeed.ts
diff --git a/src/state/models/ui/profile.ts b/src/state/models/ui/profile.ts
index 2189e8e9..54ee461b 100644
--- a/src/state/models/ui/profile.ts
+++ b/src/state/models/ui/profile.ts
@@ -1,5 +1,4 @@
 import {makeAutoObservable} from 'mobx'
-import {AppBskyFeedDefs} from '@atproto/api'
 import {RootStoreModel} from '../root-store'
 import {ProfileModel} from '../content/profile'
 import {PostsFeedModel} from '../feeds/posts'
@@ -90,9 +89,6 @@ export class ProfileUiModel {
   get selectedView() {
     return this.selectorItems[this.selectedViewIndex]
   }
-  isGeneratorView(v: any) {
-    return AppBskyFeedDefs.isGeneratorView(v)
-  }
 
   get uiItems() {
     let arr: any[] = []
diff --git a/src/view/com/algos/AlgoItem.tsx b/src/view/com/feeds/CustomFeed.tsx
similarity index 98%
rename from src/view/com/algos/AlgoItem.tsx
rename to src/view/com/feeds/CustomFeed.tsx
index ea45005d..2137081f 100644
--- a/src/view/com/algos/AlgoItem.tsx
+++ b/src/view/com/feeds/CustomFeed.tsx
@@ -21,7 +21,7 @@ import {pluralize} from 'lib/strings/helpers'
 import {AtUri} from '@atproto/api'
 import {isWeb} from 'platform/detection'
 
-const AlgoItem = observer(
+const CustomFeed = observer(
   ({
     item,
     style,
@@ -112,7 +112,7 @@ const AlgoItem = observer(
     )
   },
 )
-export default AlgoItem
+export default CustomFeed
 
 const styles = StyleSheet.create({
   container: {
diff --git a/src/view/com/algos/SavedFeedItem.tsx b/src/view/com/feeds/SavedFeedItem.tsx
similarity index 95%
rename from src/view/com/algos/SavedFeedItem.tsx
rename to src/view/com/feeds/SavedFeedItem.tsx
index e8aeae72..b93cebe1 100644
--- a/src/view/com/algos/SavedFeedItem.tsx
+++ b/src/view/com/feeds/SavedFeedItem.tsx
@@ -5,7 +5,7 @@ import {colors} from 'lib/styles'
 import {observer} from 'mobx-react-lite'
 import {CustomFeedModel} from 'state/models/feeds/custom-feed'
 import {SavedFeedsModel} from 'state/models/ui/saved-feeds'
-import AlgoItem from './AlgoItem'
+import CustomFeed from './CustomFeed'
 
 export const SavedFeedItem = observer(
   ({
@@ -19,7 +19,7 @@ export const SavedFeedItem = observer(
 
     return (
       <View style={styles.itemContainer}>
-        <AlgoItem
+        <CustomFeed
           key={item.data.uri}
           item={item}
           showBottom={false}
diff --git a/src/view/com/util/post-embeds/index.tsx b/src/view/com/util/post-embeds/index.tsx
index 727c56e9..1f8e4881 100644
--- a/src/view/com/util/post-embeds/index.tsx
+++ b/src/view/com/util/post-embeds/index.tsx
@@ -25,7 +25,7 @@ import {ExternalLinkEmbed} from './ExternalLinkEmbed'
 import {getYoutubeVideoId} from 'lib/strings/url-helpers'
 import QuoteEmbed from './QuoteEmbed'
 import {AutoSizedImage} from '../images/AutoSizedImage'
-import AlgoItem from 'view/com/algos/AlgoItem'
+import CustomFeed from 'view/com/feeds/CustomFeed'
 import {CustomFeedModel} from 'state/models/feeds/custom-feed'
 
 type Embed =
@@ -171,7 +171,7 @@ export function PostEmbeds({
     AppBskyFeedDefs.isGeneratorView(embed.record)
   ) {
     return (
-      <AlgoItem
+      <CustomFeed
         item={new CustomFeedModel(store, embed.record)}
         style={[pal.view, pal.border, styles.extOuter]}
         reloadOnFocus={true}
diff --git a/src/view/screens/CustomFeed.tsx b/src/view/screens/CustomFeed.tsx
index a50916a9..76125fa5 100644
--- a/src/view/screens/CustomFeed.tsx
+++ b/src/view/screens/CustomFeed.tsx
@@ -9,7 +9,7 @@ import React, {useMemo, useRef} from 'react'
 import {FlatList, StyleSheet, TouchableOpacity, View} from 'react-native'
 import {useStores} from 'state/index'
 import {PostsFeedModel} from 'state/models/feeds/posts'
-import {useCustomFeed} from 'view/com/algos/useCustomFeed'
+import {useCustomFeed} from 'lib/hooks/useCustomFeed'
 import {withAuthRequired} from 'view/com/auth/withAuthRequired'
 import {Feed} from 'view/com/posts/Feed'
 import {Link} from 'view/com/util/Link'
diff --git a/src/view/screens/PinnedFeeds.tsx b/src/view/screens/PinnedFeeds.tsx
index dc4e22a7..85f73774 100644
--- a/src/view/screens/PinnedFeeds.tsx
+++ b/src/view/screens/PinnedFeeds.tsx
@@ -24,7 +24,7 @@ import DraggableFlatList, {
   ShadowDecorator,
   ScaleDecorator,
 } from 'react-native-draggable-flatlist'
-import {SavedFeedItem} from 'view/com/algos/SavedFeedItem'
+import {SavedFeedItem} from 'view/com/feeds/SavedFeedItem'
 import {FontAwesomeIcon} from '@fortawesome/react-native-fontawesome'
 import {CustomFeedModel} from 'state/models/feeds/custom-feed'
 
diff --git a/src/view/screens/Profile.tsx b/src/view/screens/Profile.tsx
index 9c204f14..a80e3623 100644
--- a/src/view/screens/Profile.tsx
+++ b/src/view/screens/Profile.tsx
@@ -25,7 +25,7 @@ import {FAB} from '../com/util/fab/FAB'
 import {s, colors} from 'lib/styles'
 import {useAnalytics} from 'lib/analytics'
 import {ComposeIcon2} from 'lib/icons'
-import AlgoItem from 'view/com/algos/AlgoItem'
+import CustomFeed from 'view/com/feeds/CustomFeed'
 import {CustomFeedModel} from 'state/models/feeds/custom-feed'
 import {useSetTitle} from 'lib/hooks/useSetTitle'
 import {combinedDisplayName} from 'lib/strings/display-names'
@@ -189,7 +189,7 @@ export const ProfileScreen = withAuthRequired(
               <FeedSlice slice={item} ignoreMuteFor={uiState.profile.did} />
             )
           } else if (item instanceof CustomFeedModel) {
-            return <AlgoItem item={item} />
+            return <CustomFeed item={item} />
           }
         }
         return <View />
diff --git a/src/view/screens/SavedFeeds.tsx b/src/view/screens/SavedFeeds.tsx
index c02d8ce3..6d55649f 100644
--- a/src/view/screens/SavedFeeds.tsx
+++ b/src/view/screens/SavedFeeds.tsx
@@ -24,7 +24,7 @@ import {s} from 'lib/styles'
 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'
+import {SavedFeedItem} from 'view/com/feeds/SavedFeedItem'
 import {AtUri} from '@atproto/api'
 
 type Props = NativeStackScreenProps<CommonNavigatorParams, 'SavedFeeds'>