Merge upstream develop

Author: github-actions[bot]

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

@@ -12,16 +12,14 @@ import {
 } from '@/src/common/lib/polycentric-hooks';
 import { Post } from './Post';
 import { usePostById } from './hooks/usePostById';
+import { useThreadReplies } from './hooks/useThreadReplies';
 import { Atoms } from '@/src/common/theme';
 import { ComposerInput } from '../composer';
 
 interface ConversationViewProps {
   post: PostData;
 }
 
-// TODO: reply list previously lived in a store-backed feed. Reintroduce reply
-// loading via `listEvents` with a parent-pointer filter once that filter is
-// supported.
 export function ConversationView({ post }: ConversationViewProps) {
   const [refreshing, setRefreshing] = useState(false);
   const { height: windowHeight } = useWindowDimensions();
@@ -34,15 +32,17 @@ export function ConversationView({ post }: ConversationViewProps) {
     post.reply?.parent?.identity,
     post.reply?.parent?.sequence,
   );
+  const { replies } = useThreadReplies(post);
 
   const items = useMemo(() => {
     const list: PostData[] = [];
     if (rootPost) list.push(rootPost);
     // Skip parent if it's the same as root (thread of depth 1).
     if (parentPost && parentPost.id !== rootPost?.id) list.push(parentPost);
     list.push(post);
+    list.push(...replies);
     return list;
-  }, [rootPost, parentPost, post]);
+  }, [rootPost, parentPost, post, replies]);
 
   const handleRefresh = useCallback(() => {
     setRefreshing(true);
@@ -66,9 +66,11 @@ export function ConversationView({ post }: ConversationViewProps) {
             post={item}
             hideReplyingTo={false}
             disablePress={item.id === post.id}
-            showThreadLineAbove={!!item.reply?.parent}
-            showThreadLineBelow={index < items.length - 1}
-            hideBottomBorder={item.id !== post.id}
+            showThreadLineAbove={item.id === post.id && !!item.reply?.parent}
+            showThreadLineBelow={
+              index < items.length - 1 && !!post.reply?.parent
+            }
+            hideBottomBorder={index < items.length - 1 && !!post.reply?.parent}
           />
           {item.id === post.id ? <ComposerInput replyTo={replyTo} /> : null}
         </View>

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

@@ -0,0 +1,67 @@
+import { useEffect, useState } from 'react';
+import { COLLECTION, v2 } from '@polycentric/react-native';
+import {
+  decodeV2PostBundle,
+  usePolycentricContext,
+  type PostData,
+} from '@/src/common/lib/polycentric-hooks';
+
+/**
+ * Load the direct replies for a given post via the server's `GetPostThread`
+ * RPC. The server returns the parent post plus the replies — we only surface
+ * the replies here because the caller already has the parent.
+ */
+export function useThreadReplies(
+  post: PostData | undefined,
+  options?: { limit?: number },
+): { replies: PostData[]; isLoading: boolean; error: Error | null } {
+  const { client } = usePolycentricContext();
+  const [replies, setReplies] = useState<PostData[]>([]);
+  const [isLoading, setIsLoading] = useState(false);
+  const [error, setError] = useState<Error | null>(null);
+
+  useEffect(() => {
+    if (!post) {
+      setReplies([]);
+      return;
+    }
+
+    let cancelled = false;
+    setIsLoading(true);
+    setError(null);
+
+    (async () => {
+      try {
+        const response = await client.getPostThread({
+          eventKey: v2.EventKey.create({
+            collection: COLLECTION.FEED,
+            identity: post.identity,
+            signedBy: post.signedBy,
+            sequence: BigInt(post.sequence),
+          }),
+          limit: options?.limit ?? null,
+        });
+        if (cancelled) return;
+
+        const decoded: PostData[] = [];
+        for (const bundle of response?.replies ?? []) {
+          const d = decodeV2PostBundle(bundle);
+          if (d) decoded.push(d);
+        }
+        setReplies(decoded);
+      } catch (e) {
+        if (!cancelled) {
+          setError(e instanceof Error ? e : new Error(String(e)));
+        }
+      } finally {
+        if (!cancelled) setIsLoading(false);
+      }
+    })();
+
+    return () => {
+      cancelled = true;
+    };
+  }, [client, post, options?.limit]);
+
+  return { replies, isLoading, error };
+}

packages/js-core/src/platform-interfaces/runtime-core.ts

@@ -159,6 +159,18 @@ export interface IPolycentricCore {
     identity?: string | null,
   ): Promise<Uint8Array>;
 
+  /**
+   * Fetch a parent post and its direct replies from a server via gRPC-web.
+   *
+   * @param server_url - Base URL of the gRPC-web server
+   * @param request_bytes - Serialized `GetPostThreadRequest` proto bytes
+   * @returns Serialized `GetPostThreadResponse` proto bytes
+   */
+  get_post_thread(
+    server_url: string,
+    request_bytes: Uint8Array,
+  ): Promise<Uint8Array>;
+
   /**
    * Decode `image` bytes, resize into `width` x `height` per `mode`,
    * and encode as JPEG.

packages/js-core/src/polycentric-client.ts

@@ -473,6 +473,42 @@ export class PolycentricClient {
     return bundles;
   }
 
+  /**
+   * Fetch a parent post and its direct replies for a given EventKey.
+   * Queries every configured server and returns the first successful
+   * response. Does not persist — callers decide what to do with the
+   * response.
+   */
+  async getPostThread(options: {
+    eventKey: Proto.EventKey;
+    limit?: number | null;
+  }): Promise<Proto.GetPostThreadResponse | null> {
+    if (!this.core) throw new Error('Core not initialized');
+
+    const requestBytes = Proto.GetPostThreadRequest.toBinary(
+      Proto.GetPostThreadRequest.create({
+        eventKey: options.eventKey,
+        limit: options.limit ?? 0,
+      }),
+    );
+
+    const results = await Promise.allSettled(
+      this.servers.map((server) =>
+        this.core!.get_post_thread(server, requestBytes),
+      ),
+    );
+
+    for (const result of results) {
+      if (result.status === 'rejected') {
+        console.error('getPostThread failed for a server:', result.reason);
+        continue;
+      }
+      return Proto.GetPostThreadResponse.fromBinary(result.value);
+    }
+
+    return null;
+  }
+
   /**
    * Return non-deleted event bundles for an `(identity, collection)` stream
    * from the local core. Tombstone CRDT is applied by the core: any event

packages/js-core/src/proto/polycentric/v2/feeds.client.ts

@@ -4,6 +4,8 @@
 import type { RpcTransport } from "@protobuf-ts/runtime-rpc";
 import type { ServiceInfo } from "@protobuf-ts/runtime-rpc";
 import { FeedsService } from "./feeds";
+import type { GetPostThreadResponse } from "./feeds";
+import type { GetPostThreadRequest } from "./feeds";
 import { stackIntercept } from "@protobuf-ts/runtime-rpc";
 import type { GetFeedResponse } from "./feeds";
 import type { GetFeedRequest } from "./feeds";
@@ -22,6 +24,12 @@ export interface IFeedsServiceClient {
      * @generated from protobuf rpc: GetFeed
      */
     getFeed(input: GetFeedRequest, options?: RpcOptions): UnaryCall<GetFeedRequest, GetFeedResponse>;
+    /**
+     * Replies to a post
+     *
+     * @generated from protobuf rpc: GetPostThread
+     */
+    getPostThread(input: GetPostThreadRequest, options?: RpcOptions): UnaryCall<GetPostThreadRequest, GetPostThreadResponse>;
 }
 /**
  * *
@@ -44,4 +52,13 @@ export class FeedsServiceClient implements IFeedsServiceClient, ServiceInfo {
         const method = this.methods[0], opt = this._transport.mergeOptions(options);
         return stackIntercept<GetFeedRequest, GetFeedResponse>("unary", this._transport, method, opt, input);
     }
+    /**
+     * Replies to a post
+     *
+     * @generated from protobuf rpc: GetPostThread
+     */
+    getPostThread(input: GetPostThreadRequest, options?: RpcOptions): UnaryCall<GetPostThreadRequest, GetPostThreadResponse> {
+        const method = this.methods[1], opt = this._transport.mergeOptions(options);
+        return stackIntercept<GetPostThreadRequest, GetPostThreadResponse>("unary", this._transport, method, opt, input);
+    }
 }

packages/js-core/src/proto/polycentric/v2/feeds.ts

@@ -11,6 +11,7 @@ import { UnknownFieldHandler } from "@protobuf-ts/runtime";
 import type { PartialMessage } from "@protobuf-ts/runtime";
 import { reflectionMergePartial } from "@protobuf-ts/runtime";
 import { MessageType } from "@protobuf-ts/runtime";
+import { EventKey } from "./event_key";
 import { EventBundle } from "./events";
 /**
  * @generated from protobuf message polycentric.v2.GetFeedRequest
@@ -57,6 +58,35 @@ export interface GetFeedResponse {
      */
     previousToken: string;
 }
+/**
+ * @generated from protobuf message polycentric.v2.GetPostThreadRequest
+ */
+export interface GetPostThreadRequest {
+    /**
+     * Parent post to return the thread for
+     *
+     * @generated from protobuf field: polycentric.v2.EventKey event_key = 1
+     */
+    eventKey?: EventKey;
+    /**
+     * @generated from protobuf field: int32 limit = 2
+     */
+    limit: number;
+}
+/**
+ * @generated from protobuf message polycentric.v2.GetPostThreadResponse
+ */
+export interface GetPostThreadResponse {
+    /**
+     * @generated from protobuf field: polycentric.v2.EventBundle parent = 1
+     */
+    parent?: EventBundle;
+    /**
+     * @generated from protobuf field: repeated polycentric.v2.EventBundle replies = 2
+     */
+    replies: EventBundle[]; // string next_token = 3;
+    // string previous_token = 4;
+}
 /**
  * @generated from protobuf enum polycentric.v2.FeedAlgorithm
  */
@@ -212,9 +242,118 @@ class GetFeedResponse$Type extends MessageType<GetFeedResponse> {
  * @generated MessageType for protobuf message polycentric.v2.GetFeedResponse
  */
 export const GetFeedResponse = new GetFeedResponse$Type();
+// @generated message type with reflection information, may provide speed optimized methods
+class GetPostThreadRequest$Type extends MessageType<GetPostThreadRequest> {
+    constructor() {
+        super("polycentric.v2.GetPostThreadRequest", [
+            { no: 1, name: "event_key", kind: "message", T: () => EventKey },
+            { no: 2, name: "limit", kind: "scalar", T: 5 /*ScalarType.INT32*/ }
+        ]);
+    }
+    create(value?: PartialMessage<GetPostThreadRequest>): GetPostThreadRequest {
+        const message = globalThis.Object.create((this.messagePrototype!));
+        message.limit = 0;
+        if (value !== undefined)
+            reflectionMergePartial<GetPostThreadRequest>(this, message, value);
+        return message;
+    }
+    internalBinaryRead(reader: IBinaryReader, length: number, options: BinaryReadOptions, target?: GetPostThreadRequest): GetPostThreadRequest {
+        let message = target ?? this.create(), end = reader.pos + length;
+        while (reader.pos < end) {
+            let [fieldNo, wireType] = reader.tag();
+            switch (fieldNo) {
+                case /* polycentric.v2.EventKey event_key */ 1:
+                    message.eventKey = EventKey.internalBinaryRead(reader, reader.uint32(), options, message.eventKey);
+                    break;
+                case /* int32 limit */ 2:
+                    message.limit = reader.int32();
+                    break;
+                default:
+                    let u = options.readUnknownField;
+                    if (u === "throw")
+                        throw new globalThis.Error(`Unknown field ${fieldNo} (wire type ${wireType}) for ${this.typeName}`);
+                    let d = reader.skip(wireType);
+                    if (u !== false)
+                        (u === true ? UnknownFieldHandler.onRead : u)(this.typeName, message, fieldNo, wireType, d);
+            }
+        }
+        return message;
+    }
+    internalBinaryWrite(message: GetPostThreadRequest, writer: IBinaryWriter, options: BinaryWriteOptions): IBinaryWriter {
+        /* polycentric.v2.EventKey event_key = 1; */
+        if (message.eventKey)
+            EventKey.internalBinaryWrite(message.eventKey, writer.tag(1, WireType.LengthDelimited).fork(), options).join();
+        /* int32 limit = 2; */
+        if (message.limit !== 0)
+            writer.tag(2, WireType.Varint).int32(message.limit);
+        let u = options.writeUnknownFields;
+        if (u !== false)
+            (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
+        return writer;
+    }
+}
+/**
+ * @generated MessageType for protobuf message polycentric.v2.GetPostThreadRequest
+ */
+export const GetPostThreadRequest = new GetPostThreadRequest$Type();
+// @generated message type with reflection information, may provide speed optimized methods
+class GetPostThreadResponse$Type extends MessageType<GetPostThreadResponse> {
+    constructor() {
+        super("polycentric.v2.GetPostThreadResponse", [
+            { no: 1, name: "parent", kind: "message", T: () => EventBundle },
+            { no: 2, name: "replies", kind: "message", repeat: 2 /*RepeatType.UNPACKED*/, T: () => EventBundle }
+        ]);
+    }
+    create(value?: PartialMessage<GetPostThreadResponse>): GetPostThreadResponse {
+        const message = globalThis.Object.create((this.messagePrototype!));
+        message.replies = [];
+        if (value !== undefined)
+            reflectionMergePartial<GetPostThreadResponse>(this, message, value);
+        return message;
+    }
+    internalBinaryRead(reader: IBinaryReader, length: number, options: BinaryReadOptions, target?: GetPostThreadResponse): GetPostThreadResponse {
+        let message = target ?? this.create(), end = reader.pos + length;
+        while (reader.pos < end) {
+            let [fieldNo, wireType] = reader.tag();
+            switch (fieldNo) {
+                case /* polycentric.v2.EventBundle parent */ 1:
+                    message.parent = EventBundle.internalBinaryRead(reader, reader.uint32(), options, message.parent);
+                    break;
+                case /* repeated polycentric.v2.EventBundle replies */ 2:
+                    message.replies.push(EventBundle.internalBinaryRead(reader, reader.uint32(), options));
+                    break;
+                default:
+                    let u = options.readUnknownField;
+                    if (u === "throw")
+                        throw new globalThis.Error(`Unknown field ${fieldNo} (wire type ${wireType}) for ${this.typeName}`);
+                    let d = reader.skip(wireType);
+                    if (u !== false)
+                        (u === true ? UnknownFieldHandler.onRead : u)(this.typeName, message, fieldNo, wireType, d);
+            }
+        }
+        return message;
+    }
+    internalBinaryWrite(message: GetPostThreadResponse, writer: IBinaryWriter, options: BinaryWriteOptions): IBinaryWriter {
+        /* polycentric.v2.EventBundle parent = 1; */
+        if (message.parent)
+            EventBundle.internalBinaryWrite(message.parent, writer.tag(1, WireType.LengthDelimited).fork(), options).join();
+        /* repeated polycentric.v2.EventBundle replies = 2; */
+        for (let i = 0; i < message.replies.length; i++)
+            EventBundle.internalBinaryWrite(message.replies[i], writer.tag(2, WireType.LengthDelimited).fork(), options).join();
+        let u = options.writeUnknownFields;
+        if (u !== false)
+            (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
+        return writer;
+    }
+}
+/**
+ * @generated MessageType for protobuf message polycentric.v2.GetPostThreadResponse
+ */
+export const GetPostThreadResponse = new GetPostThreadResponse$Type();
 /**
  * @generated ServiceType for protobuf service polycentric.v2.FeedsService
  */
 export const FeedsService = new ServiceType("polycentric.v2.FeedsService", [
-    { name: "GetFeed", options: {}, I: GetFeedRequest, O: GetFeedResponse }
+    { name: "GetFeed", options: {}, I: GetFeedRequest, O: GetFeedResponse },
+    { name: "GetPostThread", options: {}, I: GetPostThreadRequest, O: GetPostThreadResponse }
 ]);