[Session] Drill `getAgent` into `notifications/utils` (#3703)

* Drill into notifications/util

(cherry picked from commit 84b535ed54f4fe93debcd198809bb184519c3507)

* Thread getAgent instead

---------

Co-authored-by: Dan Abramov <dan.abramov@gmail.com>
zio/stable
Eric Bailey 2024-04-25 15:48:01 -05:00 committed by GitHub
parent a69e567991
commit 35005da59e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 16 additions and 9 deletions

View File

@ -27,6 +27,7 @@ import {
} from '@tanstack/react-query' } from '@tanstack/react-query'
import {useMutedThreads} from '#/state/muted-threads' import {useMutedThreads} from '#/state/muted-threads'
import {getAgent} from '#/state/session'
import {STALE} from '..' import {STALE} from '..'
import {useModerationOpts} from '../preferences' import {useModerationOpts} from '../preferences'
import {embedViewRecordToPostView, getEmbeddedPost} from '../util' import {embedViewRecordToPostView, getEmbeddedPost} from '../util'
@ -71,6 +72,7 @@ export function useNotificationFeedQuery(opts?: {enabled?: boolean}) {
if (!page) { if (!page) {
page = ( page = (
await fetchPage({ await fetchPage({
getAgent,
limit: PAGE_SIZE, limit: PAGE_SIZE,
cursor: pageParam, cursor: pageParam,
queryClient, queryClient,

View File

@ -144,6 +144,7 @@ export function Provider({children}: React.PropsWithChildren<{}>) {
// count // count
const {page, indexedAt: lastIndexed} = await fetchPage({ const {page, indexedAt: lastIndexed} = await fetchPage({
getAgent,
cursor: undefined, cursor: undefined,
limit: 40, limit: 40,
queryClient, queryClient,

View File

@ -1,18 +1,19 @@
import { import {
AppBskyNotificationListNotifications, AppBskyEmbedRecord,
ModerationOpts,
moderateNotification,
AppBskyFeedDefs, AppBskyFeedDefs,
AppBskyFeedLike,
AppBskyFeedPost, AppBskyFeedPost,
AppBskyFeedRepost, AppBskyFeedRepost,
AppBskyFeedLike, AppBskyNotificationListNotifications,
AppBskyEmbedRecord, BskyAgent,
moderateNotification,
ModerationOpts,
} from '@atproto/api' } from '@atproto/api'
import chunk from 'lodash.chunk'
import {QueryClient} from '@tanstack/react-query' import {QueryClient} from '@tanstack/react-query'
import {getAgent} from '../../session' import chunk from 'lodash.chunk'
import {precacheProfile} from '../profile' import {precacheProfile} from '../profile'
import {NotificationType, FeedNotification, FeedPage} from './types' import {FeedNotification, FeedPage, NotificationType} from './types'
const GROUPABLE_REASONS = ['like', 'repost', 'follow'] const GROUPABLE_REASONS = ['like', 'repost', 'follow']
const MS_1HR = 1e3 * 60 * 60 const MS_1HR = 1e3 * 60 * 60
@ -22,6 +23,7 @@ const MS_2DAY = MS_1HR * 48
// = // =
export async function fetchPage({ export async function fetchPage({
getAgent,
cursor, cursor,
limit, limit,
queryClient, queryClient,
@ -29,6 +31,7 @@ export async function fetchPage({
threadMutes, threadMutes,
fetchAdditionalData, fetchAdditionalData,
}: { }: {
getAgent: () => BskyAgent
cursor: string | undefined cursor: string | undefined
limit: number limit: number
queryClient: QueryClient queryClient: QueryClient
@ -53,7 +56,7 @@ export async function fetchPage({
// we fetch subjects of notifications (usually posts) now instead of lazily // we fetch subjects of notifications (usually posts) now instead of lazily
// in the UI to avoid relayouts // in the UI to avoid relayouts
if (fetchAdditionalData) { if (fetchAdditionalData) {
const subjects = await fetchSubjects(notifsGrouped) const subjects = await fetchSubjects(getAgent, notifsGrouped)
for (const notif of notifsGrouped) { for (const notif of notifsGrouped) {
if (notif.subjectUri) { if (notif.subjectUri) {
notif.subject = subjects.get(notif.subjectUri) notif.subject = subjects.get(notif.subjectUri)
@ -137,6 +140,7 @@ export function groupNotifications(
} }
async function fetchSubjects( async function fetchSubjects(
getAgent: () => BskyAgent,
groupedNotifs: FeedNotification[], groupedNotifs: FeedNotification[],
): Promise<Map<string, AppBskyFeedDefs.PostView>> { ): Promise<Map<string, AppBskyFeedDefs.PostView>> {
const uris = new Set<string>() const uris = new Set<string>()