Merge upstream develop

Author: github-actions[bot]

apps/polycentric/src/features/post/Post.tsx

@@ -14,10 +14,14 @@ import { useWebHover } from '@/src/common/lib/useWebHover';
 import { PostImages } from './PostImages';
 import { PostToolbar } from './PostToolbar';
 import { Atoms, useTheme, withHexOpacity } from '@/src/common/theme';
+import { v2 } from '@polycentric/react-native';
 import { router } from 'expo-router';
 import { memo, useCallback, useEffect, useMemo, useState } from 'react';
 import { Pressable, View } from 'react-native';
-import { getKeyFingerprint } from '@/src/common/lib/polycentric-hooks/helpers';
+import {
+  getKeyFingerprint,
+  hexToBytes,
+} from '@/src/common/lib/polycentric-hooks/helpers';
 
 const PREVIEW_LIMIT = 240;
 const MAX_DISPLAY_LIMIT = 2000;
@@ -37,7 +41,7 @@ interface PostProps {
 
 export const Post = memo(function Post({
   post,
-  hideReplyingTo: _hideReplyingTo = false,
+  hideReplyingTo = false,
   disablePress = false,
   showThreadLineAbove = false,
   showThreadLineBelow = false,
@@ -231,6 +235,10 @@ export const Post = memo(function Post({
             ) : null}
           </View>
 
+          {!hideReplyingTo && post.reply?.parentId ? (
+            <ReplyingToSubheader parentId={post.reply.parentId} />
+          ) : null}
+
           {displayContent ? (
             <Text variant="secondary" style={[Atoms.mt_xs]}>
               {displayContent}
@@ -272,6 +280,40 @@ export const Post = memo(function Post({
   );
 });
 
+function ReplyingToSubheader({ parentId }: { parentId: string }) {
+  const parentIdentity = useMemo(() => {
+    try {
+      return v2.EventKey.fromBinary(hexToBytes(parentId)).identity;
+    } catch {
+      return null;
+    }
+  }, [parentId]);
+
+  const parentProfile = useProfile(parentIdentity);
+  const parentName = parentProfile.name ?? '';
+
+  const handlePress = useCallback(() => {
+    if (!parentIdentity) return;
+    router.push(Routes.tabs.profile(parentIdentity));
+  }, [parentIdentity]);
+
+  if (!parentIdentity) return null;
+
+  return (
+    <Pressable
+      onPress={handlePress}
+      style={[Atoms.flex_row, Atoms.mt_xs, { alignItems: 'baseline' }]}
+    >
+      <Text variant="small" color="neutral_500" fontWeight="regular">
+        Reply to{' '}
+      </Text>
+      <Text variant="small" color="primary_500">
+        {truncateName(parentName || '…', 24)}
+      </Text>
+    </Pressable>
+  );
+}
+
 function PostAuthorName({
   name,
   onPress,

packages/react-native/src/NativeReactNative.ts

@@ -7,4 +7,4 @@ export interface Spec extends TurboModule {
   cleanupRustCrate(): boolean;
 }
 
-export default TurboModuleRegistry.getEnforcing<Spec>('ReactNative');
+export default TurboModuleRegistry.getEnforcing<Spec>('ReactNative');

packages/react-native/src/uniffi-init.tsx

@@ -38,4 +38,3 @@ export async function uniffiInitAsync() {
 export default {
   polycentric_core,
 };
-

services/server/src/service/feeds/feeds_service.rs

@@ -1,13 +1,15 @@
 use super::feeds_repository::{self as FeedsRepository, FeedRow};
+use crate::service::proto::content::ContentBody;
 use crate::service::proto::feeds_service_server::{
     FeedsService, FeedsServiceServer,
 };
 use crate::service::proto::{
-    EventBundle, EventHint, FeedPageParams, GetExploreFeedRequest,
+    Content, EventBundle, EventHint, FeedPageParams, GetExploreFeedRequest,
     GetFeedResponse, GetFollowingFeedRequest, GetIdentityFeedRequest,
     GetPostThreadRequest, GetPostThreadResponse, SerializedContent,
     SignedEvent,
 };
+use prost::Message;
 use tonic::{Request, Response, Status};
 
 #[derive(Debug)]
@@ -252,19 +254,25 @@ impl FeedsService for FeedsServiceImpl {
 }
 
 /// Build the `event_hints` for a feed/thread response: collect the
-/// unique author identities from `rows`, fetch the latest PROFILE
-/// event for each, and wrap them in `EventHint`s. Returned as a
-/// `Status` error if the DB lookup fails.
+/// unique author identities from `rows` — plus the identities of any
+/// reply-parent posts decoded from each row's serialized Content —
+/// fetch the latest PROFILE event for each, and wrap them in
+/// `EventHint`s. Returned as a `Status` error if the DB lookup fails.
 async fn build_profile_hints(
     db: &sea_orm::DatabaseConnection,
     rows: &[FeedRow],
 ) -> Result<Vec<EventHint>, Status> {
-    let identities: Vec<String> = rows
-        .iter()
-        .map(|(event, _)| event.identity.clone())
-        .collect::<std::collections::HashSet<_>>()
-        .into_iter()
-        .collect();
+    let mut identity_set: std::collections::HashSet<String> =
+        std::collections::HashSet::new();
+    for (event, content) in rows {
+        identity_set.insert(event.identity.clone());
+        if let Some(parent_identity) =
+            content.as_ref().and_then(reply_parent_identity)
+        {
+            identity_set.insert(parent_identity);
+        }
+    }
+    let identities: Vec<String> = identity_set.into_iter().collect();
 
     let profile_rows =
         FeedsRepository::Query::list_latest_profiles_for_identities(
@@ -281,6 +289,18 @@ async fn build_profile_hints(
         .collect())
 }
 
+fn reply_parent_identity(
+    content: &::entity::content_model::Model,
+) -> Option<String> {
+    let decoded = Content::decode(content.serialized_bytes.as_slice()).ok()?;
+    match decoded.content_body? {
+        ContentBody::Post(post) => {
+            Some(post.reply?.parent?.identity).filter(|s| !s.is_empty())
+        }
+        _ => None,
+    }
+}
+
 fn rows_to_bundles(rows: Vec<FeedRow>) -> Vec<EventBundle> {
     rows.into_iter()
         .map(|(event, content)| EventBundle {