Merge upstream develop

Author: github-actions[bot]

apps/polycentric/src/features/follow/hooks/useFollows.ts

@@ -7,6 +7,8 @@ import {
   decodeBundle,
   type DecodedBundle,
 } from '@/src/common/lib/polycentric-hooks/helpers';
+import { invalidateQuery } from '@/src/common/query/hooks/useQuery';
+import { feedQueryKeys } from '../../feed/hooks/feedCache';
 import { create } from 'zustand';
 
 type FollowsState = {
@@ -45,6 +47,7 @@ const useFollows = create<FollowsState>((set, get) => ({
     try {
       await client.commitEvent(signedEvent, content);
       await client.sync();
+      invalidateQuery(client, feedQueryKeys.following());
     } catch (err) {
       console.error(err);
       // revert the change
@@ -102,6 +105,7 @@ const useFollows = create<FollowsState>((set, get) => ({
 
     if (targets.length > 0) {
       await client.sync();
+      invalidateQuery(client, feedQueryKeys.following());
     }
   },
   /**

apps/polycentric/src/features/post/hooks/usePostActions.ts

@@ -7,6 +7,7 @@ import { invalidateQuery } from '@/src/common/query/hooks/useQuery';
 import { COLLECTION, v2, SyncStrategy } from '@polycentric/react-native';
 import { router, useSegments } from 'expo-router';
 import { feedQueryKeys } from '../../feed/hooks/feedCache';
+import { threadQueryKey } from './useThread';
 
 type PostActions = {
   /**
@@ -53,6 +54,16 @@ export default function usePostActions(post: PostData): PostActions {
     invalidateQuery(client, feedQueryKeys.explore(identity));
   };
 
+  const invalidateThreads = (reply: PostData['reply']) => {
+    if (!reply) return;
+    const parents = [reply.parentId, reply.rootId].filter(
+      (id): id is string => !!id,
+    );
+    for (const parentId of new Set(parents)) {
+      invalidateQuery(client, threadQueryKey(parentId));
+    }
+  };
+
   return {
     reportAsync: async () => {
       // TODO: discuss if we should record report events or
@@ -61,6 +72,7 @@ export default function usePostActions(post: PostData): PostActions {
     deleteAsync: async () => {
       await deleteEventAtKey(post.id);
       invalidateFeeds(post.identity);
+      invalidateThreads(post.reply);
 
       if (segments[0] === '[identityId]' && segments[1] === 'post') {
         // Redirect to profile

apps/polycentric/src/features/profile/hooks/useProfile.ts

@@ -32,14 +32,25 @@ const EMPTY_PROFILE: Omit<
   alias: null,
 };
 
+/**
+ * Shared cache key for a profile. The fetch mode is intentionally not part
+ * of the key so every surface (feed avatars, post authors, the profile page)
+ * reads and invalidates the same entry.
+ */
+export function profileQueryKey(
+  identityKey: string | null | undefined,
+): string[] {
+  return ['profile', identityKey ?? ''];
+}
+
 export function useProfile(
   identityKey: string | null | undefined,
   options?: UseProfileOptions,
 ): ProfileHookResult {
   const fetchMode = options?.fetchMode ?? FetchMode.OfflineOnly;
 
   const query = useQuery(
-    ['profile', identityKey ?? '', fetchMode.toString()],
+    profileQueryKey(identityKey),
     new Query.GetProfile({ identity: identityKey ?? '' }),
     { fetchMode },
     !!identityKey,

apps/polycentric/src/features/profile/hooks/useProfileEdit.test.ts

@@ -1,6 +1,9 @@
 jest.mock('@polycentric/react-native', () => ({
   resolveAlias: jest.fn(),
 }));
+jest.mock('@/src/common/query/hooks/useQuery', () => ({
+  invalidateQuery: jest.fn(),
+}));
 jest.mock('../../../common/lib/polycentric-hooks/PolycentricProvider', () => ({
   usePolycentric: () => ({}),
 }));

apps/polycentric/src/features/profile/hooks/useProfileEdit.ts

@@ -1,12 +1,13 @@
 import { useCallback, useEffect, useState } from 'react';
 import { resolveAlias } from '@polycentric/react-native';
 import { usePolycentric } from '../../../common/lib/polycentric-hooks/PolycentricProvider';
+import { invalidateQuery } from '@/src/common/query/hooks/useQuery';
 import { publishProfileUpdate } from '../lib/publishProfileUpdate';
+import { profileQueryKey } from './useProfile';
 
 interface ProfileRef {
   description: string | null;
   alias: string | null;
-  refresh: () => void;
 }
 
 export type ProfileEditState = {
@@ -83,7 +84,7 @@ export function useProfileEdit(
         avatarUri,
         alias: aliasDraft,
       });
-      profile.refresh();
+      invalidateQuery(client, profileQueryKey(client.activeIdentityKey));
       setEditing(false);
       return true;
     } catch (err) {