Enable show less / more buttons for third party feeds (#8672)

Co-authored-by: hailey <hailey@blueskyweb.xyz>
Co-authored-by: Hailey <me@haileyok.com>
This commit is contained in:
kindgracekind
2025-08-26 14:16:50 -05:00
committed by GitHub
parent 98d96bd28b
commit 88e6dff484
11 changed files with 150 additions and 34 deletions
+86 -12
View File
@@ -10,10 +10,15 @@ import {AppState, type AppStateStatus} from 'react-native'
import {type AppBskyFeedDefs} from '@atproto/api'
import throttle from 'lodash.throttle'
import {FEEDBACK_FEEDS, STAGING_FEEDS} from '#/lib/constants'
import {PROD_FEEDS, STAGING_FEEDS} from '#/lib/constants'
import {isNetworkError} from '#/lib/hooks/useCleanError'
import {logEvent} from '#/lib/statsig/statsig'
import {Logger} from '#/logger'
import {
type FeedSourceFeedInfo,
type FeedSourceInfo,
isFeedSourceFeedInfo,
} from '#/state/queries/feed'
import {
type FeedDescriptor,
type FeedPostSliceItem,
@@ -21,6 +26,42 @@ import {
import {getItemsForFeedback} from '#/view/com/posts/PostFeed'
import {useAgent} from './session'
export const FEEDBACK_FEEDS = [...PROD_FEEDS, ...STAGING_FEEDS]
export const PASSIVE_FEEDBACK_INTERACTIONS = [
'app.bsky.feed.defs#clickthroughItem',
'app.bsky.feed.defs#clickthroughAuthor',
'app.bsky.feed.defs#clickthroughReposter',
'app.bsky.feed.defs#clickthroughEmbed',
'app.bsky.feed.defs#interactionSeen',
] as const
export type PassiveFeedbackInteraction =
(typeof PASSIVE_FEEDBACK_INTERACTIONS)[number]
export const DIRECT_FEEDBACK_INTERACTIONS = [
'app.bsky.feed.defs#requestLess',
'app.bsky.feed.defs#requestMore',
] as const
export type DirectFeedbackInteraction =
(typeof DIRECT_FEEDBACK_INTERACTIONS)[number]
export const ALL_FEEDBACK_INTERACTIONS = [
...PASSIVE_FEEDBACK_INTERACTIONS,
...DIRECT_FEEDBACK_INTERACTIONS,
] as const
export type FeedbackInteraction = (typeof ALL_FEEDBACK_INTERACTIONS)[number]
export function isFeedbackInteraction(
interactionEvent: string,
): interactionEvent is FeedbackInteraction {
return ALL_FEEDBACK_INTERACTIONS.includes(
interactionEvent as FeedbackInteraction,
)
}
const logger = Logger.create(Logger.Context.FeedFeedback)
export type StateContext = {
@@ -28,6 +69,7 @@ export type StateContext = {
onItemSeen: (item: any) => void
sendInteraction: (interaction: AppBskyFeedDefs.Interaction) => void
feedDescriptor: FeedDescriptor | undefined
feedSourceInfo: FeedSourceInfo | undefined
}
const stateContext = createContext<StateContext>({
@@ -35,15 +77,27 @@ const stateContext = createContext<StateContext>({
onItemSeen: (_item: any) => {},
sendInteraction: (_interaction: AppBskyFeedDefs.Interaction) => {},
feedDescriptor: undefined,
feedSourceInfo: undefined,
})
stateContext.displayName = 'FeedFeedbackContext'
export function useFeedFeedback(
feed: FeedDescriptor | undefined,
feedSourceInfo: FeedSourceInfo | undefined,
hasSession: boolean,
) {
const agent = useAgent()
const enabled = isDiscoverFeed(feed) && hasSession
const feed =
!!feedSourceInfo && isFeedSourceFeedInfo(feedSourceInfo)
? feedSourceInfo
: undefined
const isDiscover = isDiscoverFeed(feed?.feedDescriptor)
const acceptsInteractions = Boolean(isDiscover || feed?.acceptsInteractions)
const proxyDid = feed?.view?.did
const enabled =
Boolean(feed) && Boolean(proxyDid) && acceptsInteractions && hasSession
const enabledInteractions = getEnabledInteractions(enabled, feed, isDiscover)
const queue = useRef<Set<string>>(new Set())
const history = useRef<
@@ -66,19 +120,24 @@ export function useFeedFeedback(
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'
const interactionsToSend = interactions.filter(
interaction =>
interaction.event &&
isFeedbackInteraction(interaction.event) &&
enabledInteractions.includes(interaction.event),
)
if (interactionsToSend.length === 0) {
return
}
// Send to the feed
agent.app.bsky.feed
.sendInteractions(
{interactions},
{interactions: interactionsToSend},
{
encoding: 'application/json',
headers: {
// TODO when we start sending to other feeds, we need to grab their DID -prf
'atproto-proxy': `${proxyDid}#bsky_fg`,
},
},
@@ -93,10 +152,13 @@ export function useFeedFeedback(
if (aggregatedStats.current === null) {
aggregatedStats.current = createAggregatedStats()
}
sendOrAggregateInteractionsForStats(aggregatedStats.current, interactions)
sendOrAggregateInteractionsForStats(
aggregatedStats.current,
interactionsToSend,
)
throttledFlushAggregatedStats()
logger.debug('flushed')
}, [agent, throttledFlushAggregatedStats, feed])
}, [agent, throttledFlushAggregatedStats, proxyDid, enabledInteractions])
const sendToFeed = useMemo(
() =>
@@ -168,7 +230,8 @@ export function useFeedFeedback(
// call on various events
// queues the event to be sent with the throttled sendToFeed call
sendInteraction,
feedDescriptor: feed,
feedDescriptor: feed?.feedDescriptor,
feedSourceInfo: typeof feed === 'object' ? feed : undefined,
}
}, [enabled, onItemSeen, sendInteraction, feed])
}
@@ -184,10 +247,21 @@ export function useFeedFeedbackContext() {
// take advantage of the feed feedback API. Until that's in
// place, we're hardcoding it to the discover feed.
// -prf
function isDiscoverFeed(feed?: FeedDescriptor) {
export function isDiscoverFeed(feed?: FeedDescriptor) {
return !!feed && FEEDBACK_FEEDS.includes(feed)
}
function getEnabledInteractions(
enabled: boolean,
feed: FeedSourceFeedInfo | undefined,
isDiscover: boolean,
): readonly FeedbackInteraction[] {
if (!enabled || !feed) {
return []
}
return isDiscover ? ALL_FEEDBACK_INTERACTIONS : DIRECT_FEEDBACK_INTERACTIONS
}
function toString(interaction: AppBskyFeedDefs.Interaction): string {
return `${interaction.item}|${interaction.event}|${
interaction.feedContext || ''
+31
View File
@@ -48,6 +48,7 @@ export type FeedSourceFeedInfo = {
creatorDid: string
creatorHandle: string
likeCount: number | undefined
acceptsInteractions?: boolean
likeUri: string | undefined
contentMode: AppBskyFeedDefs.GeneratorView['contentMode']
}
@@ -73,6 +74,12 @@ export type FeedSourceListInfo = {
export type FeedSourceInfo = FeedSourceFeedInfo | FeedSourceListInfo
export function isFeedSourceFeedInfo(
feed: FeedSourceInfo,
): feed is FeedSourceFeedInfo {
return feed.type === 'feed'
}
const feedSourceInfoQueryKeyRoot = 'getFeedSourceInfo'
export const feedSourceInfoQueryKey = ({uri}: {uri: string}) => [
feedSourceInfoQueryKeyRoot,
@@ -115,6 +122,7 @@ export function hydrateFeedGenerator(
creatorDid: view.creator.did,
creatorHandle: view.creator.handle,
likeCount: view.likeCount,
acceptsInteractions: view.acceptsInteractions,
likeUri: view.viewer?.like,
contentMode: view.contentMode,
}
@@ -619,6 +627,29 @@ export function useSavedFeeds() {
})
}
const feedInfoQueryKeyRoot = 'feedInfo'
export function useFeedInfo(feedUri: string | undefined) {
const agent = useAgent()
return useQuery({
staleTime: STALE.INFINITY,
queryKey: [feedInfoQueryKeyRoot, feedUri],
queryFn: async () => {
if (!feedUri) {
return undefined
}
const res = await agent.app.bsky.feed.getFeedGenerator({
feed: feedUri,
})
const feedSourceInfo = hydrateFeedGenerator(res.data.view)
return feedSourceInfo
},
})
}
function precacheFeed(queryClient: QueryClient, hydratedFeed: FeedSourceInfo) {
precacheResolvedUri(
queryClient,
+2 -2
View File
@@ -2,7 +2,7 @@ import {useEffect, useId, useState} from 'react'
import {type AppBskyFeedDefs, AtUri} from '@atproto/api'
import {Logger} from '#/logger'
import {type FeedDescriptor} from '#/state/queries/post-feed'
import {type FeedSourceInfo} from '#/state/queries/feed'
/**
* Separate logger for better debugging
@@ -11,7 +11,7 @@ const logger = Logger.create(Logger.Context.PostSource)
export type PostSource = {
post: AppBskyFeedDefs.FeedViewPost
feed?: FeedDescriptor
feedSourceInfo?: FeedSourceInfo
}
/**