Fix follow pages not hydrating the profile information

Author: markharding

packages/js-core/src/proto/polycentric/v2/graph_service.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 { EventHint } from "./events";
 import { PageInfo } from "./common";
 import { EventBundle } from "./events";
 import { PageParams } from "./common";
@@ -58,6 +59,13 @@ export interface ListFollowsResponse {
      * @generated from protobuf field: optional polycentric.v2.PageInfo page_info = 2
      */
     pageInfo?: PageInfo;
+    /**
+     * Identity-chain and profile events for every identity referenced by the
+     * bundles, so clients can validate and render them without extra queries.
+     *
+     * @generated from protobuf field: repeated polycentric.v2.EventHint event_hints = 3
+     */
+    eventHints: EventHint[];
 }
 // @generated message type with reflection information, may provide speed optimized methods
 class ListFollowingRequest$Type extends MessageType<ListFollowingRequest> {
@@ -172,12 +180,14 @@ class ListFollowsResponse$Type extends MessageType<ListFollowsResponse> {
     constructor() {
         super("polycentric.v2.ListFollowsResponse", [
             { no: 1, name: "event_bundles", kind: "message", repeat: 2 /*RepeatType.UNPACKED*/, T: () => EventBundle },
-            { no: 2, name: "page_info", kind: "message", T: () => PageInfo }
+            { no: 2, name: "page_info", kind: "message", T: () => PageInfo },
+            { no: 3, name: "event_hints", kind: "message", repeat: 2 /*RepeatType.UNPACKED*/, T: () => EventHint }
         ]);
     }
     create(value?: PartialMessage<ListFollowsResponse>): ListFollowsResponse {
         const message = globalThis.Object.create((this.messagePrototype!));
         message.eventBundles = [];
+        message.eventHints = [];
         if (value !== undefined)
             reflectionMergePartial<ListFollowsResponse>(this, message, value);
         return message;
@@ -193,6 +203,9 @@ class ListFollowsResponse$Type extends MessageType<ListFollowsResponse> {
                 case /* optional polycentric.v2.PageInfo page_info */ 2:
                     message.pageInfo = PageInfo.internalBinaryRead(reader, reader.uint32(), options, message.pageInfo);
                     break;
+                case /* repeated polycentric.v2.EventHint event_hints */ 3:
+                    message.eventHints.push(EventHint.internalBinaryRead(reader, reader.uint32(), options));
+                    break;
                 default:
                     let u = options.readUnknownField;
                     if (u === "throw")
@@ -211,6 +224,9 @@ class ListFollowsResponse$Type extends MessageType<ListFollowsResponse> {
         /* optional polycentric.v2.PageInfo page_info = 2; */
         if (message.pageInfo)
             PageInfo.internalBinaryWrite(message.pageInfo, writer.tag(2, WireType.LengthDelimited).fork(), options).join();
+        /* repeated polycentric.v2.EventHint event_hints = 3; */
+        for (let i = 0; i < message.eventHints.length; i++)
+            EventHint.internalBinaryWrite(message.eventHints[i], writer.tag(3, WireType.LengthDelimited).fork(), options).join();
         let u = options.writeUnknownFields;
         if (u !== false)
             (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);

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

@@ -31,15 +31,13 @@ export interface VerificationClaimBundle {
      */
     claim?: EventBundle;
     /**
-     * VerificationTarget events published by the claim's owner — who has
-     * been asked to verify.
+     * VerificationTarget events published by the claim's owner
      *
      * @generated from protobuf field: repeated polycentric.v2.EventBundle targets = 2
      */
     targets: EventBundle[];
     /**
-     * VerificationVerify events. The verifying identity is each
-     * event's own signer.
+     * VerificationVerify events.
      *
      * @generated from protobuf field: repeated polycentric.v2.EventBundle verifies = 3
      */
@@ -63,8 +61,7 @@ export interface ListVerificationClaimsResponse {
      */
     claimBundles: VerificationClaimBundle[];
     /**
-     * Identity-chain and profile events for every identity referenced by the
-     * bundles, so clients can validate and render them without extra queries.
+     * Additional events that may be helpful, like relevant identity and profiles
      *
      * @generated from protobuf field: repeated polycentric.v2.EventHint event_hints = 2
      */
@@ -85,14 +82,13 @@ export interface ListVerificationTargetsRequest {
 export interface ListVerificationTargetsResponse {
     /**
      * VerificationTarget events for the claim, published by the claim's
-     * owner — who has been asked to verify. Deleted targets are excluded.
+     * owner — who has been asked to verify.
      *
      * @generated from protobuf field: repeated polycentric.v2.EventBundle event_bundles = 1
      */
     eventBundles: EventBundle[];
     /**
-     * Identity-chain and profile events for every identity referenced by the
-     * bundles, so clients can validate and render them without extra queries.
+     * Additional events that may be helpful, like relevant identity and profiles
      *
      * @generated from protobuf field: repeated polycentric.v2.EventHint event_hints = 2
      */
@@ -112,15 +108,13 @@ export interface ListVerificationVerifiesRequest {
  */
 export interface ListVerificationVerifiesResponse {
     /**
-     * VerificationVerify events for the claim, excluding deleted ones.
-     * The verifying identity is each event's own signer.
+     * VerificationVerify events for the claim.
      *
      * @generated from protobuf field: repeated polycentric.v2.EventBundle event_bundles = 1
      */
     eventBundles: EventBundle[];
     /**
-     * Identity-chain and profile events for every identity referenced by the
-     * bundles, so clients can validate and render them without extra queries.
+     * Additional events that may be helpful, like relevant identity and profiles
      *
      * @generated from protobuf field: repeated polycentric.v2.EventHint event_hints = 2
      */
@@ -140,15 +134,13 @@ export interface ListTargetedVerificationClaimsRequest {
  */
 export interface ListTargetedVerificationClaimsResponse {
     /**
-     * Claims whose owner targeted `target_identity` — the identity's inbox
-     * of verification requests.
+     * Claims whose owner targeted `target_identity`. The 'inbox'.
      *
      * @generated from protobuf field: repeated polycentric.v2.VerificationClaimBundle claim_bundles = 1
      */
     claimBundles: VerificationClaimBundle[];
     /**
-     * Identity-chain and profile events for every identity referenced by the
-     * bundles, so clients can validate and render them without extra queries.
+     * Additional events that may be helpful, like relevant identity and profiles
      *
      * @generated from protobuf field: repeated polycentric.v2.EventHint event_hints = 2
      */

packages/rs-core/src/query/graph.rs

@@ -14,7 +14,7 @@ use prost::Message;
 use crate::client::PolycentricClient;
 use crate::query::event::dedup::{EventDedupKey, event_dedup_key};
 use crate::query::feed::{FakeCursorToken, merge_page_info};
-use crate::query::validation::retain_validated_bundles;
+use crate::query::validation::{retain_validated_bundles, retain_validated_hints};
 use crate::query::{QueryClient, QueryKey, QueryObservable, QueryOpts, channel};
 
 #[derive(Clone, Debug, uniffi::Record)]
@@ -68,6 +68,7 @@ fn merge_follows_responses(values: &[Vec<u8>], client: &Arc<Mutex<PolycentricCli
     for v in values {
         if let Ok(incoming) = ListFollowsResponse::decode(v.as_slice()) {
             merged.event_bundles.extend(incoming.event_bundles);
+            merged.event_hints.extend(incoming.event_hints);
             merged.page_info = merge_page_info(merged.page_info, incoming.page_info);
         }
     }
@@ -91,8 +92,17 @@ fn merge_follows_responses(values: &[Vec<u8>], client: &Arc<Mutex<PolycentricCli
         Reverse(created_at)
     });
 
+    let mut seen_hints: HashSet<EventDedupKey> = HashSet::new();
+    merged.event_hints.retain(
+        |hint| match hint.event_bundle.as_ref().and_then(event_dedup_key) {
+            Some(k) => seen_hints.insert(k),
+            None => true,
+        },
+    );
+
     let c = client.lock().unwrap();
     retain_validated_bundles(&c, &mut merged.event_bundles);
+    retain_validated_hints(&c, &mut merged.event_hints);
     drop(c);
 
     merged.encode_to_vec()
@@ -139,7 +149,16 @@ pub fn list_following(
             prepare_page_info(&mut response, &server_url, backward_offset, forward_offset)?;
             let bytes = response.encode_to_vec();
 
-            client.lock().unwrap().copy_bundles(response.event_bundles);
+            let hint_bundles: Vec<_> = response
+                .event_hints
+                .into_iter()
+                .filter_map(|h| h.event_bundle)
+                .collect();
+            {
+                let mut c = client.lock().unwrap();
+                c.copy_bundles(hint_bundles);
+                c.copy_bundles(response.event_bundles);
+            }
             Ok(bytes)
         }
     };
@@ -188,7 +207,16 @@ pub fn list_followers(
             prepare_page_info(&mut response, &server_url, backward_offset, forward_offset)?;
             let bytes = response.encode_to_vec();
 
-            client.lock().unwrap().copy_bundles(response.event_bundles);
+            let hint_bundles: Vec<_> = response
+                .event_hints
+                .into_iter()
+                .filter_map(|h| h.event_bundle)
+                .collect();
+            {
+                let mut c = client.lock().unwrap();
+                c.copy_bundles(hint_bundles);
+                c.copy_bundles(response.event_bundles);
+            }
             Ok(bytes)
         }
     };
@@ -208,6 +236,7 @@ mod tests {
     fn response_from(server: &str, has_next_page: bool) -> Vec<u8> {
         let mut response = ListFollowsResponse {
             event_bundles: Vec::new(),
+            event_hints: Vec::new(),
             page_info: Some(PageInfo {
                 start_cursor: "start".to_string(),
                 end_cursor: "end".to_string(),

protos/polycentric/v2/graph_service.proto

@@ -20,6 +20,8 @@ message ListFollowsResponse {
   // The active (non-tombstoned) Follow events, newest first.
   repeated EventBundle event_bundles = 1;
   optional PageInfo page_info = 2;
+  // Relevant events for the users in the follow events
+  repeated EventHint event_hints = 3;
 }
 
 service GraphService {

services/server/src/data/hydration.rs

@@ -1,6 +1,6 @@
 use std::collections::HashMap;
 
-use polycentric_common::models::protos_v2::EventBundle;
+use polycentric_common::models::protos_v2::{EventBundle, EventHint};
 
 use crate::service::events::TargetEventKey;
 use crate::service::events::tombstone::EventWithContentRow;
@@ -13,3 +13,17 @@ pub struct HydrationState {
     pub quote_post_events: Vec<EventWithContentRow>,
     pub repost_events: Vec<EventWithContentRow>,
 }
+
+impl HydrationState {
+    /// The hydrated identity-chain and profile rows as `EventHint`s, so
+    /// clients can validate and render the referenced identities without
+    /// extra queries.
+    pub fn identity_profile_hints(self) -> Vec<EventHint> {
+        crate::service::identity::service::rows_to_hints(
+            self.identity_events
+                .into_iter()
+                .chain(self.profile_events)
+                .collect(),
+        )
+    }
+}

services/server/src/service/events/rpc/list_events.rs

@@ -9,7 +9,7 @@ use crate::service::events::repository::Query as EventsRepository;
 use crate::service::events::tombstone::EventWithContentRow;
 use crate::service::identity::service::{
     collect_identities, list_identity_events, list_profile_events,
-    rows_to_bundles,
+    rows_to_bundles, rows_to_hints,
 };
 use crate::service::proofs::service::attach_proofs;
 use crate::service::proto::{
@@ -92,7 +92,10 @@ async fn hydrate(
     _params: &Params,
     rows: &Vec<EventWithContentRow>,
 ) -> Result<HydrationState, Status> {
-    let identities = collect_identities(rows);
+    let identities = collect_identities(
+        rows.iter()
+            .map(|(event, content)| (event, content.as_ref())),
+    );
     let (identity_events, profile_events) = tokio::try_join!(
         list_identity_events(ctx, identities.clone()),
         list_profile_events(ctx, identities),
@@ -129,17 +132,9 @@ async fn view(
     let mut event_bundles = rows_to_bundles(live_rows);
     attach_proofs(ctx, &mut event_bundles).await?;
 
-    let mut event_hints: Vec<EventHint> = Vec::new();
-    event_hints.extend(rows_to_bundles(identity_events).into_iter().map(|b| {
-        EventHint {
-            event_bundle: Some(b),
-        }
-    }));
-    event_hints.extend(rows_to_bundles(profile_events).into_iter().map(|b| {
-        EventHint {
-            event_bundle: Some(b),
-        }
-    }));
+    let event_hints = rows_to_hints(
+        identity_events.into_iter().chain(profile_events).collect(),
+    );
 
     Ok(View {
         event_bundles,

services/server/src/service/feeds/rpc/common.rs

@@ -14,8 +14,8 @@ use crate::service::feeds::util::{
     PageCursor, PageInfo, map_db_err, page_limit,
 };
 use crate::service::identity::service::{
-    collect_identities, list_identity_events, list_profile_events,
-    rows_to_bundles,
+    bundles_to_hints, collect_identities, list_identity_events,
+    list_profile_events, rows_to_bundles, rows_to_hints,
 };
 
 use crate::service::proofs::service::attach_proofs;
@@ -184,7 +184,10 @@ pub async fn hydrate(
 
     let keys: Vec<TargetEventKey> =
         rows.iter().map(|(e, _)| TargetEventKey::of(e)).collect();
-    let identities = collect_identities(rows);
+    let identities = collect_identities(
+        rows.iter()
+            .map(|(event, content)| (event, content.as_ref())),
+    );
     let (quote_keys, repost_keys) = collect_referenced_keys(rows);
 
     // Returns valid (as far as the server is concerned) tombstones related to queried events
@@ -345,15 +348,8 @@ pub async fn view(
         .chain(quote_post_events)
         .chain(repost_events)
         .collect();
-    let mut event_hints: Vec<EventHint> = rows_to_bundles(hint_rows)
-        .into_iter()
-        .map(|b| EventHint {
-            event_bundle: Some(b),
-        })
-        .collect();
-    event_hints.extend(tombstone_bundles.into_iter().map(|b| EventHint {
-        event_bundle: Some(b),
-    }));
+    let mut event_hints = rows_to_hints(hint_rows);
+    event_hints.extend(bundles_to_hints(tombstone_bundles));
 
     Ok(GetFeedResponseView {
         event_bundles,