@stream-io/feeds-client 0.1.11 → 0.2.1

package/dist/index-react-bindings.browser.cjs

@@ -613,6 +613,7 @@ decoders.Channel = (input) => {
         updated_at: { type: 'DatetimeType', isSingle: true },
         deleted_at: { type: 'DatetimeType', isSingle: true },
         last_message_at: { type: 'DatetimeType', isSingle: true },
+        message_count_updated_at: { type: 'DatetimeType', isSingle: true },
         active_live_locations: { type: 'SharedLocation', isSingle: false },
         invites: { type: 'ChannelMember', isSingle: false },
         members: { type: 'ChannelMember', isSingle: false },
@@ -890,6 +891,7 @@ decoders.FeedMemberResponse = (input) => {
         user: { type: 'UserResponse', isSingle: true },
         invite_accepted_at: { type: 'DatetimeType', isSingle: true },
         invite_rejected_at: { type: 'DatetimeType', isSingle: true },
+        membership_level: { type: 'MembershipLevelResponse', isSingle: true },
     };
     return decode(typeMappings, input);
 };
@@ -907,6 +909,7 @@ decoders.FeedResponse = (input) => {
         updated_at: { type: 'DatetimeType', isSingle: true },
         created_by: { type: 'UserResponse', isSingle: true },
         deleted_at: { type: 'DatetimeType', isSingle: true },
+        own_follows: { type: 'FollowResponse', isSingle: false },
     };
     return decode(typeMappings, input);
 };
@@ -1061,6 +1064,13 @@ decoders.ListDevicesResponse = (input) => {
     };
     return decode(typeMappings, input);
 };
+decoders.MembershipLevelResponse = (input) => {
+    const typeMappings = {
+        created_at: { type: 'DatetimeType', isSingle: true },
+        updated_at: { type: 'DatetimeType', isSingle: true },
+    };
+    return decode(typeMappings, input);
+};
 decoders.Message = (input) => {
     const typeMappings = {
         created_at: { type: 'DatetimeType', isSingle: true },
@@ -1125,6 +1135,13 @@ decoders.ModerationCustomActionEvent = (input) => {
     };
     return decode(typeMappings, input);
 };
+decoders.ModerationFlagResponse = (input) => {
+    const typeMappings = {
+        review_queue_item: { type: 'ReviewQueueItemResponse', isSingle: true },
+        user: { type: 'UserResponse', isSingle: true },
+    };
+    return decode(typeMappings, input);
+};
 decoders.ModerationFlaggedEvent = (input) => {
     const typeMappings = {
         created_at: { type: 'DatetimeType', isSingle: true },
@@ -1161,6 +1178,7 @@ decoders.NotificationFeedUpdatedEvent = (input) => {
 };
 decoders.NotificationStatusResponse = (input) => {
     const typeMappings = {
+        last_read_at: { type: 'DatetimeType', isSingle: true },
         last_seen_at: { type: 'DatetimeType', isSingle: true },
     };
     return decode(typeMappings, input);
@@ -1428,6 +1446,7 @@ decoders.ReviewQueueItemResponse = (input) => {
         updated_at: { type: 'DatetimeType', isSingle: true },
         actions: { type: 'ActionLogResponse', isSingle: false },
         bans: { type: 'Ban', isSingle: false },
+        flags: { type: 'ModerationFlagResponse', isSingle: false },
         completed_at: { type: 'DatetimeType', isSingle: true },
         reviewed_at: { type: 'DatetimeType', isSingle: true },
         assigned_to: { type: 'UserResponse', isSingle: true },
@@ -1750,7 +1769,7 @@ class FeedsApi {
     async addActivity(request) {
         const body = {
             type: request?.type,
-            fids: request?.fids,
+            feeds: request?.feeds,
             expires_at: request?.expires_at,
             id: request?.id,
             parent_id: request?.parent_id,
@@ -1780,7 +1799,7 @@ class FeedsApi {
     }
     async deleteActivities(request) {
         const body = {
-            activity_ids: request?.activity_ids,
+            ids: request?.ids,
             hard_delete: request?.hard_delete,
         };
         const response = await this.apiClient.sendRequest('POST', '/api/v2/feeds/activities/delete', undefined, undefined, body, 'application/json');
@@ -1799,56 +1818,6 @@ class FeedsApi {
         decoders.QueryActivitiesResponse?.(response.body);
         return { ...response.body, metadata: response.metadata };
     }
-    async deleteActivity(request) {
-        const queryParams = {
-            hard_delete: request?.hard_delete,
-        };
-        const pathParams = {
-            activity_id: request?.activity_id,
-        };
-        const response = await this.apiClient.sendRequest('DELETE', '/api/v2/feeds/activities/{activity_id}', pathParams, queryParams);
-        decoders.DeleteActivityResponse?.(response.body);
-        return { ...response.body, metadata: response.metadata };
-    }
-    async getActivity(request) {
-        const pathParams = {
-            activity_id: request?.activity_id,
-        };
-        const response = await this.apiClient.sendRequest('GET', '/api/v2/feeds/activities/{activity_id}', pathParams, undefined);
-        decoders.GetActivityResponse?.(response.body);
-        return { ...response.body, metadata: response.metadata };
-    }
-    async updateActivityPartial(request) {
-        const pathParams = {
-            activity_id: request?.activity_id,
-        };
-        const body = {
-            unset: request?.unset,
-            set: request?.set,
-        };
-        const response = await this.apiClient.sendRequest('PATCH', '/api/v2/feeds/activities/{activity_id}', pathParams, undefined, body, 'application/json');
-        decoders.UpdateActivityPartialResponse?.(response.body);
-        return { ...response.body, metadata: response.metadata };
-    }
-    async updateActivity(request) {
-        const pathParams = {
-            activity_id: request?.activity_id,
-        };
-        const body = {
-            expires_at: request?.expires_at,
-            poll_id: request?.poll_id,
-            text: request?.text,
-            visibility: request?.visibility,
-            attachments: request?.attachments,
-            filter_tags: request?.filter_tags,
-            interest_tags: request?.interest_tags,
-            custom: request?.custom,
-            location: request?.location,
-        };
-        const response = await this.apiClient.sendRequest('PUT', '/api/v2/feeds/activities/{activity_id}', pathParams, undefined, body, 'application/json');
-        decoders.UpdateActivityResponse?.(response.body);
-        return { ...response.body, metadata: response.metadata };
-    }
     async deleteBookmark(request) {
         const queryParams = {
             folder_id: request?.folder_id,
@@ -1887,6 +1856,21 @@ class FeedsApi {
         decoders.AddBookmarkResponse?.(response.body);
         return { ...response.body, metadata: response.metadata };
     }
+    async activityFeedback(request) {
+        const pathParams = {
+            activity_id: request?.activity_id,
+        };
+        const body = {
+            hide: request?.hide,
+            mute_user: request?.mute_user,
+            reason: request?.reason,
+            report: request?.report,
+            show_less: request?.show_less,
+        };
+        const response = await this.apiClient.sendRequest('POST', '/api/v2/feeds/activities/{activity_id}/feedback', pathParams, undefined, body, 'application/json');
+        decoders.ActivityFeedbackResponse?.(response.body);
+        return { ...response.body, metadata: response.metadata };
+    }
     async castPollVote(request) {
         const pathParams = {
             activity_id: request?.activity_id,
@@ -1949,6 +1933,56 @@ class FeedsApi {
         decoders.DeleteActivityReactionResponse?.(response.body);
         return { ...response.body, metadata: response.metadata };
     }
+    async deleteActivity(request) {
+        const queryParams = {
+            hard_delete: request?.hard_delete,
+        };
+        const pathParams = {
+            id: request?.id,
+        };
+        const response = await this.apiClient.sendRequest('DELETE', '/api/v2/feeds/activities/{id}', pathParams, queryParams);
+        decoders.DeleteActivityResponse?.(response.body);
+        return { ...response.body, metadata: response.metadata };
+    }
+    async getActivity(request) {
+        const pathParams = {
+            id: request?.id,
+        };
+        const response = await this.apiClient.sendRequest('GET', '/api/v2/feeds/activities/{id}', pathParams, undefined);
+        decoders.GetActivityResponse?.(response.body);
+        return { ...response.body, metadata: response.metadata };
+    }
+    async updateActivityPartial(request) {
+        const pathParams = {
+            id: request?.id,
+        };
+        const body = {
+            unset: request?.unset,
+            set: request?.set,
+        };
+        const response = await this.apiClient.sendRequest('PATCH', '/api/v2/feeds/activities/{id}', pathParams, undefined, body, 'application/json');
+        decoders.UpdateActivityPartialResponse?.(response.body);
+        return { ...response.body, metadata: response.metadata };
+    }
+    async updateActivity(request) {
+        const pathParams = {
+            id: request?.id,
+        };
+        const body = {
+            expires_at: request?.expires_at,
+            poll_id: request?.poll_id,
+            text: request?.text,
+            visibility: request?.visibility,
+            attachments: request?.attachments,
+            filter_tags: request?.filter_tags,
+            interest_tags: request?.interest_tags,
+            custom: request?.custom,
+            location: request?.location,
+        };
+        const response = await this.apiClient.sendRequest('PUT', '/api/v2/feeds/activities/{id}', pathParams, undefined, body, 'application/json');
+        decoders.UpdateActivityResponse?.(response.body);
+        return { ...response.body, metadata: response.metadata };
+    }
     async queryBookmarkFolders(request) {
         const body = {
             limit: request?.limit,
@@ -2044,49 +2078,52 @@ class FeedsApi {
         return { ...response.body, metadata: response.metadata };
     }
     async deleteComment(request) {
+        const queryParams = {
+            hard_delete: request?.hard_delete,
+        };
         const pathParams = {
-            comment_id: request?.comment_id,
+            id: request?.id,
         };
-        const response = await this.apiClient.sendRequest('DELETE', '/api/v2/feeds/comments/{comment_id}', pathParams, undefined);
+        const response = await this.apiClient.sendRequest('DELETE', '/api/v2/feeds/comments/{id}', pathParams, queryParams);
         decoders.DeleteCommentResponse?.(response.body);
         return { ...response.body, metadata: response.metadata };
     }
     async getComment(request) {
         const pathParams = {
-            comment_id: request?.comment_id,
+            id: request?.id,
         };
-        const response = await this.apiClient.sendRequest('GET', '/api/v2/feeds/comments/{comment_id}', pathParams, undefined);
+        const response = await this.apiClient.sendRequest('GET', '/api/v2/feeds/comments/{id}', pathParams, undefined);
         decoders.GetCommentResponse?.(response.body);
         return { ...response.body, metadata: response.metadata };
     }
     async updateComment(request) {
         const pathParams = {
-            comment_id: request?.comment_id,
+            id: request?.id,
         };
         const body = {
             comment: request?.comment,
             custom: request?.custom,
         };
-        const response = await this.apiClient.sendRequest('PATCH', '/api/v2/feeds/comments/{comment_id}', pathParams, undefined, body, 'application/json');
+        const response = await this.apiClient.sendRequest('PATCH', '/api/v2/feeds/comments/{id}', pathParams, undefined, body, 'application/json');
         decoders.UpdateCommentResponse?.(response.body);
         return { ...response.body, metadata: response.metadata };
     }
     async addCommentReaction(request) {
         const pathParams = {
-            comment_id: request?.comment_id,
+            id: request?.id,
         };
         const body = {
             type: request?.type,
             create_notification_activity: request?.create_notification_activity,
             custom: request?.custom,
         };
-        const response = await this.apiClient.sendRequest('POST', '/api/v2/feeds/comments/{comment_id}/reactions', pathParams, undefined, body, 'application/json');
+        const response = await this.apiClient.sendRequest('POST', '/api/v2/feeds/comments/{id}/reactions', pathParams, undefined, body, 'application/json');
         decoders.AddCommentReactionResponse?.(response.body);
         return { ...response.body, metadata: response.metadata };
     }
     async queryCommentReactions(request) {
         const pathParams = {
-            comment_id: request?.comment_id,
+            id: request?.id,
         };
         const body = {
             limit: request?.limit,
@@ -2095,16 +2132,16 @@ class FeedsApi {
             sort: request?.sort,
             filter: request?.filter,
         };
-        const response = await this.apiClient.sendRequest('POST', '/api/v2/feeds/comments/{comment_id}/reactions/query', pathParams, undefined, body, 'application/json');
+        const response = await this.apiClient.sendRequest('POST', '/api/v2/feeds/comments/{id}/reactions/query', pathParams, undefined, body, 'application/json');
         decoders.QueryCommentReactionsResponse?.(response.body);
         return { ...response.body, metadata: response.metadata };
     }
     async deleteCommentReaction(request) {
         const pathParams = {
-            comment_id: request?.comment_id,
+            id: request?.id,
             type: request?.type,
         };
-        const response = await this.apiClient.sendRequest('DELETE', '/api/v2/feeds/comments/{comment_id}/reactions/{type}', pathParams, undefined);
+        const response = await this.apiClient.sendRequest('DELETE', '/api/v2/feeds/comments/{id}/reactions/{type}', pathParams, undefined);
         decoders.DeleteCommentReactionResponse?.(response.body);
         return { ...response.body, metadata: response.metadata };
     }
@@ -2118,9 +2155,9 @@ class FeedsApi {
             next: request?.next,
         };
         const pathParams = {
-            comment_id: request?.comment_id,
+            id: request?.id,
         };
-        const response = await this.apiClient.sendRequest('GET', '/api/v2/feeds/comments/{comment_id}/replies', pathParams, queryParams);
+        const response = await this.apiClient.sendRequest('GET', '/api/v2/feeds/comments/{id}/replies', pathParams, queryParams);
         decoders.GetCommentRepliesResponse?.(response.body);
         return { ...response.body, metadata: response.metadata };
     }
@@ -2169,7 +2206,6 @@ class FeedsApi {
             feed_id: request?.feed_id,
         };
         const body = {
-            created_by_id: request?.created_by_id,
             custom: request?.custom,
         };
         const response = await this.apiClient.sendRequest('PUT', '/api/v2/feeds/feed_groups/{feed_group_id}/feeds/{feed_id}', pathParams, undefined, body, 'application/json');
@@ -2185,6 +2221,7 @@ class FeedsApi {
             mark_all_read: request?.mark_all_read,
             mark_all_seen: request?.mark_all_seen,
             mark_read: request?.mark_read,
+            mark_seen: request?.mark_seen,
             mark_watched: request?.mark_watched,
         };
         const response = await this.apiClient.sendRequest('POST', '/api/v2/feeds/feed_groups/{feed_group_id}/feeds/{feed_id}/activities/mark/batch', pathParams, undefined, body, 'application/json');
@@ -2295,7 +2332,7 @@ class FeedsApi {
         decoders.CreateFeedsBatchResponse?.(response.body);
         return { ...response.body, metadata: response.metadata };
     }
-    async feedsQueryFeeds(request) {
+    async _queryFeeds(request) {
         const queryParams = {
             connection_id: request?.connection_id,
         };
@@ -2338,8 +2375,8 @@ class FeedsApi {
     }
     async acceptFollow(request) {
         const body = {
-            source_fid: request?.source_fid,
-            target_fid: request?.target_fid,
+            source: request?.source,
+            target: request?.target,
             follower_role: request?.follower_role,
         };
         const response = await this.apiClient.sendRequest('POST', '/api/v2/feeds/follows/accept', undefined, undefined, body, 'application/json');
@@ -2368,8 +2405,8 @@ class FeedsApi {
     }
     async rejectFollow(request) {
         const body = {
-            source_fid: request?.source_fid,
-            target_fid: request?.target_fid,
+            source: request?.source,
+            target: request?.target,
         };
         const response = await this.apiClient.sendRequest('POST', '/api/v2/feeds/follows/reject', undefined, undefined, body, 'application/json');
         decoders.RejectFollowResponse?.(response.body);
@@ -3784,6 +3821,7 @@ class ModerationApi {
             block_list_config: request?.block_list_config,
             bodyguard_config: request?.bodyguard_config,
             google_vision_config: request?.google_vision_config,
+            llm_config: request?.llm_config,
             rule_builder_config: request?.rule_builder_config,
             velocity_filter_config: request?.velocity_filter_config,
             video_call_rule_config: request?.video_call_rule_config,
@@ -4249,7 +4287,7 @@ const shouldUpdateState = ({ stateUpdateQueueId, stateUpdateQueue, watch, }) =>
 };
 function getStateUpdateQueueId(data, prefix) {
     if (isFollowResponse(data)) {
-        const toJoin = [data.source_feed.fid, data.target_feed.fid];
+        const toJoin = [data.source_feed.feed, data.target_feed.feed];
         if (prefix) {
             toJoin.unshift(prefix);
         }
@@ -4260,6 +4298,23 @@ function getStateUpdateQueueId(data, prefix) {
     throw new Error(`Cannot create state update queueId for data: ${JSON.stringify(data)}`);
 }
 
+function updateEntityInArray({ matcher, updater, entities, }) {
+    if (!entities || !entities.length) {
+        return { changed: false, entities };
+    }
+    const index = entities.findIndex(matcher);
+    if (index === -1) {
+        return { changed: false, entities };
+    }
+    const newEntity = updater(entities[index]);
+    if (newEntity === entities[index]) {
+        return { changed: false, entities };
+    }
+    const updatedEntities = [...entities];
+    updatedEntities[index] = newEntity;
+    return { changed: true, entities: updatedEntities };
+}
+
 const updateStateFollowCreated = (follow, currentState, currentFeedId, connectedUserId) => {
     // filter non-accepted follows (the way getOrCreate does by default)
     if (follow.status !== 'accepted') {
@@ -4267,7 +4322,7 @@ const updateStateFollowCreated = (follow, currentState, currentFeedId, connected
     }
     let newState = { ...currentState };
     // this feed followed someone
-    if (follow.source_feed.fid === currentFeedId) {
+    if (follow.source_feed.feed === currentFeedId) {
         newState = {
             ...newState,
             // Update FeedResponse fields, that has the new follower/following count
@@ -4280,7 +4335,7 @@ const updateStateFollowCreated = (follow, currentState, currentFeedId, connected
     }
     else if (
     // someone followed this feed
-    follow.target_feed.fid === currentFeedId) {
+    follow.target_feed.feed === currentFeedId) {
         const source = follow.source_feed;
         newState = {
             ...newState,
@@ -4309,7 +4364,7 @@ function handleFollowCreated(eventOrResponse) {
         return;
     }
     const connectedUser = this.client.state.getLatestValue().connected_user;
-    const result = updateStateFollowCreated(follow, this.currentState, this.fid, connectedUser?.id);
+    const result = updateStateFollowCreated(follow, this.currentState, this.feed, connectedUser?.id);
     if (result.changed) {
         this.state.next(result.data);
     }
@@ -4318,7 +4373,7 @@ function handleFollowCreated(eventOrResponse) {
 const updateStateFollowDeleted = (follow, currentState, currentFeedId, connectedUserId) => {
     let newState = { ...currentState };
     // this feed unfollowed someone
-    if (follow.source_feed.fid === currentFeedId) {
+    if (follow.source_feed.feed === currentFeedId) {
         newState = {
             ...newState,
             // Update FeedResponse fields, that has the new follower/following count
@@ -4326,12 +4381,12 @@ const updateStateFollowDeleted = (follow, currentState, currentFeedId, connected
         };
         // Only update if following array already exists
         if (currentState.following !== undefined) {
-            newState.following = currentState.following.filter((followItem) => followItem.target_feed.fid !== follow.target_feed.fid);
+            newState.following = currentState.following.filter((followItem) => followItem.target_feed.feed !== follow.target_feed.feed);
         }
     }
     else if (
     // someone unfollowed this feed
-    follow.target_feed.fid === currentFeedId) {
+    follow.target_feed.feed === currentFeedId) {
         const source = follow.source_feed;
         newState = {
             ...newState,
@@ -4340,11 +4395,11 @@ const updateStateFollowDeleted = (follow, currentState, currentFeedId, connected
         };
         if (source.created_by.id === connectedUserId &&
             currentState.own_follows !== undefined) {
-            newState.own_follows = currentState.own_follows.filter((followItem) => followItem.source_feed.fid !== follow.source_feed.fid);
+            newState.own_follows = currentState.own_follows.filter((followItem) => followItem.source_feed.feed !== follow.source_feed.feed);
         }
         // Only update if followers array already exists
         if (currentState.followers !== undefined) {
-            newState.followers = currentState.followers.filter((followItem) => followItem.source_feed.fid !== follow.source_feed.fid);
+            newState.followers = currentState.followers.filter((followItem) => followItem.source_feed.feed !== follow.source_feed.feed);
         }
     }
     return { changed: true, data: newState };
@@ -4359,7 +4414,7 @@ function handleFollowDeleted(eventOrResponse) {
         return;
     }
     const connectedUser = this.client.state.getLatestValue().connected_user;
-    const result = updateStateFollowDeleted(follow, this.currentState, this.fid, connectedUser?.id);
+    const result = updateStateFollowDeleted(follow, this.currentState, this.feed, connectedUser?.id);
     {
         this.state.next(result.data);
     }
@@ -4368,7 +4423,7 @@ function handleFollowDeleted(eventOrResponse) {
 function handleFollowUpdated(eventOrResponse) {
     const follow = eventOrResponse.follow;
     const connectedUserId = this.client.state.getLatestValue().connected_user?.id;
-    const currentFeedId = this.fid;
+    const currentFeedId = this.feed;
     if (!shouldUpdateState({
         stateUpdateQueueId: getStateUpdateQueueId(follow, 'updated'),
         stateUpdateQueue: this.stateUpdateQueue,
@@ -4379,13 +4434,13 @@ function handleFollowUpdated(eventOrResponse) {
     this.state.next((currentState) => {
         let newState;
         // this feed followed someone
-        if (follow.source_feed.fid === currentFeedId) {
+        if (follow.source_feed.feed === currentFeedId) {
             newState ?? (newState = {
                 ...currentState,
                 // Update FeedResponse fields, that has the new follower/following count
                 ...follow.source_feed,
             });
-            const index = currentState.following?.findIndex((f) => f.target_feed.fid === follow.target_feed.fid) ?? -1;
+            const index = currentState.following?.findIndex((f) => f.target_feed.feed === follow.target_feed.feed) ?? -1;
             if (index >= 0) {
                 newState.following = [...newState.following];
                 newState.following[index] = follow;
@@ -4393,7 +4448,7 @@ function handleFollowUpdated(eventOrResponse) {
         }
         else if (
         // someone followed this feed
-        follow.target_feed.fid === currentFeedId) {
+        follow.target_feed.feed === currentFeedId) {
             const source = follow.source_feed;
             newState ?? (newState = {
                 ...currentState,
@@ -4402,13 +4457,13 @@ function handleFollowUpdated(eventOrResponse) {
             });
             if (source.created_by.id === connectedUserId &&
                 currentState.own_follows) {
-                const index = currentState.own_follows.findIndex((f) => f.source_feed.fid === follow.source_feed.fid);
+                const index = currentState.own_follows.findIndex((f) => f.source_feed.feed === follow.source_feed.feed);
                 if (index >= 0) {
                     newState.own_follows = [...currentState.own_follows];
                     newState.own_follows[index] = follow;
                 }
             }
-            const index = currentState.followers?.findIndex((f) => f.source_feed.fid === follow.source_feed.fid) ?? -1;
+            const index = currentState.followers?.findIndex((f) => f.source_feed.feed === follow.source_feed.feed) ?? -1;
             if (index >= 0) {
                 newState.followers = [...newState.followers];
                 newState.followers[index] = follow;
@@ -4595,6 +4650,179 @@ function handleFeedMemberRemoved(event) {
     });
 }
 
+const sharedUpdateActivity$5 = ({ currentActivity, event, eventBelongsToCurrentUser, }) => {
+    let newOwnBookmarks = currentActivity.own_bookmarks;
+    if (eventBelongsToCurrentUser) {
+        newOwnBookmarks = [...newOwnBookmarks, event.bookmark];
+    }
+    return {
+        ...event.bookmark.activity,
+        own_bookmarks: newOwnBookmarks,
+        own_reactions: currentActivity.own_reactions,
+    };
+};
+const addBookmarkToActivities = (event, activities, eventBelongsToCurrentUser) => updateEntityInArray({
+    entities: activities,
+    matcher: (activity) => activity.id === event.bookmark.activity.id,
+    updater: (matchedActivity) => sharedUpdateActivity$5({
+        currentActivity: matchedActivity,
+        event,
+        eventBelongsToCurrentUser,
+    }),
+});
+const addBookmarkToPinnedActivities = (event, pinnedActivities, eventBelongsToCurrentUser) => updateEntityInArray({
+    entities: pinnedActivities,
+    matcher: (pinnedActivity) => pinnedActivity.activity.id === event.bookmark.activity.id,
+    updater: (matchedPinnedActivity) => {
+        const newActivity = sharedUpdateActivity$5({
+            currentActivity: matchedPinnedActivity.activity,
+            event,
+            eventBelongsToCurrentUser,
+        });
+        if (newActivity === matchedPinnedActivity.activity) {
+            return matchedPinnedActivity;
+        }
+        return {
+            ...matchedPinnedActivity,
+            activity: newActivity,
+        };
+    },
+});
+function handleBookmarkAdded(event) {
+    const { activities: currentActivities, pinned_activities: currentPinnedActivities, } = this.currentState;
+    const { connected_user: connectedUser } = this.client.state.getLatestValue();
+    const eventBelongsToCurrentUser = event.bookmark.user.id === connectedUser?.id;
+    const [result1, result2] = [
+        addBookmarkToActivities(event, currentActivities, eventBelongsToCurrentUser),
+        addBookmarkToPinnedActivities(event, currentPinnedActivities, eventBelongsToCurrentUser),
+    ];
+    if (result1.changed || result2.changed) {
+        this.state.partialNext({
+            activities: result1.entities,
+            pinned_activities: result2.entities,
+        });
+    }
+}
+
+// Helper function to check if two bookmarks are the same
+// A bookmark is identified by activity_id + folder_id + user_id
+const isSameBookmark = (bookmark1, bookmark2) => {
+    return (bookmark1.user.id === bookmark2.user.id &&
+        bookmark1.activity.id === bookmark2.activity.id &&
+        bookmark1.folder?.id === bookmark2.folder?.id);
+};
+const sharedUpdateActivity$4 = ({ currentActivity, event, eventBelongsToCurrentUser, }) => {
+    let newOwnBookmarks = currentActivity.own_bookmarks;
+    if (eventBelongsToCurrentUser) {
+        newOwnBookmarks = currentActivity.own_bookmarks.filter((bookmark) => !isSameBookmark(bookmark, event.bookmark));
+    }
+    return {
+        ...event.bookmark.activity,
+        own_bookmarks: newOwnBookmarks,
+        own_reactions: currentActivity.own_reactions,
+    };
+};
+const removeBookmarkFromActivities = (event, activities, eventBelongsToCurrentUser) => updateEntityInArray({
+    entities: activities,
+    matcher: (activity) => activity.id === event.bookmark.activity.id,
+    updater: (matchedActivity) => sharedUpdateActivity$4({
+        currentActivity: matchedActivity,
+        event,
+        eventBelongsToCurrentUser,
+    }),
+});
+const removeBookmarkFromPinnedActivities = (event, pinnedActivities, eventBelongsToCurrentUser) => updateEntityInArray({
+    entities: pinnedActivities,
+    matcher: (pinnedActivity) => pinnedActivity.activity.id === event.bookmark.activity.id,
+    updater: (matchedPinnedActivity) => {
+        const newActivity = sharedUpdateActivity$4({
+            currentActivity: matchedPinnedActivity.activity,
+            event,
+            eventBelongsToCurrentUser,
+        });
+        if (newActivity === matchedPinnedActivity.activity) {
+            return matchedPinnedActivity;
+        }
+        return {
+            ...matchedPinnedActivity,
+            activity: newActivity,
+        };
+    },
+});
+function handleBookmarkDeleted(event) {
+    const { activities: currentActivities, pinned_activities: currentPinnedActivities, } = this.currentState;
+    const { connected_user: connectedUser } = this.client.state.getLatestValue();
+    const eventBelongsToCurrentUser = event.bookmark.user.id === connectedUser?.id;
+    const [result1, result2] = [
+        removeBookmarkFromActivities(event, currentActivities, eventBelongsToCurrentUser),
+        removeBookmarkFromPinnedActivities(event, currentPinnedActivities, eventBelongsToCurrentUser),
+    ];
+    if (result1.changed || result2.changed) {
+        this.state.partialNext({
+            activities: result1.entities,
+            pinned_activities: result2.entities,
+        });
+    }
+}
+
+const sharedUpdateActivity$3 = ({ currentActivity, event, eventBelongsToCurrentUser, }) => {
+    let newOwnBookmarks = currentActivity.own_bookmarks;
+    if (eventBelongsToCurrentUser) {
+        const bookmarkIndex = newOwnBookmarks.findIndex((bookmark) => isSameBookmark(bookmark, event.bookmark));
+        if (bookmarkIndex !== -1) {
+            newOwnBookmarks = [...newOwnBookmarks];
+            newOwnBookmarks[bookmarkIndex] = event.bookmark;
+        }
+    }
+    return {
+        ...event.bookmark.activity,
+        own_bookmarks: newOwnBookmarks,
+        own_reactions: currentActivity.own_reactions,
+    };
+};
+const updateBookmarkInActivities = (event, activities, eventBelongsToCurrentUser) => updateEntityInArray({
+    entities: activities,
+    matcher: (activity) => activity.id === event.bookmark.activity.id,
+    updater: (matchedActivity) => sharedUpdateActivity$3({
+        currentActivity: matchedActivity,
+        event,
+        eventBelongsToCurrentUser,
+    }),
+});
+const updateBookmarkInPinnedActivities = (event, pinnedActivities, eventBelongsToCurrentUser) => updateEntityInArray({
+    entities: pinnedActivities,
+    matcher: (pinnedActivity) => pinnedActivity.activity.id === event.bookmark.activity.id,
+    updater: (matchedPinnedActivity) => {
+        const newActivity = sharedUpdateActivity$3({
+            currentActivity: matchedPinnedActivity.activity,
+            event,
+            eventBelongsToCurrentUser,
+        });
+        if (newActivity === matchedPinnedActivity.activity) {
+            return matchedPinnedActivity;
+        }
+        return {
+            ...matchedPinnedActivity,
+            activity: newActivity,
+        };
+    },
+});
+function handleBookmarkUpdated(event) {
+    const { activities: currentActivities, pinned_activities: currentPinnedActivities, } = this.currentState;
+    const { connected_user: connectedUser } = this.client.state.getLatestValue();
+    const eventBelongsToCurrentUser = event.bookmark.user.id === connectedUser?.id;
+    const [result1, result2] = [
+        updateBookmarkInActivities(event, currentActivities, eventBelongsToCurrentUser),
+        updateBookmarkInPinnedActivities(event, currentPinnedActivities, eventBelongsToCurrentUser),
+    ];
+    if (result1.changed || result2.changed) {
+        this.state.partialNext({
+            activities: result1.entities,
+            pinned_activities: result2.entities,
+        });
+    }
+}
+
 const addActivitiesToState = (newActivities, activities, position) => {
     let result;
     if (activities === undefined) {
@@ -4639,7 +4867,8 @@ function handleActivityAdded(event) {
 }
 
 const removeActivityFromState = (activityResponse, activities) => {
-    const index = activities.findIndex((a) => a.id === activityResponse.id);
+    const index = activities?.findIndex((activity) => activity.id === activityResponse.id) ??
+        -1;
     if (index !== -1) {
         const newActivities = [...activities];
         newActivities.splice(index, 1);
@@ -4649,13 +4878,28 @@ const removeActivityFromState = (activityResponse, activities) => {
         return { changed: false, activities };
     }
 };
+const removePinnedActivityFromState = (activityResponse, pinnedActivities) => {
+    const index = pinnedActivities?.findIndex((pinnedActivity) => pinnedActivity.activity.id === activityResponse.id) ?? -1;
+    if (index !== -1) {
+        const newActivities = [...pinnedActivities];
+        newActivities.splice(index, 1);
+        return { changed: true, activities: newActivities };
+    }
+    else {
+        return { changed: false, pinned_activities: pinnedActivities };
+    }
+};
 function handleActivityDeleted(event) {
-    const currentActivities = this.currentState.activities;
-    if (currentActivities) {
-        const result = removeActivityFromState(event.activity, currentActivities);
-        if (result.changed) {
-            this.state.partialNext({ activities: result.activities });
-        }
+    const { activities: currentActivities, pinned_activities: currentPinnedActivities, } = this.currentState;
+    const [result1, result2] = [
+        removeActivityFromState(event.activity, currentActivities),
+        removePinnedActivityFromState(event.activity, currentPinnedActivities),
+    ];
+    if (result1.changed || result2.changed) {
+        this.state.partialNext({
+            activities: result1.activities,
+            pinned_activities: result2.pinned_activities,
+        });
     }
 }
 
@@ -4669,221 +4913,163 @@ function handleActivityRemovedFromFeed(event) {
     }
 }
 
-const updateActivityInState = (updatedActivityResponse, activities, replaceCompletely = false) => {
-    const index = activities.findIndex((a) => a.id === updatedActivityResponse.id);
-    if (index !== -1) {
-        const newActivities = [...activities];
-        const activity = activities[index];
-        if (replaceCompletely) {
-            newActivities[index] = updatedActivityResponse;
-        }
-        else {
-            newActivities[index] = {
-                ...updatedActivityResponse,
-                own_reactions: activity.own_reactions,
-                own_bookmarks: activity.own_bookmarks,
-                latest_reactions: activity.latest_reactions,
-                reaction_groups: activity.reaction_groups,
-            };
+const sharedUpdateActivity$2 = ({ currentActivity, event, }) => {
+    return {
+        ...event.activity,
+        own_reactions: currentActivity.own_reactions,
+        own_bookmarks: currentActivity.own_bookmarks,
+    };
+};
+const updateActivityInState = (event, activities) => updateEntityInArray({
+    entities: activities,
+    matcher: (activity) => activity.id === event.activity.id,
+    updater: (matchedActivity) => sharedUpdateActivity$2({
+        currentActivity: matchedActivity,
+        event,
+    }),
+});
+const updatePinnedActivityInState = (event, pinnedActivities) => updateEntityInArray({
+    entities: pinnedActivities,
+    matcher: (pinnedActivity) => pinnedActivity.activity.id === event.activity.id,
+    updater: (matchedPinnedActivity) => {
+        const newActivity = sharedUpdateActivity$2({
+            currentActivity: matchedPinnedActivity.activity,
+            event,
+        });
+        if (newActivity === matchedPinnedActivity.activity) {
+            return matchedPinnedActivity;
         }
-        return { changed: true, activities: newActivities };
-    }
-    else {
-        return { changed: false, activities };
-    }
-};
+        return {
+            ...matchedPinnedActivity,
+            activity: newActivity,
+        };
+    },
+});
 function handleActivityUpdated(event) {
-    const currentActivities = this.currentState.activities;
-    if (currentActivities) {
-        const result = updateActivityInState(event.activity, currentActivities);
-        if (result.changed) {
-            this.client.hydratePollCache([event.activity]);
-            this.state.partialNext({ activities: result.activities });
-        }
+    const { activities: currentActivities, pinned_activities: currentPinnedActivities, } = this.currentState;
+    const [result1, result2] = [
+        updateActivityInState(event, currentActivities),
+        updatePinnedActivityInState(event, currentPinnedActivities),
+    ];
+    if (result1.changed || result2.changed) {
+        this.client.hydratePollCache([event.activity]);
+        this.state.partialNext({
+            activities: result1.entities,
+            pinned_activities: result2.entities,
+        });
     }
 }
 
-const addReactionToActivity = (event, activity, isCurrentUser) => {
-    // Update own_reactions if the reaction is from the current user
-    const ownReactions = [...(activity.own_reactions || [])];
-    if (isCurrentUser) {
-        ownReactions.push(event.reaction);
+// shared function to update the activity with the new reaction
+const sharedUpdateActivity$1 = ({ currentActivity, event, eventBelongsToCurrentUser, }) => {
+    let newOwnReactions = currentActivity.own_reactions;
+    if (eventBelongsToCurrentUser) {
+        newOwnReactions = [...currentActivity.own_reactions, event.reaction];
     }
     return {
-        ...activity,
-        own_reactions: ownReactions,
-        latest_reactions: event.activity.latest_reactions,
-        reaction_groups: event.activity.reaction_groups,
-        changed: true,
-    };
-};
-const addReactionToActivities = (event, activities, isCurrentUser) => {
-    if (!activities) {
-        return { changed: false, activities: [] };
-    }
-    const activityIndex = activities.findIndex((a) => a.id === event.activity.id);
-    if (activityIndex === -1) {
-        return { changed: false, activities };
-    }
-    const activity = activities[activityIndex];
-    const updatedActivity = addReactionToActivity(event, activity, isCurrentUser);
-    return updateActivityInState(updatedActivity, activities, true);
-};
+        ...event.activity,
+        own_reactions: newOwnReactions,
+        own_bookmarks: currentActivity.own_bookmarks,
+    };
+};
+const addReactionToActivities = (event, activities, eventBelongsToCurrentUser) => updateEntityInArray({
+    entities: activities,
+    matcher: (activity) => activity.id === event.activity.id,
+    updater: (matchedActivity) => sharedUpdateActivity$1({
+        currentActivity: matchedActivity,
+        event,
+        eventBelongsToCurrentUser,
+    }),
+});
+const addReactionToPinnedActivities = (event, pinnedActivities, eventBelongsToCurrentUser) => updateEntityInArray({
+    entities: pinnedActivities,
+    matcher: (pinnedActivity) => pinnedActivity.activity.id === event.activity.id,
+    updater: (matchedPinnedActivity) => {
+        const newActivity = sharedUpdateActivity$1({
+            currentActivity: matchedPinnedActivity.activity,
+            event,
+            eventBelongsToCurrentUser,
+        });
+        // this should never happen, but just in case
+        if (newActivity === matchedPinnedActivity.activity) {
+            return matchedPinnedActivity;
+        }
+        return {
+            ...matchedPinnedActivity,
+            activity: newActivity,
+        };
+    },
+});
 function handleActivityReactionAdded(event) {
-    const currentActivities = this.currentState.activities;
+    const { activities: currentActivities, pinned_activities: currentPinnedActivities, } = this.currentState;
     const connectedUser = this.client.state.getLatestValue().connected_user;
-    const isCurrentUser = Boolean(connectedUser && event.reaction.user.id === connectedUser.id);
-    const result = addReactionToActivities(event, currentActivities, isCurrentUser);
-    if (result.changed) {
-        this.state.partialNext({ activities: result.activities });
-    }
-}
-
-const removeReactionFromActivity = (event, activity, isCurrentUser) => {
-    // Update own_reactions if the reaction is from the current user
-    const ownReactions = isCurrentUser
-        ? (activity.own_reactions || []).filter((r) => !(r.type === event.reaction.type &&
-            r.user.id === event.reaction.user.id))
-        : activity.own_reactions;
-    return {
-        ...activity,
-        own_reactions: ownReactions,
-        latest_reactions: event.activity.latest_reactions,
-        reaction_groups: event.activity.reaction_groups,
-        changed: true,
-    };
-};
-const removeReactionFromActivities = (event, activities, isCurrentUser) => {
-    if (!activities) {
-        return { changed: false, activities: [] };
-    }
-    const activityIndex = activities.findIndex((a) => a.id === event.activity.id);
-    if (activityIndex === -1) {
-        return { changed: false, activities };
-    }
-    const activity = activities[activityIndex];
-    const updatedActivity = removeReactionFromActivity(event, activity, isCurrentUser);
-    return updateActivityInState(updatedActivity, activities, true);
-};
-function handleActivityReactionDeleted(event) {
-    const currentActivities = this.currentState.activities;
-    const connectedUser = this.client.state.getLatestValue().connected_user;
-    const isCurrentUser = Boolean(connectedUser && event.reaction.user.id === connectedUser.id);
-    const result = removeReactionFromActivities(event, currentActivities, isCurrentUser);
-    if (result.changed) {
-        this.state.partialNext({ activities: result.activities });
-    }
-}
-
-const addBookmarkToActivity = (event, activity, isCurrentUser) => {
-    // Update own_bookmarks if the bookmark is from the current user
-    const ownBookmarks = [...(activity.own_bookmarks || [])];
-    if (isCurrentUser) {
-        ownBookmarks.push(event.bookmark);
-    }
-    return {
-        ...activity,
-        own_bookmarks: ownBookmarks,
-        changed: true,
-    };
-};
-const addBookmarkToActivities = (event, activities, isCurrentUser) => {
-    if (!activities) {
-        return { changed: false, activities: [] };
-    }
-    const activityIndex = activities.findIndex((a) => a.id === event.bookmark.activity.id);
-    if (activityIndex === -1) {
-        return { changed: false, activities };
-    }
-    const activity = activities[activityIndex];
-    const updatedActivity = addBookmarkToActivity(event, activity, isCurrentUser);
-    return updateActivityInState(updatedActivity, activities, true);
-};
-function handleBookmarkAdded(event) {
-    const currentActivities = this.currentState.activities;
-    const { connected_user: connectedUser } = this.client.state.getLatestValue();
-    const isCurrentUser = event.bookmark.user.id === connectedUser?.id;
-    const result = addBookmarkToActivities(event, currentActivities, isCurrentUser);
-    if (result.changed) {
-        this.state.partialNext({ activities: result.activities });
+    const eventBelongsToCurrentUser = typeof connectedUser !== 'undefined' &&
+        event.reaction.user.id === connectedUser.id;
+    const [result1, result2] = [
+        addReactionToActivities(event, currentActivities, eventBelongsToCurrentUser),
+        addReactionToPinnedActivities(event, currentPinnedActivities, eventBelongsToCurrentUser),
+    ];
+    if (result1.changed || result2.changed) {
+        this.state.partialNext({
+            activities: result1.entities,
+            pinned_activities: result2.entities,
+        });
     }
 }
 
-// Helper function to check if two bookmarks are the same
-// A bookmark is identified by activity_id + folder_id + user_id
-const isSameBookmark = (bookmark1, bookmark2) => {
-    return (bookmark1.user.id === bookmark2.user.id &&
-        bookmark1.activity.id === bookmark2.activity.id &&
-        bookmark1.folder?.id === bookmark2.folder?.id);
-};
-const removeBookmarkFromActivities = (event, activities, isCurrentUser) => {
-    if (!activities) {
-        return { changed: false, activities: [] };
-    }
-    const activityIndex = activities.findIndex((a) => a.id === event.bookmark.activity.id);
-    if (activityIndex === -1) {
-        return { changed: false, activities };
+const sharedUpdateActivity = ({ currentActivity, event, eventBelongsToCurrentUser, }) => {
+    let newOwnReactions = currentActivity.own_reactions;
+    if (eventBelongsToCurrentUser) {
+        newOwnReactions = currentActivity.own_reactions.filter((reaction) => !(reaction.type === event.reaction.type &&
+            reaction.user.id === event.reaction.user.id));
     }
-    const activity = activities[activityIndex];
-    const updatedActivity = removeBookmarkFromActivity(event, activity, isCurrentUser);
-    return updateActivityInState(updatedActivity, activities, true);
-};
-const removeBookmarkFromActivity = (event, activity, isCurrentUser) => {
-    // Update own_bookmarks if the bookmark is from the current user
-    const ownBookmarks = isCurrentUser
-        ? (activity.own_bookmarks || []).filter((bookmark) => !isSameBookmark(bookmark, event.bookmark))
-        : activity.own_bookmarks;
     return {
-        ...activity,
-        own_bookmarks: ownBookmarks,
-        changed: true,
-    };
-};
-function handleBookmarkDeleted(event) {
-    const currentActivities = this.currentState.activities;
-    const { connected_user: connectedUser } = this.client.state.getLatestValue();
-    const isCurrentUser = event.bookmark.user.id === connectedUser?.id;
-    const result = removeBookmarkFromActivities(event, currentActivities, isCurrentUser);
-    if (result.changed) {
-        this.state.partialNext({ activities: result.activities });
-    }
-}
-
-const updateBookmarkInActivity = (event, activity, isCurrentUser) => {
-    // Update own_bookmarks if the bookmark is from the current user
-    let ownBookmarks = activity.own_bookmarks || [];
-    if (isCurrentUser) {
-        const bookmarkIndex = ownBookmarks.findIndex((bookmark) => isSameBookmark(bookmark, event.bookmark));
-        if (bookmarkIndex !== -1) {
-            ownBookmarks = [...ownBookmarks];
-            ownBookmarks[bookmarkIndex] = event.bookmark;
+        ...event.activity,
+        own_reactions: newOwnReactions,
+        own_bookmarks: currentActivity.own_bookmarks,
+    };
+};
+const removeReactionFromActivities = (event, activities, eventBelongsToCurrentUser) => updateEntityInArray({
+    entities: activities,
+    matcher: (activity) => activity.id === event.activity.id,
+    updater: (matchedActivity) => sharedUpdateActivity({
+        currentActivity: matchedActivity,
+        event,
+        eventBelongsToCurrentUser,
+    }),
+});
+const removeReactionFromPinnedActivities = (event, activities, eventBelongsToCurrentUser) => updateEntityInArray({
+    entities: activities,
+    matcher: (pinnedActivity) => pinnedActivity.activity.id === event.activity.id,
+    updater: (matchedPinnedActivity) => {
+        const newActivity = sharedUpdateActivity({
+            currentActivity: matchedPinnedActivity.activity,
+            event,
+            eventBelongsToCurrentUser,
+        });
+        if (newActivity === matchedPinnedActivity.activity) {
+            return matchedPinnedActivity;
         }
-    }
-    return {
-        ...activity,
-        own_bookmarks: ownBookmarks,
-        changed: true,
-    };
-};
-const updateBookmarkInActivities = (event, activities, isCurrentUser) => {
-    if (!activities) {
-        return { changed: false, activities: [] };
-    }
-    const activityIndex = activities.findIndex((a) => a.id === event.bookmark.activity.id);
-    if (activityIndex === -1) {
-        return { changed: false, activities };
-    }
-    const activity = activities[activityIndex];
-    const updatedActivity = updateBookmarkInActivity(event, activity, isCurrentUser);
-    return updateActivityInState(updatedActivity, activities, true);
-};
-function handleBookmarkUpdated(event) {
-    const currentActivities = this.currentState.activities;
-    const { connected_user: connectedUser } = this.client.state.getLatestValue();
-    const isCurrentUser = event.bookmark.user.id === connectedUser?.id;
-    const result = updateBookmarkInActivities(event, currentActivities, isCurrentUser);
-    if (result.changed) {
-        this.state.partialNext({ activities: result.activities });
+        return {
+            ...matchedPinnedActivity,
+            activity: newActivity,
+        };
+    },
+});
+function handleActivityReactionDeleted(event) {
+    const { activities: currentActivities, pinned_activities: currentPinnedActivities, } = this.currentState;
+    const connectedUser = this.client.state.getLatestValue().connected_user;
+    const eventBelongsToCurrentUser = typeof connectedUser !== 'undefined' &&
+        event.reaction.user.id === connectedUser.id;
+    const [result1, result2] = [
+        removeReactionFromActivities(event, currentActivities, eventBelongsToCurrentUser),
+        removeReactionFromPinnedActivities(event, currentPinnedActivities, eventBelongsToCurrentUser),
+    ];
+    if (result1.changed || result2.changed) {
+        this.state.partialNext({
+            activities: result1.entities,
+            pinned_activities: result2.entities,
+        });
     }
 }
 
@@ -4896,6 +5082,14 @@ function handleNotificationFeedUpdated(event) {
     // TODO: handle notification feed updates
 }
 
+function handleWatchStarted() {
+    this.state.partialNext({ watch: true });
+}
+
+function handleWatchStopped() {
+    this.state.partialNext({ watch: false });
+}
+
 class Feed extends FeedApi {
     constructor(client, groupId, id, data, watch = false) {
         super(client, groupId, id);
@@ -4956,7 +5150,7 @@ class Feed extends FeedApi {
         this.on = this.eventDispatcher.on;
         this.off = this.eventDispatcher.off;
         this.state = new StateStore({
-            fid: `${groupId}:${id}`,
+            feed: `${groupId}:${id}`,
             group_id: groupId,
             id,
             ...(data ?? {}),
@@ -4967,7 +5161,7 @@ class Feed extends FeedApi {
         });
         this.client = client;
     }
-    get fid() {
+    get feed() {
         return `${this.group}:${this.id}`;
     }
     get currentState() {
@@ -5042,22 +5236,6 @@ class Feed extends FeedApi {
             });
         }
     }
-    /**
-     * @internal
-     */
-    handleWatchStopped() {
-        this.state.partialNext({
-            watch: false,
-        });
-    }
-    /**
-     * @internal
-     */
-    handleWatchStarted() {
-        this.state.partialNext({
-            watch: true,
-        });
-    }
     /**
      * Returns index of the provided comment object.
      */
@@ -5217,7 +5395,7 @@ class Feed extends FeedApi {
             entityId: comment.id,
             base: () => this.client.getCommentReplies({
                 ...request,
-                comment_id: comment.id,
+                id: comment.id,
                 // use known sort first (prevents broken pagination)
                 sort,
                 next: currentNextCursor,
@@ -5257,7 +5435,7 @@ class Feed extends FeedApi {
                     ...currentState,
                     [type]: currentState[type] === undefined
                         ? follows
-                        : uniqueArrayMerge(currentState[type], follows, (follow) => `${follow.source_feed.fid}-${follow.target_feed.fid}`),
+                        : uniqueArrayMerge(currentState[type], follows, (follow) => `${follow.source_feed.feed}-${follow.target_feed.feed}`),
                     [paginationKey]: {
                         ...currentState[paginationKey],
                         next: newNextCursor,
@@ -5350,7 +5528,7 @@ class Feed extends FeedApi {
      */
     async queryFollowers(request) {
         const filter = {
-            target_feed: this.fid,
+            target_feed: this.feed,
         };
         const response = await this.client.queryFollows({
             filter,
@@ -5365,7 +5543,7 @@ class Feed extends FeedApi {
      */
     async queryFollowing(request) {
         const filter = {
-            source_feed: this.fid,
+            source_feed: this.feed,
         };
         const response = await this.client.queryFollows({
             filter,
@@ -5374,18 +5552,18 @@ class Feed extends FeedApi {
         return response;
     }
     async follow(feedOrFid, options) {
-        const fid = typeof feedOrFid === 'string' ? feedOrFid : feedOrFid.fid;
+        const fid = typeof feedOrFid === 'string' ? feedOrFid : feedOrFid.feed;
         const response = await this.client.follow({
             ...options,
-            source: this.fid,
+            source: this.feed,
             target: fid,
         });
         return response;
     }
     async unfollow(feedOrFid) {
-        const fid = typeof feedOrFid === 'string' ? feedOrFid : feedOrFid.fid;
+        const fid = typeof feedOrFid === 'string' ? feedOrFid : feedOrFid.feed;
         const response = await this.client.unfollow({
-            source: this.fid,
+            source: this.feed,
             target: fid,
         });
         return response;
@@ -5409,7 +5587,7 @@ class Feed extends FeedApi {
     addActivity(request) {
         return this.feedsApi.addActivity({
             ...request,
-            fids: [this.fid],
+            feeds: [this.feed],
         });
     }
     handleWSEvent(event) {
@@ -5427,6 +5605,24 @@ class Feed extends FeedApi {
 }
 Feed.noop = () => { };
 
+function handleUserUpdated(event) {
+    this.state.next((currentState) => {
+        let newState;
+        const { connected_user } = currentState;
+        if (connected_user && connected_user.id === event.user.id) {
+            newState ?? (newState = {
+                ...currentState,
+            });
+            newState.connected_user = {
+                ...connected_user,
+                ...event.user,
+            };
+        }
+        // TODO: update other users in user map (if/once applicable)
+        return newState ?? currentState;
+    });
+}
+
 class FeedsClient extends FeedsApi {
     constructor(apiKey, options) {
         const tokenManager = new TokenManager();
@@ -5534,7 +5730,7 @@ class FeedsClient extends FeedsApi {
             if (this.activeFeeds[fid]) {
                 const feed = this.activeFeeds[fid];
                 if (watch && !feed.currentState.watch) {
-                    feed.handleWatchStarted();
+                    handleWatchStarted.bind(feed)();
                 }
                 return feed;
             }
@@ -5570,7 +5766,7 @@ class FeedsClient extends FeedsApi {
                     }
                     else {
                         for (const activeFeed of Object.values(this.activeFeeds)) {
-                            activeFeed.handleWatchStopped();
+                            handleWatchStopped.bind(activeFeed)();
                         }
                     }
                     break;
@@ -5650,6 +5846,10 @@ class FeedsClient extends FeedsApi {
                     feeds.forEach((f) => f.handleWSEvent(event));
                     break;
                 }
+                case 'user.updated': {
+                    handleUserUpdated.call(this, event);
+                    break;
+                }
                 default: {
                     feed?.handleWSEvent(event);
                 }
@@ -5675,7 +5875,7 @@ class FeedsClient extends FeedsApi {
         }
     }
     async queryFeeds(request) {
-        const response = await this.feedsQueryFeeds(request);
+        const response = await this._queryFeeds(request);
         const feeds = response.feeds.map((f) => this.getOrCreateActiveFeed(f.group_id, f.id, f, request?.watch));
         return {
             feeds,
@@ -5687,7 +5887,10 @@ class FeedsClient extends FeedsApi {
     }
     async updateFollow(request) {
         const response = await super.updateFollow(request);
-        [response.follow.source_feed.fid, response.follow.target_feed.fid].forEach((fid) => {
+        [
+            response.follow.source_feed.feed,
+            response.follow.target_feed.feed,
+        ].forEach((fid) => {
             const feed = this.activeFeeds[fid];
             if (feed) {
                 handleFollowUpdated.bind(feed)(response);
@@ -5698,7 +5901,10 @@ class FeedsClient extends FeedsApi {
     // For follow API endpoints we update the state after HTTP response to allow queryFeeds with watch: false
     async follow(request) {
         const response = await super.follow(request);
-        [response.follow.source_feed.fid, response.follow.target_feed.fid].forEach((fid) => {
+        [
+            response.follow.source_feed.feed,
+            response.follow.target_feed.feed,
+        ].forEach((fid) => {
             const feed = this.activeFeeds[fid];
             if (feed) {
                 handleFollowCreated.bind(feed)(response);
@@ -5709,7 +5915,7 @@ class FeedsClient extends FeedsApi {
     async followBatch(request) {
         const response = await super.followBatch(request);
         response.follows.forEach((follow) => {
-            const feed = this.activeFeeds[follow.source_feed.fid];
+            const feed = this.activeFeeds[follow.source_feed.feed];
             if (feed) {
                 handleFollowCreated.bind(feed)({ follow });
             }
@@ -5734,7 +5940,7 @@ class FeedsClient extends FeedsApi {
         });
         const feed = this.activeFeeds[`${request.feed_group_id}:${request.feed_id}`];
         if (feed) {
-            feed.handleWatchStopped();
+            handleWatchStopped.bind(feed)();
         }
         return response;
     }
@@ -6128,12 +6334,12 @@ const useReactionActions = ({ entity, type, }) => {
     const hasOwnReaction = react.useMemo(() => !!entity.own_reactions?.find((r) => r.type === type), [entity.own_reactions, type]);
     const addReaction = useStableCallback(async () => {
         await (isComment
-            ? client?.addCommentReaction({ comment_id: entity.id, type })
+            ? client?.addCommentReaction({ id: entity.id, type })
             : client?.addReaction({ activity_id: entity.id, type }));
     });
     const removeReaction = useStableCallback(async () => {
         await (isComment
-            ? client?.deleteCommentReaction({ comment_id: entity.id, type })
+            ? client?.deleteCommentReaction({ id: entity.id, type })
             : client?.deleteActivityReaction({
                 activity_id: entity.id,
                 type,