Merge pull request #54 from k4m2a/fix/brand-default-feeds

feat(brand): brand feed as signed-out + default feed, drop video default

Author: achalagrawal

brands/mdparivaar/brand.ts

@@ -104,7 +104,7 @@ const brand: Brand = {
     {
       type: 'feed',
       value:
-        'at://did:plc:ieyfjh6ystyufa3a7pi3jw5q/app.bsky.feed.generator/mdparivaar',
+        'at://did:plc:ieyfjh6ystyufa3a7pi3jw5q/app.bsky.feed.generator/md-parivaar',
       pinned: true,
     },
     {

src/lib/constants.ts

@@ -145,8 +145,11 @@ export const BSKY_FEED_OWNER_DIDS = [
   'did:plc:q6gjnaw2blty4crticxkmujt',
 ]
 
-export const DISCOVER_FEED_URI =
-  'at://did:plc:z72i7hdynmk6r22z27h6tvur/app.bsky.feed.generator/whats-hot'
+// The brand's primary feed doubles as its "discover" feed: it backs the
+// signed-out home and drives discover-specific UI (fresh-content polling,
+// composer prompt, etc.). For the Bluesky brand this resolves to whats-hot,
+// so upstream behavior is unchanged.
+export const DISCOVER_FEED_URI = brand.defaultFeeds[0].value
 export const VIDEO_FEED_URI =
   'at://did:plc:z72i7hdynmk6r22z27h6tvur/app.bsky.feed.generator/thevids'
 export const STAGING_VIDEO_FEED_URI =
@@ -158,11 +161,6 @@ export const VIDEO_FEED_URIS = [VIDEO_FEED_URI, STAGING_VIDEO_FEED_URI]
 // `src/brand/boot.ts` and the type assertion below.
 export const DISCOVER_SAVED_FEED = brand.defaultFeeds[0]
 export const TIMELINE_SAVED_FEED = brand.defaultFeeds[1]
-export const VIDEO_SAVED_FEED = {
-  type: 'feed',
-  value: VIDEO_FEED_URI,
-  pinned: true,
-}
 
 export const RECOMMENDED_SAVED_FEEDS: Pick<
   AppBskyActorDefs.SavedFeed,

src/screens/Onboarding/StepFinished/index.tsx

@@ -18,7 +18,6 @@ import {
   BSKY_APP_ACCOUNT_DID,
   DISCOVER_SAVED_FEED,
   TIMELINE_SAVED_FEED,
-  VIDEO_SAVED_FEED,
 } from '#/lib/constants'
 import {useRequestNotificationsPermission} from '#/lib/notifications/notifications'
 import {logger} from '#/logger'
@@ -108,7 +107,9 @@ export function StepFinished() {
           // Interests need to get saved first, then we can write the feeds to prefs
           await agent.setInterestsPref({tags: selectedInterests})
 
-          // Default feeds that every user should have pinned when landing in the app
+          // Default feeds that every user should have pinned when landing in
+          // the app: the brand's primary feed and the following timeline. This
+          // matches the brand defaults seeded at account creation.
           const feedsToSave: AppBskyActorDefs.SavedFeed[] = [
             {
               ...DISCOVER_SAVED_FEED,
@@ -118,10 +119,6 @@ export function StepFinished() {
               ...TIMELINE_SAVED_FEED,
               id: TID.nextStr(),
             },
-            {
-              ...VIDEO_SAVED_FEED,
-              id: TID.nextStr(),
-            },
           ]
 
           // Any starter pack feeds will be pinned _after_ the defaults

src/view/screens/Home.tsx

@@ -3,7 +3,6 @@ import {ActivityIndicator, StyleSheet} from 'react-native'
 import {withSpring} from 'react-native-reanimated'
 import {useFocusEffect} from '@react-navigation/native'
 
-import {PROD_DEFAULT_FEED} from '#/lib/constants'
 import {useNonReactiveCallback} from '#/lib/hooks/useNonReactiveCallback'
 import {useOTAUpdates} from '#/lib/hooks/useOTAUpdates'
 import {useSetTitle} from '#/lib/hooks/useSetTitle'
@@ -267,7 +266,7 @@ function HomeScreenReady({
           testID="customFeedPage"
           isPageFocused
           isPageAdjacent={false}
-          feed={`feedgen|${PROD_DEFAULT_FEED('whats-hot')}`}
+          feed={pinnedFeedInfos[0].feedDescriptor}
           renderEmptyState={renderCustomFeedEmptyState}
           feedInfo={pinnedFeedInfos[0]}
         />
@@ -330,7 +329,7 @@ function HomeScreenReady({
         testID="customFeedPage"
         isPageFocused
         isPageAdjacent={false}
-        feed={`feedgen|${PROD_DEFAULT_FEED('whats-hot')}`}
+        feed={pinnedFeedInfos[0].feedDescriptor}
         renderEmptyState={renderCustomFeedEmptyState}
         feedInfo={pinnedFeedInfos[0]}
       />