@stream-io/feeds-client 0.2.8 → 0.2.10

package/dist/{index-Cfbt0DFY.js → index-C49kZoN7.js}

@@ -3712,7 +3712,7 @@ const getRateLimitFromResponseHeader = (response_headers) => {
   };
   return result;
 };
-const version = "0.2.8";
+const version = "0.2.10";
 class ApiClient {
   constructor(apiKey, tokenManager, connectionIdManager, options) {
     this.apiKey = apiKey;
@@ -4469,6 +4469,9 @@ const isImageFile = (file) => {
 const isVideoFile = (file) => {
   return file.type.startsWith("video/");
 };
+const ensureExhausted = (x, message) => {
+  getLogger("helpers").warn(message, x);
+};
 const shouldUpdateState = ({
   stateUpdateQueueId,
   stateUpdateQueue,
@@ -4476,7 +4479,7 @@ const shouldUpdateState = ({
   fromWs = true,
   isTriggeredByConnectedUser = false
 }) => {
-  if (!watch || !isTriggeredByConnectedUser) {
+  if (!watch || !isTriggeredByConnectedUser || !stateUpdateQueueId) {
     return true;
   }
   const prefixedStateUpdateQueueId = fromWs ? `ws-${stateUpdateQueueId}` : `http-${stateUpdateQueueId}`;
@@ -4488,19 +4491,41 @@ const shouldUpdateState = ({
   stateUpdateQueue.add(prefixedStateUpdateQueueId);
   return true;
 };
-function getStateUpdateQueueId(data, prefix) {
-  const toJoin = prefix ? [prefix] : [];
-  if (isFollowResponse(data)) {
-    return toJoin.concat([data.source_feed.feed, data.target_feed.feed]).join("-");
-  } else if (isReactionResponse(data)) {
-    return toJoin.concat([
-      data.activity.id ?? data.comment.id,
-      data.reaction.type
-    ]).join("-");
-  }
-  throw new Error(
-    `Cannot create state update queueId for data: ${JSON.stringify(data)}`
-  );
+function getStateUpdateQueueId(...args) {
+  const [data, prefix] = args;
+  const toJoin = [prefix];
+  switch (prefix) {
+    case "activity-updated": {
+      return toJoin.concat([data.activity.id]).join("-");
+    }
+    case "activity-reaction-created":
+    case "activity-reaction-deleted": {
+      return toJoin.concat([
+        data.activity.id,
+        data.reaction.type
+      ]).join("-");
+    }
+    case "comment-reaction-created":
+    case "comment-reaction-deleted": {
+      return toJoin.concat([
+        data.comment.id,
+        data.reaction.type
+      ]).join("-");
+    }
+    case "comment-created":
+    case "comment-deleted":
+    case "comment-updated": {
+      return toJoin.concat([data.comment.id]).join("-");
+    }
+    case "follow-created":
+    case "follow-deleted":
+    case "follow-updated": {
+      return toJoin.concat([data.source_feed.feed, data.target_feed.feed]).join("-");
+    }
+    default: {
+      ensureExhausted(data, "Encountered unknown state update queue prefix.");
+    }
+  }
 }
 function updateEntityInArray({
   matcher,
@@ -4616,7 +4641,7 @@ const updateStateFollowDeleted = (follow, currentState, currentFeedId, connected
 function handleFollowDeleted(eventOrResponse, fromWs) {
   const follow = eventOrResponse.follow;
   if (!shouldUpdateState({
-    stateUpdateQueueId: getStateUpdateQueueId(follow, "deleted"),
+    stateUpdateQueueId: getStateUpdateQueueId(follow, "follow-deleted"),
     stateUpdateQueue: this.stateUpdateQueue,
     watch: this.currentState.watch,
     fromWs,
@@ -4693,9 +4718,23 @@ function handleFollowUpdated(eventOrResponse, fromWs) {
     return newState ?? currentState;
   });
 }
-function handleCommentAdded(event) {
-  const { comment } = event;
+function eventTriggeredByConnectedUser(payload) {
+  const connectedUser = this.client.state.getLatestValue().connected_user;
+  const payloadUser = payload.user ?? connectedUser;
+  return typeof connectedUser !== "undefined" && connectedUser?.id === payloadUser?.id;
+}
+function handleCommentAdded(payload, fromWs) {
+  const { comment } = payload;
   const entityId = comment.parent_id ?? comment.object_id;
+  if (!shouldUpdateState({
+    stateUpdateQueueId: getStateUpdateQueueId(payload, "comment-created"),
+    stateUpdateQueue: this.stateUpdateQueue,
+    watch: this.currentState.watch,
+    fromWs,
+    isTriggeredByConnectedUser: eventTriggeredByConnectedUser.call(this, payload)
+  })) {
+    return;
+  }
   this.state.next((currentState) => {
     const entityState = currentState.comments_by_entity_id[entityId];
     if (typeof entityState?.comments === "undefined") {
@@ -4719,8 +4758,21 @@ function handleCommentAdded(event) {
     };
   });
 }
-function handleCommentDeleted({ comment }) {
+function handleCommentDeleted(payload, fromWs) {
+  const { comment } = payload;
   const entityId = comment.parent_id ?? comment.object_id;
+  if (!shouldUpdateState({
+    stateUpdateQueueId: getStateUpdateQueueId(
+      payload,
+      "comment-deleted"
+    ),
+    stateUpdateQueue: this.stateUpdateQueue,
+    watch: this.currentState.watch,
+    fromWs,
+    isTriggeredByConnectedUser: eventTriggeredByConnectedUser.call(this, payload)
+  })) {
+    return;
+  }
   this.state.next((currentState) => {
     let newCommentsByEntityId;
     const index = this.getCommentIndex(comment, currentState);
@@ -4751,9 +4803,21 @@ function handleCommentDeleted({ comment }) {
     };
   });
 }
-function handleCommentUpdated(event) {
-  const { comment } = event;
+function handleCommentUpdated(payload, fromWs) {
+  const { comment } = payload;
   const entityId = comment.parent_id ?? comment.object_id;
+  if (!shouldUpdateState({
+    stateUpdateQueueId: getStateUpdateQueueId(
+      payload,
+      "comment-updated"
+    ),
+    stateUpdateQueue: this.stateUpdateQueue,
+    watch: this.currentState.watch,
+    fromWs,
+    isTriggeredByConnectedUser: eventTriggeredByConnectedUser.call(this, payload)
+  })) {
+    return;
+  }
   this.state.next((currentState) => {
     const entityState = currentState.comments_by_entity_id[entityId];
     if (!entityState?.comments?.length) return currentState;
@@ -4773,36 +4837,88 @@ function handleCommentUpdated(event) {
     };
   });
 }
-function handleCommentReaction(event) {
-  const { comment, reaction } = event;
+function handleCommentReactionAdded(payload, fromWs) {
+  const { comment, reaction } = payload;
   const connectedUser = this.client.state.getLatestValue().connected_user;
+  const isOwnReaction = reaction.user.id === connectedUser?.id;
+  if (!shouldUpdateState({
+    stateUpdateQueueId: getStateUpdateQueueId(
+      payload,
+      "comment-reaction-created"
+    ),
+    stateUpdateQueue: this.stateUpdateQueue,
+    watch: this.currentState.watch,
+    fromWs,
+    isTriggeredByConnectedUser: isOwnReaction
+  })) {
+    return;
+  }
   this.state.next((currentState) => {
-    const forId = comment.parent_id ?? comment.object_id;
-    const entityState = currentState.comments_by_entity_id[forId];
     const commentIndex = this.getCommentIndex(comment, currentState);
     if (commentIndex === -1) return currentState;
+    const forId = comment.parent_id ?? comment.object_id;
+    const entityState = currentState.comments_by_entity_id[forId];
     const newComments = entityState?.comments?.concat([]) ?? [];
-    const commentCopy = { ...comment };
-    delete commentCopy.own_reactions;
-    const newComment = {
+    let ownReactions = newComments[commentIndex].own_reactions;
+    if (isOwnReaction) {
+      ownReactions = ownReactions.concat(reaction) ?? [reaction];
+    }
+    newComments[commentIndex] = {
       ...newComments[commentIndex],
-      ...commentCopy,
+      reaction_count: comment.reaction_count ?? 0,
       // TODO: FIXME this should be handled by the backend
-      latest_reactions: commentCopy.latest_reactions ?? [],
-      reaction_groups: commentCopy.reaction_groups ?? {}
-    };
-    newComments[commentIndex] = newComment;
-    if (reaction.user.id === connectedUser?.id) {
-      if (event.type === "feeds.comment.reaction.added") {
-        newComment.own_reactions = newComment.own_reactions.concat(
-          reaction
-        ) ?? [reaction];
-      } else if (event.type === "feeds.comment.reaction.deleted") {
-        newComment.own_reactions = newComment.own_reactions.filter(
-          (r) => r.type !== reaction.type
-        );
+      latest_reactions: comment.latest_reactions ?? [],
+      reaction_groups: comment.reaction_groups ?? {},
+      own_reactions: ownReactions
+    };
+    return {
+      ...currentState,
+      comments_by_entity_id: {
+        ...currentState.comments_by_entity_id,
+        [forId]: {
+          ...entityState,
+          comments: newComments
+        }
       }
+    };
+  });
+}
+function handleCommentReactionDeleted(payload, fromWs) {
+  const { comment, reaction } = payload;
+  const connectedUser = this.client.state.getLatestValue().connected_user;
+  const isOwnReaction = reaction.user.id === connectedUser?.id;
+  if (!shouldUpdateState({
+    stateUpdateQueueId: getStateUpdateQueueId(
+      payload,
+      "comment-reaction-deleted"
+    ),
+    stateUpdateQueue: this.stateUpdateQueue,
+    watch: this.currentState.watch,
+    fromWs,
+    isTriggeredByConnectedUser: isOwnReaction
+  })) {
+    return;
+  }
+  this.state.next((currentState) => {
+    const commentIndex = this.getCommentIndex(comment, currentState);
+    if (commentIndex === -1) return currentState;
+    const forId = comment.parent_id ?? comment.object_id;
+    const entityState = currentState.comments_by_entity_id[forId];
+    const newComments = entityState?.comments?.concat([]) ?? [];
+    let ownReactions = newComments[commentIndex].own_reactions;
+    if (isOwnReaction) {
+      ownReactions = ownReactions.filter(
+        (r) => r.type !== reaction.type
+      );
     }
+    newComments[commentIndex] = {
+      ...newComments[commentIndex],
+      reaction_count: comment.reaction_count ?? 0,
+      // TODO: FIXME this should be handled by the backend
+      latest_reactions: comment.latest_reactions ?? [],
+      reaction_groups: comment.reaction_groups ?? {},
+      own_reactions: ownReactions
+    };
     return {
       ...currentState,
       comments_by_entity_id: {
@@ -5219,19 +5335,31 @@ const updatePinnedActivityInState = (event, pinnedActivities) => updateEntityInA
     };
   }
 });
-function handleActivityUpdated(event) {
+function handleActivityUpdated(payload, fromWs) {
+  if (!shouldUpdateState({
+    stateUpdateQueueId: getStateUpdateQueueId(payload, "activity-updated"),
+    stateUpdateQueue: this.stateUpdateQueue,
+    watch: this.currentState.watch,
+    fromWs,
+    isTriggeredByConnectedUser: eventTriggeredByConnectedUser.call(
+      this,
+      payload
+    )
+  })) {
+    return;
+  }
   const {
     activities: currentActivities,
     pinned_activities: currentPinnedActivities
   } = this.currentState;
   const [result1, result2] = [
-    updateActivityInState(event, currentActivities),
-    updatePinnedActivityInState(event, currentPinnedActivities)
+    this.hasActivity(payload.activity.id) ? updateActivityInState(payload, currentActivities) : void 0,
+    updatePinnedActivityInState(payload, currentPinnedActivities)
   ];
-  if (result1.changed || result2.changed) {
-    this.client.hydratePollCache([event.activity]);
+  if (result1?.changed || result2.changed) {
+    this.client.hydratePollCache([payload.activity]);
     this.state.partialNext({
-      activities: result1.entities,
+      activities: result1?.changed ? result1.entities : currentActivities,
       pinned_activities: result2.entities
     });
   }
@@ -5515,8 +5643,8 @@ const _Feed = class _Feed extends FeedApi {
       "feeds.follow.created": handleFollowCreated.bind(this),
       "feeds.follow.deleted": handleFollowDeleted.bind(this),
       "feeds.follow.updated": handleFollowUpdated.bind(this),
-      "feeds.comment.reaction.added": handleCommentReaction.bind(this),
-      "feeds.comment.reaction.deleted": handleCommentReaction.bind(this),
+      "feeds.comment.reaction.added": handleCommentReactionAdded.bind(this),
+      "feeds.comment.reaction.deleted": handleCommentReactionDeleted.bind(this),
       "feeds.comment.reaction.updated": _Feed.noop,
       "feeds.feed_member.added": handleFeedMemberAdded.bind(this),
       "feeds.feed_member.removed": handleFeedMemberRemoved.bind(this),
@@ -6032,6 +6160,34 @@ var UnhandledErrorType = /* @__PURE__ */ ((UnhandledErrorType2) => {
   UnhandledErrorType2["ReconnectionReconciliation"] = "reconnection-reconciliation";
   return UnhandledErrorType2;
 })(UnhandledErrorType || {});
+function updateCommentCount({
+  activity,
+  comment,
+  replyCountUpdater
+}) {
+  const parentActivityId = comment.object_id;
+  if (comment?.parent_id) {
+    const grandparentCommentId = this.currentState.comments_by_entity_id[comment?.parent_id ?? ""]?.entity_parent_id;
+    const idToUpdate = grandparentCommentId ?? parentActivityId;
+    const commentToUpdate = this.currentState.comments_by_entity_id[idToUpdate]?.comments?.find((c) => c.id === comment.parent_id);
+    if (commentToUpdate) {
+      handleCommentUpdated.bind(this)(
+        {
+          comment: {
+            ...commentToUpdate,
+            reply_count: replyCountUpdater(commentToUpdate.reply_count)
+          }
+        },
+        false
+      );
+    }
+  }
+  if (this.hasActivity(activity.id)) {
+    handleActivityUpdated.bind(this)({
+      activity
+    }, false);
+  }
+}
 class FeedsClient extends FeedsApi {
   constructor(apiKey, options) {
     const tokenManager = new TokenManager();
@@ -6119,6 +6275,57 @@ class FeedsClient extends FeedsApi {
         upload_sizes: JSON.stringify(request.upload_sizes)
       });
     };
+    this.updateActivity = async (request) => {
+      const response = await super.updateActivity(request);
+      for (const feed of Object.values(this.activeFeeds)) {
+        handleActivityUpdated.bind(feed)(response, false);
+      }
+      return response;
+    };
+    this.addComment = async (request) => {
+      const response = await super.addComment(request);
+      const { comment } = response;
+      for (const feed of Object.values(this.activeFeeds)) {
+        handleCommentAdded.bind(feed)(response, false);
+        const parentActivityId = comment.object_id;
+        if (feed.hasActivity(parentActivityId)) {
+          const activityToUpdate = feed.currentState.activities?.find(
+            (activity) => activity.id === parentActivityId
+          );
+          if (activityToUpdate) {
+            updateCommentCount.bind(feed)({
+              activity: {
+                ...activityToUpdate,
+                comment_count: activityToUpdate.comment_count + 1
+              },
+              comment,
+              replyCountUpdater: (prevCount) => prevCount + 1
+            });
+          }
+        }
+      }
+      return response;
+    };
+    this.updateComment = async (request) => {
+      const response = await super.updateComment(request);
+      for (const feed of Object.values(this.activeFeeds)) {
+        handleCommentUpdated.bind(feed)(response, false);
+      }
+      return response;
+    };
+    this.deleteComment = async (request) => {
+      const response = await super.deleteComment(request);
+      const { activity, comment } = response;
+      for (const feed of Object.values(this.activeFeeds)) {
+        handleCommentDeleted.bind(feed)({ comment }, false);
+        updateCommentCount.bind(feed)({
+          activity,
+          comment,
+          replyCountUpdater: (prevCount) => prevCount - 1
+        });
+      }
+      return response;
+    };
     this.addReaction = async (request) => {
       const response = await super.addReaction(request);
       for (const feed of Object.values(this.activeFeeds)) {
@@ -6133,6 +6340,20 @@ class FeedsClient extends FeedsApi {
       }
       return response;
     };
+    this.addCommentReaction = async (request) => {
+      const response = await super.addCommentReaction(request);
+      for (const feed of Object.values(this.activeFeeds)) {
+        handleCommentReactionAdded.bind(feed)(response, false);
+      }
+      return response;
+    };
+    this.deleteCommentReaction = async (request) => {
+      const response = await super.deleteCommentReaction(request);
+      for (const feed of Object.values(this.activeFeeds)) {
+        handleCommentReactionDeleted.bind(feed)(response, false);
+      }
+      return response;
+    };
     this.queryPollAnswers = async (request) => {
       const filter = request.filter ?? {};
       const queryPollAnswersFilter = {
@@ -6478,6 +6699,7 @@ exports.StreamPoll = StreamPoll;
 exports.checkHasAnotherPage = checkHasAnotherPage;
 exports.configureLoggers = configureLoggers;
 exports.debounce = debounce;
+exports.ensureExhausted = ensureExhausted;
 exports.getLogger = getLogger;
 exports.getStateUpdateQueueId = getStateUpdateQueueId;
 exports.isCommentResponse = isCommentResponse;
@@ -6489,4 +6711,4 @@ exports.isVoteAnswer = isVoteAnswer;
 exports.shouldUpdateState = shouldUpdateState;
 exports.uniqueArrayMerge = uniqueArrayMerge;
 exports.updateEntityInArray = updateEntityInArray;
-//# sourceMappingURL=index-Cfbt0DFY.js.map
+//# sourceMappingURL=index-C49kZoN7.js.map