+4

src/state/cache/profile-shadow.ts

··· 9 9 import {findAllProfilesInQueryData as findAllProfilesInListConvosQueryData} from '../queries/messages/list-converations' 10 10 import {findAllProfilesInQueryData as findAllProfilesInMyBlockedAccountsQueryData} from '../queries/my-blocked-accounts' 11 11 import {findAllProfilesInQueryData as findAllProfilesInMyMutedAccountsQueryData} from '../queries/my-muted-accounts' 12 12 + import {findAllProfilesInQueryData as findAllProfilesInFeedsQueryData} from '../queries/post-feed' 12 13 import {findAllProfilesInQueryData as findAllProfilesInPostLikedByQueryData} from '../queries/post-liked-by' 13 14 import {findAllProfilesInQueryData as findAllProfilesInPostRepostedByQueryData} from '../queries/post-reposted-by' 15 15 + import {findAllProfilesInQueryData as findAllProfilesInPostThreadQueryData} from '../queries/post-thread' 14 16 import {findAllProfilesInQueryData as findAllProfilesInProfileQueryData} from '../queries/profile' 15 17 import {findAllProfilesInQueryData as findAllProfilesInProfileFollowersQueryData} from '../queries/profile-followers' 16 18 import {findAllProfilesInQueryData as findAllProfilesInProfileFollowsQueryData} from '../queries/profile-follows' ··· 107 109 yield* findAllProfilesInSuggestedFollowsQueryData(queryClient, did) 108 110 yield* findAllProfilesInActorSearchQueryData(queryClient, did) 109 111 yield* findAllProfilesInListConvosQueryData(queryClient, did) 112 112 + yield* findAllProfilesInFeedsQueryData(queryClient, did) 113 113 + yield* findAllProfilesInPostThreadQueryData(queryClient, did) 110 114 }

+26 -1

src/state/queries/notifications/feed.ts

··· 17 17 */ 18 18 19 19 import {useEffect, useRef} from 'react' 20 20 - import {AppBskyFeedDefs} from '@atproto/api' 20 20 + import {AppBskyActorDefs, AppBskyFeedDefs} from '@atproto/api' 21 21 import { 22 22 InfiniteData, 23 23 QueryClient, ··· 162 162 } 163 163 } 164 164 } 165 165 + 166 166 + export function* findAllProfilesInQueryData( 167 167 + queryClient: QueryClient, 168 168 + did: string, 169 169 + ): Generator<AppBskyActorDefs.ProfileView, void> { 170 170 + const queryDatas = queryClient.getQueriesData<InfiniteData<FeedPage>>({ 171 171 + queryKey: [RQKEY_ROOT], 172 172 + }) 173 173 + for (const [_queryKey, queryData] of queryDatas) { 174 174 + if (!queryData?.pages) { 175 175 + continue 176 176 + } 177 177 + for (const page of queryData?.pages) { 178 178 + for (const item of page.items) { 179 179 + if (item.subject?.author.did === did) { 180 180 + yield item.subject.author 181 181 + } 182 182 + const quotedPost = getEmbeddedPost(item.subject?.embed) 183 183 + if (quotedPost?.author.did === did) { 184 184 + yield quotedPost.author 185 185 + } 186 186 + } 187 187 + } 188 188 + } 189 189 + }

+39

src/state/queries/post-feed.ts

··· 483 483 } 484 484 } 485 485 486 486 + export function* findAllProfilesInQueryData( 487 487 + queryClient: QueryClient, 488 488 + did: string, 489 489 + ): Generator<AppBskyActorDefs.ProfileView, undefined> { 490 490 + const queryDatas = queryClient.getQueriesData< 491 491 + InfiniteData<FeedPageUnselected> 492 492 + >({ 493 493 + queryKey: [RQKEY_ROOT], 494 494 + }) 495 495 + for (const [_queryKey, queryData] of queryDatas) { 496 496 + if (!queryData?.pages) { 497 497 + continue 498 498 + } 499 499 + for (const page of queryData?.pages) { 500 500 + for (const item of page.feed) { 501 501 + if (item.post.author.did === did) { 502 502 + yield item.post.author 503 503 + } 504 504 + const quotedPost = getEmbeddedPost(item.post.embed) 505 505 + if (quotedPost?.author.did === did) { 506 506 + yield quotedPost.author 507 507 + } 508 508 + if ( 509 509 + AppBskyFeedDefs.isPostView(item.reply?.parent) && 510 510 + item.reply?.parent?.author.did === did 511 511 + ) { 512 512 + yield item.reply.parent.author 513 513 + } 514 514 + if ( 515 515 + AppBskyFeedDefs.isPostView(item.reply?.root) && 516 516 + item.reply?.root?.author.did === did 517 517 + ) { 518 518 + yield item.reply.root.author 519 519 + } 520 520 + } 521 521 + } 522 522 + } 523 523 + } 524 524 + 486 525 function assertSomePostsPassModeration(feed: AppBskyFeedDefs.FeedViewPost[]) { 487 526 // no posts in this feed 488 527 if (feed.length === 0) return true

+46 -3

src/state/queries/post-thread.ts

··· 1 1 import { 2 2 + AppBskyActorDefs, 2 3 AppBskyEmbedRecord, 3 4 AppBskyFeedDefs, 4 5 AppBskyFeedGetPostThread, ··· 11 12 import {moderatePost_wrapped as moderatePost} from '#/lib/moderatePost_wrapped' 12 13 import {UsePreferencesQueryResponse} from '#/state/queries/preferences/types' 13 14 import {useAgent} from '#/state/session' 14 14 - import {findAllPostsInQueryData as findAllPostsInSearchQueryData} from 'state/queries/search-posts' 15 15 - import {findAllPostsInQueryData as findAllPostsInNotifsQueryData} from './notifications/feed' 16 16 - import {findAllPostsInQueryData as findAllPostsInFeedQueryData} from './post-feed' 15 15 + import { 16 16 + findAllPostsInQueryData as findAllPostsInSearchQueryData, 17 17 + findAllProfilesInQueryData as findAllProfilesInSearchQueryData, 18 18 + } from 'state/queries/search-posts' 19 19 + import { 20 20 + findAllPostsInQueryData as findAllPostsInNotifsQueryData, 21 21 + findAllProfilesInQueryData as findAllProfilesInNotifsQueryData, 22 22 + } from './notifications/feed' 23 23 + import { 24 24 + findAllPostsInQueryData as findAllPostsInFeedQueryData, 25 25 + findAllProfilesInQueryData as findAllProfilesInFeedQueryData, 26 26 + } from './post-feed' 17 27 import {embedViewRecordToPostView, getEmbeddedPost} from './util' 18 28 19 29 const RQKEY_ROOT = 'post-thread' ··· 290 300 } 291 301 for (let post of findAllPostsInSearchQueryData(queryClient, uri)) { 292 302 yield postViewToPlaceholderThread(post) 303 303 + } 304 304 + } 305 305 + 306 306 + export function* findAllProfilesInQueryData( 307 307 + queryClient: QueryClient, 308 308 + did: string, 309 309 + ): Generator<AppBskyActorDefs.ProfileView, void> { 310 310 + const queryDatas = queryClient.getQueriesData<ThreadNode>({ 311 311 + queryKey: [RQKEY_ROOT], 312 312 + }) 313 313 + for (const [_queryKey, queryData] of queryDatas) { 314 314 + if (!queryData) { 315 315 + continue 316 316 + } 317 317 + for (const item of traverseThread(queryData)) { 318 318 + if (item.type === 'post' && item.post.author.did === did) { 319 319 + yield item.post.author 320 320 + } 321 321 + const quotedPost = 322 322 + item.type === 'post' ? getEmbeddedPost(item.post.embed) : undefined 323 323 + if (quotedPost?.author.did === did) { 324 324 + yield quotedPost?.author 325 325 + } 326 326 + } 327 327 + } 328 328 + for (let profile of findAllProfilesInFeedQueryData(queryClient, did)) { 329 329 + yield profile 330 330 + } 331 331 + for (let profile of findAllProfilesInNotifsQueryData(queryClient, did)) { 332 332 + yield profile 333 333 + } 334 334 + for (let profile of findAllProfilesInSearchQueryData(queryClient, did)) { 335 335 + yield profile 293 336 } 294 337 } 295 338

+32 -1

src/state/queries/search-posts.ts

··· 1 1 - import {AppBskyFeedDefs, AppBskyFeedSearchPosts} from '@atproto/api' 1 1 + import { 2 2 + AppBskyActorDefs, 3 3 + AppBskyFeedDefs, 4 4 + AppBskyFeedSearchPosts, 5 5 + } from '@atproto/api' 2 6 import { 3 7 InfiniteData, 4 8 QueryClient, ··· 75 79 } 76 80 } 77 81 } 82 82 + 83 83 + export function* findAllProfilesInQueryData( 84 84 + queryClient: QueryClient, 85 85 + did: string, 86 86 + ): Generator<AppBskyActorDefs.ProfileView, undefined> { 87 87 + const queryDatas = queryClient.getQueriesData< 88 88 + InfiniteData<AppBskyFeedSearchPosts.OutputSchema> 89 89 + >({ 90 90 + queryKey: [searchPostsQueryKeyRoot], 91 91 + }) 92 92 + for (const [_queryKey, queryData] of queryDatas) { 93 93 + if (!queryData?.pages) { 94 94 + continue 95 95 + } 96 96 + for (const page of queryData?.pages) { 97 97 + for (const post of page.posts) { 98 98 + if (post.author.did === did) { 99 99 + yield post.author 100 100 + } 101 101 + const quotedPost = getEmbeddedPost(post.embed) 102 102 + if (quotedPost?.author.did === did) { 103 103 + yield quotedPost.author 104 104 + } 105 105 + } 106 106 + } 107 107 + } 108 108 + }

+2 -6

src/view/com/posts/AviFollowButton.tsx

··· 1 1 - import React, {useState} from 'react' 1 1 + import React from 'react' 2 2 import {View} from 'react-native' 3 3 import {AppBskyActorDefs, ModerationDecision} from '@atproto/api' 4 4 import {msg} from '@lingui/macro' ··· 39 39 }) 40 40 const gate = useGate() 41 41 const {currentAccount, hasSession} = useSession() 42 42 - const [followed, setFollowed] = useState<string | null>(null) 43 42 const navigation = useNavigation<NavigationProp>() 44 43 45 44 const name = sanitizeDisplayName( ··· 47 46 moderation.ui('displayName'), 48 47 ) 49 48 const isFollowing = 50 50 - profile.viewer?.following || 51 51 - profile.did === followed || 52 52 - profile.did === currentAccount?.did 49 49 + profile.viewer?.following || profile.did === currentAccount?.did 53 50 54 51 function onPress() { 55 52 follow() 56 56 - setFollowed(profile.did) 57 53 Toast.show(_(msg`Following ${name}`)) 58 54 } 59 55