Merge upstream develop

Author: github-actions[bot]

…/polycentric/app/profile/[publicKey].tsx …s/polycentric/app/[identityId]/index.tsxapps/polycentric/app/profile/[publicKey].tsx renamed to apps/polycentric/app/[identityId]/index.tsx apps/polycentric/app/profile/[publicKey].tsx renamed to apps/polycentric/app/[identityId]/index.tsx

@@ -0,0 +1 @@
+export { default } from '@/src/features/profile/ProfileScreen';

apps/polycentric/app/post/[postId].tsx …ntric/app/[identityId]/post/[postId].tsxapps/polycentric/app/post/[postId].tsx renamed to apps/polycentric/app/[identityId]/post/[postId].tsx apps/polycentric/app/post/[postId].tsx renamed to apps/polycentric/app/[identityId]/post/[postId].tsx

@@ -1,14 +1,9 @@
 import { Atoms, useTheme } from '@/src/common/theme';
-import { useRoutePath } from '@react-navigation/native';
-import { ComponentProps, useMemo } from 'react';
+import { ComponentProps } from 'react';
 
 import { NavItem } from './NavItem';
 import { View } from 'react-native';
-import {
-  publicKeyToString,
-  publicKeyToStringURLSafe,
-  useCurrentIdentity,
-} from '@/src/common/lib/polycentric-hooks';
+import { useCurrentIdentity } from '@/src/common/lib/polycentric-hooks';
 import { Ionicons } from '@expo/vector-icons';
 
 type VerticalNavProps = {
@@ -19,8 +14,6 @@ export function VerticalNav({ style }: VerticalNavProps) {
   const theme = useTheme();
   const { identity } = useCurrentIdentity();
 
-  const publicKeySafe = identity?.identityKey;
-
   return (
     <View
       style={[Atoms.py_xs, Atoms.flex_1, Atoms.flex_col, Atoms.gap_sm, style]}
@@ -30,13 +23,13 @@ export function VerticalNav({ style }: VerticalNavProps) {
         icon={<Ionicons name="home-outline" size={24} />}
         href="/feed"
       />
-      {publicKeySafe && (
+      {identity?.identityKey && (
         <NavItem
           label="Profile"
           icon={<Ionicons name="person-outline" size={24} />}
           href={{
-            pathname: '/profile/[publicKey]',
-            params: { publicKey: publicKeySafe },
+            pathname: '/[identityId]',
+            params: { identityId: identity?.identityKey },
           }}
         />
       )}

apps/polycentric/app/profile/[identityId].tsx

@@ -10,7 +10,6 @@ export function openCompose(replyToPostId?: string) {
   }
 }
 
-// TODO: abandon systemKey terminology in lib and apps. just use publicKey
 export const Routes = {
   tabs: {
     feed: {
@@ -20,11 +19,9 @@ export const Routes = {
     },
     search: '/search',
     claims: '/claims',
-    profile: (publicKey: string) => `/profile/${publicKey}` as const,
-    post: Object.assign((postId: string) => `/post/${postId}` as const, {
-      reply: (postId: string, replyTo: string) =>
-        `/post/${postId}?replyTo=${encodeURIComponent(replyTo)}` as const,
-    }),
+    profile: (identityId: string) => `/${identityId}` as const,
+    post: (identityId: string, postId: string) =>
+      `/${identityId}/post/${postId}` as const,
     settings: {
       index: '/settings',
       identity: '/settings/identity',

apps/polycentric/src/common/components/layout/nav/VerticalNav.tsx

@@ -79,6 +79,13 @@ export function parsePostId(postId: string): {
   }
 }
 
+/** Extract the sequence number (logicalClock) from an internal eventKey postId. */
+export function postIdToSequence(postId: string): string | null {
+  const parts = postId.split(':');
+  if (parts.length !== 3) return null;
+  return parts[2];
+}
+
 export function decodePostEvent(
   signedEvent: types.SignedEvent,
 ): PostData | null {

apps/polycentric/src/common/constants/routes.ts

@@ -17,7 +17,7 @@ export {
 } from './PolycentricProvider';
 
 // Post page (reply feed + parent list)
-export { usePostPage, useNavigateToParentPost } from './useConversation';
+export { usePostPage } from './useConversation';
 
 // Action hooks
 export {
@@ -48,6 +48,7 @@ export {
   bytesToHex,
   hexToBytes,
   eventKey,
+  postIdToSequence,
   truncateName,
   publicKeyToString,
   stringToPublicKey,

apps/polycentric/src/common/lib/polycentric-hooks/helpers.ts

@@ -1,8 +1,6 @@
 import { useCallback, useEffect, useRef } from 'react';
 import { useFocusEffect } from 'expo-router';
-import { types } from '@polycentric/react-native';
-import { usePolycentricContext, usePolycentric } from './PolycentricProvider';
-import { decodePostEvent, eventKey } from './helpers';
+import { usePolycentricContext } from './PolycentricProvider';
 import { useStore } from './store';
 
 const REPLIES_FEED_PREFIX = 'replies:';
@@ -50,39 +48,3 @@ export function usePostPage(postId: string) {
 
   return { postId, replyIds, isLoading, reload };
 }
-
-/** Callback to resolve parent post (cache or fetch) and call onPostPress(postId). */
-export function useNavigateToParentPost(onPostPress: (postId: string) => void) {
-  const client = usePolycentric();
-  const { store } = usePolycentricContext();
-
-  return useCallback(
-    async (postId: string) => {
-      const post = store.getState().posts[postId];
-      if (!post) return;
-      const { decoded } = post;
-      if (
-        !decoded.parentAuthorPublicKey?.key ||
-        !decoded.parentProcess?.process ||
-        decoded.parentLogicalClock == null
-      )
-        return;
-
-      const parentId = eventKey(
-        decoded.parentAuthorPublicKey.key,
-        decoded.parentProcess.process,
-        decoded.parentLogicalClock,
-      );
-
-      const cached = store.getState().posts[parentId];
-      if (cached) {
-        onPostPress(parentId);
-        return;
-      }
-
-      // TODO: queryAuthorFeed requires queryManager which is not yet in v2
-      onPostPress(parentId);
-    },
-    [client, store, onPostPress],
-  );
-}

apps/polycentric/src/common/lib/polycentric-hooks/index.ts

@@ -9,12 +9,7 @@ import {
   useLikesFeed,
   useFollowStatus,
 } from './PolycentricProvider';
-import {
-  getIdentityId,
-  identiconUrl,
-  shortenIdentityId,
-  stringURLSafeToPublicKey,
-} from './helpers';
+import { getIdentityId, identiconUrl, shortenIdentityId } from './helpers';
 import { useStore } from './store';
 
 export type ProfileScreenData = {
@@ -35,19 +30,33 @@ export type ProfileScreenData = {
 };
 
 export function useProfileScreenData(
-  publicKeyParam: string | undefined,
+  identityIdParam: string | undefined,
   options?: { getIsAborted?: () => boolean },
 ): ProfileScreenData {
-  const publicKey = useMemo(
-    () =>
-      publicKeyParam
-        ? stringURLSafeToPublicKey(publicKeyParam)
-        : types.PublicKey.create(),
-    [publicKeyParam],
-  );
+  const { identity: selfIdentity, publicKey: selfPublicKey } =
+    useCurrentIdentity();
+
+  // Resolve identityId → publicKey. For self we use the current identity's
+  // public key. Otherwise scan known posts for a matching authorIdentity.
+  const { store } = usePolycentricContext();
+  const knownPublicKey = useStore(store, (state) => {
+    if (!identityIdParam) return null;
+    for (const post of Object.values(state.posts)) {
+      if (post.decoded.authorIdentity === identityIdParam) {
+        return post.decoded.authorPublicKey;
+      }
+    }
+    return null;
+  });
+
+  const isSelf =
+    !!identityIdParam && selfIdentity?.identityKey === identityIdParam;
+
+  const publicKey = useMemo(() => {
+    if (isSelf && selfPublicKey) return selfPublicKey;
+    return knownPublicKey ?? types.PublicKey.create();
+  }, [isSelf, selfPublicKey, knownPublicKey]);
 
-  const { isCurrentIdentity, identity: selfIdentity } = useCurrentIdentity();
-  const isSelf = isCurrentIdentity(publicKey);
   const getIsAborted = options?.getIsAborted;
 
   const username = useUsername(publicKey);
@@ -56,23 +65,7 @@ export function useProfileScreenData(
   const likesFeed = useLikesFeed({ enabled: isSelf, getIsAborted });
   const followStatus = useFollowStatus(publicKey);
 
-  // Resolve an identity id for this profile. For self we already know it
-  // from the client; for other users we scan locally-known posts for the
-  // first one signed by this public key.
-  const { store } = usePolycentricContext();
-  const postIdentity = useStore(store, (state) => {
-    for (const post of Object.values(state.posts)) {
-      const key = post.decoded.authorPublicKey.key;
-      if (key && bytesEqual(key, publicKey.key ?? new Uint8Array())) {
-        return post.decoded.authorIdentity ?? null;
-      }
-    }
-    return null;
-  });
-
-  const identityKey = isSelf
-    ? (selfIdentity?.identityKey ?? null)
-    : postIdentity;
+  const identityKey = identityIdParam ?? null;
 
   const short = identityKey
     ? shortenIdentityId(identityKey)
@@ -99,11 +92,3 @@ export function useProfileScreenData(
     setActiveFeed,
   };
 }
-
-function bytesEqual(a: Uint8Array, b: Uint8Array): boolean {
-  if (a.length !== b.length) return false;
-  for (let i = 0; i < a.length; i++) {
-    if (a[i] !== b[i]) return false;
-  }
-  return true;
-}

apps/polycentric/src/common/lib/polycentric-hooks/useConversation.ts

@@ -1,7 +1,7 @@
 import { Routes } from '@/src/common/constants';
 import {
   decodePostEvent,
-  publicKeyToStringURLSafe,
+  postIdToSequence,
   useCurrentIdentity,
   usePolycentricContext,
   useStore,
@@ -14,7 +14,8 @@ import { ComposeSheetInner } from './ComposeSheetInner';
 
 export default function ComposeSheetRoute() {
   const { store } = usePolycentricContext();
-  const { publicKey: myPublicKey } = useCurrentIdentity();
+  const { identity: selfIdentity } = useCurrentIdentity();
+  const myIdentityId = selfIdentity?.identityKey ?? null;
   const params = useLocalSearchParams<{ replyTo?: string }>();
   const replyToPostId = params.replyTo;
 
@@ -31,19 +32,22 @@ export default function ComposeSheetRoute() {
   const handlePostCreated = useCallback(
     async (signedEvent: types.SignedEvent) => {
       const decoded = decodePostEvent(signedEvent);
-      if (decoded) {
+      if (decoded && decoded.authorIdentity) {
         store.getState().ingestPost(decoded.id, signedEvent, decoded);
-        router.replace(Routes.tabs.post(decoded.id));
+        const sequence = postIdToSequence(decoded.id);
+        if (sequence) {
+          router.replace(Routes.tabs.post(decoded.authorIdentity, sequence));
+        }
       }
     },
     [store],
   );
 
   const handleAvatarPress = useCallback(() => {
-    if (myPublicKey) {
-      router.push(Routes.tabs.profile(publicKeyToStringURLSafe(myPublicKey)));
+    if (myIdentityId) {
+      router.push(Routes.tabs.profile(myIdentityId));
     }
-  }, [myPublicKey]);
+  }, [myIdentityId]);
 
   return (
     <SheetMenu onClose={() => router.back()} detents={[0.82]} scrollable>