From 6f3f11671d526c5d9a454c46f6daf305b588ef4c Mon Sep 17 00:00:00 2001 From: Hailey Date: Fri, 17 Jan 2025 12:19:16 -0800 Subject: tweaks to constants (#7478) * add did * use correct did * typo * tweak --- src/lib/constants.ts | 15 +++++++++++++++ src/state/feed-feedback.tsx | 14 ++++++++++---- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/src/lib/constants.ts b/src/lib/constants.ts index 566edf69d..5ae000f72 100644 --- a/src/lib/constants.ts +++ b/src/lib/constants.ts @@ -63,6 +63,21 @@ export function IS_PROD_SERVICE(url?: string) { export const PROD_DEFAULT_FEED = (rkey: string) => `at://did:plc:z72i7hdynmk6r22z27h6tvur/app.bsky.feed.generator/${rkey}` +export const STAGING_DEFAULT_FEED = (rkey: string) => + `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, height: 2000, diff --git a/src/state/feed-feedback.tsx b/src/state/feed-feedback.tsx index 02f98ad14..de5157a54 100644 --- a/src/state/feed-feedback.tsx +++ b/src/state/feed-feedback.tsx @@ -3,7 +3,7 @@ import {AppState, AppStateStatus} from 'react-native' import {AppBskyFeedDefs} from '@atproto/api' import throttle from 'lodash.throttle' -import {PROD_DEFAULT_FEED} 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' @@ -25,6 +25,7 @@ const stateContext = React.createContext({ export function useFeedFeedback(feed: FeedDescriptor, hasSession: boolean) { const agent = useAgent() const enabled = isDiscoverFeed(feed) && hasSession + const queue = React.useRef>(new Set()) const history = React.useRef< // Use a WeakSet so that we don't need to clear it. @@ -46,6 +47,11 @@ export function useFeedFeedback(feed: FeedDescriptor, hasSession: boolean) { const interactions = Array.from(queue.current).map(toInteraction) queue.current.clear() + let proxyDid = 'did:web:discover.bsky.app' + if (STAGING_FEEDS.includes(feed)) { + proxyDid = 'did:web:algo.pop2.bsky.app' + } + // Send to the feed agent.app.bsky.feed .sendInteractions( @@ -54,7 +60,7 @@ export function useFeedFeedback(feed: FeedDescriptor, hasSession: boolean) { encoding: 'application/json', headers: { // TODO when we start sending to other feeds, we need to grab their DID -prf - 'atproto-proxy': 'did:web:discover.bsky.app#bsky_fg', + 'atproto-proxy': `${proxyDid}#bsky_fg`, }, }, ) @@ -68,7 +74,7 @@ export function useFeedFeedback(feed: FeedDescriptor, hasSession: boolean) { } sendOrAggregateInteractionsForStats(aggregatedStats.current, interactions) throttledFlushAggregatedStats() - }, [agent, throttledFlushAggregatedStats]) + }, [agent, throttledFlushAggregatedStats, feed]) const sendToFeed = React.useMemo( () => @@ -155,7 +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')}` + return FEEDBACK_FEEDS.includes(feed) } function toString(interaction: AppBskyFeedDefs.Interaction): string { -- cgit 1.4.1