From db73978470661053392d8c74a85b4749a6045520 Mon Sep 17 00:00:00 2001 From: Hailey Date: Fri, 17 Jan 2025 12:08:09 -0800 Subject: [PATCH] tweak --- src/lib/constants.ts | 18 ++++++++++++++---- src/state/feed-feedback.tsx | 14 +++----------- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/src/lib/constants.ts b/src/lib/constants.ts index 24830e8cd0..5ae000f729 100644 --- a/src/lib/constants.ts +++ b/src/lib/constants.ts @@ -60,13 +60,23 @@ export function IS_PROD_SERVICE(url?: string) { return url && url !== STAGING_SERVICE && !url.startsWith(LOCAL_DEV_SERVICE) } -export const PROD_DEFAULT_FEED_DID = 'did:plc:z72i7hdynmk6r22z27h6tvur' export const PROD_DEFAULT_FEED = (rkey: string) => - `at://${PROD_DEFAULT_FEED_DID}/app.bsky.feed.generator/${rkey}` + `at://did:plc:z72i7hdynmk6r22z27h6tvur/app.bsky.feed.generator/${rkey}` -export const STAGING_DEFAULT_FEED_DID = 'did:plc:yofh3kx63drvfljkibw5zuxo' export const STAGING_DEFAULT_FEED = (rkey: string) => - `at://${STAGING_DEFAULT_FEED_DID}/app.bsky.feed.generator/${rkey}` + `at://did:plc:yofh3kx63drvfljkibw5zuxo/app.bsky.feed.generator/${rkey}` + +export const PROD_FEEDS = [ + `feedgen|${PROD_DEFAULT_FEED('whats-hot')}`, + `feedgen|${PROD_DEFAULT_FEED('thevids')}`, +] + +export const STAGING_FEEDS = [ + `feedgen|${STAGING_DEFAULT_FEED('whats-hot')}`, + `feedgen|${STAGING_DEFAULT_FEED('thevids')}`, +] + +export const FEEDBACK_FEEDS = [...PROD_FEEDS, ...STAGING_FEEDS] export const POST_IMG_MAX = { width: 2000, diff --git a/src/state/feed-feedback.tsx b/src/state/feed-feedback.tsx index c7fdd15224..de5157a54e 100644 --- a/src/state/feed-feedback.tsx +++ b/src/state/feed-feedback.tsx @@ -3,11 +3,7 @@ import {AppState, AppStateStatus} from 'react-native' import {AppBskyFeedDefs} from '@atproto/api' import throttle from 'lodash.throttle' -import { - PROD_DEFAULT_FEED, - STAGING_DEFAULT_FEED, - STAGING_DEFAULT_FEED_DID, -} from '#/lib/constants' +import {FEEDBACK_FEEDS, STAGING_FEEDS} from '#/lib/constants' import {logEvent} from '#/lib/statsig/statsig' import {logger} from '#/logger' import {FeedDescriptor, FeedPostSliceItem} from '#/state/queries/post-feed' @@ -52,7 +48,7 @@ export function useFeedFeedback(feed: FeedDescriptor, hasSession: boolean) { queue.current.clear() let proxyDid = 'did:web:discover.bsky.app' - if (feed.includes(STAGING_DEFAULT_FEED_DID)) { + if (STAGING_FEEDS.includes(feed)) { proxyDid = 'did:web:algo.pop2.bsky.app' } @@ -165,11 +161,7 @@ export function useFeedFeedbackContext() { // place, we're hardcoding it to the discover feed. // -prf function isDiscoverFeed(feed: FeedDescriptor) { - return ( - feed === `feedgen|${PROD_DEFAULT_FEED('whats-hot')}` || - feed === `feedgen|${PROD_DEFAULT_FEED('thevids')}` || - feed === `feedgen|${STAGING_DEFAULT_FEED('thevids')}` - ) + return FEEDBACK_FEEDS.includes(feed) } function toString(interaction: AppBskyFeedDefs.Interaction): string {