@stream-io/feeds-client 0.3.23 → 0.3.25

package/dist/{feeds-client-BUZVIyHd.js → feeds-client-DUD5wy6N.js}

@@ -3936,7 +3936,7 @@ const getRateLimitFromResponseHeader = (response_headers) => {
   };
   return result;
 };
-const version = "0.3.23";
+const version = "0.3.25";
 const axios = axiosImport.default ?? axiosImport;
 class ApiClient {
   constructor(apiKey, tokenManager, connectionIdManager, options) {
@@ -4439,7 +4439,6 @@ class StreamPoll {
       } = event.poll;
       this.state.partialNext({
         answers_count,
-        // @ts-expect-error Incompatibility between PollResponseData and Poll due to teams_role, remove when OpenAPI spec is fixed
         latest_votes_by_option,
         vote_count,
         vote_counts_by_option,
@@ -4462,7 +4461,6 @@ class StreamPoll {
       if (isOwnVote) {
         if (isVoteAnswer(event.poll_vote)) {
           latestAnswers = [
-            // @ts-expect-error Incompatibility between PollResponseData and Poll due to teams_role, remove when OpenAPI spec is fixed
             event.poll_vote,
             ...latestAnswers.filter((answer) => answer.id !== event.poll_vote.id)
           ];
@@ -4502,7 +4500,6 @@ class StreamPoll {
       } = event.poll;
       this.state.partialNext({
         answers_count,
-        // @ts-expect-error Incompatibility between PollResponseData and Poll due to teams_role, remove when OpenAPI spec is fixed
         latest_votes_by_option,
         vote_count,
         vote_counts_by_option,
@@ -4545,7 +4542,6 @@ class StreamPoll {
       } = event.poll;
       this.state.partialNext({
         answers_count,
-        // @ts-expect-error Incompatibility between PollResponseData and Poll due to teams_role, remove when OpenAPI spec is fixed
         latest_votes_by_option,
         vote_count,
         vote_counts_by_option,
@@ -4802,6 +4798,7 @@ function updateEntityInArray({
   updatedEntities[index] = newEntity;
   return { changed: true, entities: updatedEntities };
 }
+const ownFeedFields = ["own_capabilities", "own_follows", "own_membership"];
 const updateStateFollowCreated = (follow, currentState, currentFeedId, connectedUserId) => {
   if (follow.status !== "accepted") {
     return { changed: false, data: currentState };
@@ -5508,7 +5505,7 @@ function handleBookmarkUpdated(event) {
     });
   }
 }
-function addActivitiesToState(newActivities, activities, position) {
+function addActivitiesToState(newActivities, activities, position, { fromWebSocket } = { fromWebSocket: false }) {
   if (activities === void 0) {
     return {
       changed: false,
@@ -5531,7 +5528,7 @@ function addActivitiesToState(newActivities, activities, position) {
       ...activities,
       ...position === "end" ? newActivitiesDeduplicated : []
     ];
-    this.newActivitiesAdded(newActivitiesDeduplicated);
+    this.newActivitiesAdded(newActivitiesDeduplicated, { fromWebSocket });
     result = { changed: true, activities: updatedActivities };
   }
   return result;
@@ -5546,7 +5543,8 @@ function handleActivityAdded(event) {
   const result = addActivitiesToState.bind(this)(
     [event.activity],
     currentActivities,
-    this.currentState.addNewActivitiesTo
+    this.currentState.addNewActivitiesTo,
+    { fromWebSocket: true }
   );
   if (result.changed) {
     const activity = event.activity;
@@ -6250,8 +6248,8 @@ const deepEqual = (x, y) => {
     return false;
   }
 };
-function getOrCreateActiveFeed(group, id, data, watch) {
-  return this.getOrCreateActiveFeed(group, id, data, watch);
+function getOrCreateActiveFeed(...args) {
+  return this.getOrCreateActiveFeed(...args);
 }
 const _Feed = class _Feed extends FeedApi {
   constructor(client, groupId, id, data, watch = false, addNewActivitiesTo = "start", activityAddedEventFilter) {
@@ -6834,9 +6832,11 @@ const _Feed = class _Feed extends FeedApi {
           event.activity.current_feed = currentActivity.current_feed;
         }
         if (event.activity.feeds.length === 1 && event.activity.current_feed && currentActivity?.current_feed) {
-          event.activity.current_feed.own_capabilities = currentActivity.current_feed.own_capabilities;
-          event.activity.current_feed.own_follows = currentActivity.current_feed.own_follows;
-          event.activity.current_feed.own_membership = currentActivity.current_feed.own_membership;
+          ownFeedFields.forEach((field) => {
+            if (field in currentActivity.current_feed) {
+              event.activity.current_feed[field] = currentActivity.current_feed[field];
+            }
+          });
         }
       }
       eventHandler?.(event);
@@ -6846,17 +6846,31 @@ const _Feed = class _Feed extends FeedApi {
     }
     this.eventDispatcher.dispatch(event);
   }
-  newActivitiesAdded(activities) {
+  newActivitiesAdded(activities, options = { fromWebSocket: false }) {
     this.client.hydratePollCache(activities);
-    activities.forEach((activity) => {
-      if (activity.current_feed) {
-        getOrCreateActiveFeed.bind(this.client)(
-          activity.current_feed.group_id,
-          activity.current_feed.id,
-          activity.current_feed
-        );
-      }
-    });
+    this.getOrCreateFeeds(activities, options);
+  }
+  getOrCreateFeeds(activities, options) {
+    const enrichmentOptions = this.currentState.last_get_or_create_request_config?.enrichment_options;
+    if (!enrichmentOptions?.skip_activity_current_feed && !enrichmentOptions?.skip_all) {
+      const feedsToGetOrCreate = /* @__PURE__ */ new Map();
+      activities.forEach((activity) => {
+        if (activity.current_feed && !feedsToGetOrCreate.has(activity.current_feed.feed)) {
+          feedsToGetOrCreate.set(
+            activity.current_feed.feed,
+            activity.current_feed
+          );
+        }
+      });
+      feedsToGetOrCreate.values().forEach((feed) => {
+        getOrCreateActiveFeed.bind(this.client)({
+          group: feed.group_id,
+          id: feed.id,
+          data: feed,
+          fromWebSocket: options.fromWebSocket
+        });
+      });
+    }
   }
 };
 _Feed.noop = () => {
@@ -7146,6 +7160,30 @@ class ActivityWithStateUpdates {
 function getFeed() {
   return this.feed;
 }
+const isOwnFollowsEqual = (currentState, newState) => {
+  const existingFollows = new Set(
+    currentState.own_follows?.map(
+      (f) => `${f.source_feed.feed}:${f.target_feed.feed}:${f.updated_at.getTime()}`
+    )
+  );
+  const newFollows = new Set(
+    newState.own_follows?.map(
+      (f) => `${f.source_feed.feed}:${f.target_feed.feed}:${f.updated_at.getTime()}`
+    )
+  );
+  if (existingFollows.size === newFollows.size) {
+    const areEqual = Array.from(existingFollows).every(
+      (f) => newFollows.has(f)
+    );
+    if (areEqual) {
+      return true;
+    }
+  }
+  return false;
+};
+const isOwnMembershipEqual = (currentState, newState) => {
+  return (currentState.own_membership?.updated_at.getTime() ?? 0) === (newState.own_membership?.updated_at.getTime() ?? 0);
+};
 class FeedsClient extends FeedsApi {
   constructor(apiKey, options) {
     const tokenManager = new TokenManager();
@@ -7397,13 +7435,11 @@ class FeedsClient extends FeedsApi {
     this.on = this.eventDispatcher.on;
     this.off = this.eventDispatcher.off;
     this.feed = (groupId, id, options2) => {
-      return this.getOrCreateActiveFeed(
-        groupId,
+      return this.getOrCreateActiveFeed({
+        group: groupId,
         id,
-        void 0,
-        void 0,
-        options2
-      );
+        options: options2
+      });
     };
     this.activityWithStateUpdates = (id) => {
       let activity = this.activeActivities[id];
@@ -7420,7 +7456,14 @@ class FeedsClient extends FeedsApi {
       };
       this.eventDispatcher.dispatch(networkEvent);
     };
-    this.getOrCreateActiveFeed = (group, id, data, watch, options2) => {
+    this.getOrCreateActiveFeed = ({
+      group,
+      id,
+      data,
+      watch,
+      options: options2,
+      fromWebSocket = false
+    }) => {
       const fid = `${group}:${id}`;
       let isCreated = false;
       if (!this.activeFeeds[fid]) {
@@ -7445,7 +7488,29 @@ class FeedsClient extends FeedsApi {
         }
       }
       if (!feed.currentState.watch) {
-        if (data) handleFeedUpdated.call(feed, { feed: data });
+        if (!isCreated && data) {
+          if ((feed.currentState.updated_at?.getTime() ?? 0) < data.updated_at.getTime()) {
+            handleFeedUpdated.call(feed, { feed: data });
+          } else if ((feed.currentState.updated_at?.getTime() ?? 0) === data.updated_at.getTime() && !fromWebSocket) {
+            const fieldsToUpdate = [];
+            if (!isOwnFollowsEqual(feed.currentState, data)) {
+              fieldsToUpdate.push("own_follows");
+            }
+            if (!isOwnMembershipEqual(feed.currentState, data)) {
+              fieldsToUpdate.push("own_membership");
+            }
+            if (fieldsToUpdate.length > 0) {
+              const fieldsToUpdateData = fieldsToUpdate.reduce(
+                (acc, field) => {
+                  acc[field] = data[field];
+                  return acc;
+                },
+                {}
+              );
+              feed.state.partialNext(fieldsToUpdateData);
+            }
+          }
+        }
         if (watch) handleWatchStarted.call(feed);
       }
       return feed;
@@ -7479,11 +7544,11 @@ class FeedsClient extends FeedsApi {
         }
         case "feeds.feed.created": {
           if (this.activeFeeds[event.feed.id]) break;
-          this.getOrCreateActiveFeed(
-            event.feed.group_id,
-            event.feed.id,
-            event.feed
-          );
+          this.getOrCreateActiveFeed({
+            group: event.feed.group_id,
+            id: event.feed.id,
+            data: event.feed
+          });
           break;
         }
         case "feeds.feed.deleted": {
@@ -7623,12 +7688,12 @@ class FeedsClient extends FeedsApi {
     const response = await this._queryFeeds(request);
     const feedResponses = response.feeds;
     const feeds = feedResponses.map(
-      (feedResponse) => this.getOrCreateActiveFeed(
-        feedResponse.group_id,
-        feedResponse.id,
-        feedResponse,
-        request?.watch
-      )
+      (feedResponse) => this.getOrCreateActiveFeed({
+        group: feedResponse.group_id,
+        id: feedResponse.id,
+        data: feedResponse,
+        watch: request?.watch
+      })
     );
     this.hydrateCapabilitiesCache(feedResponses);
     return {
@@ -7718,11 +7783,11 @@ class FeedsClient extends FeedsApi {
   async getFollowSuggestions(...params) {
     const response = await super.getFollowSuggestions(...params);
     response.suggestions.forEach((suggestion) => {
-      this.getOrCreateActiveFeed(
-        suggestion.group_id,
-        suggestion.id,
-        suggestion
-      );
+      this.getOrCreateActiveFeed({
+        group: suggestion.group_id,
+        id: suggestion.id,
+        data: suggestion
+      });
     });
     return response;
   }
@@ -7801,8 +7866,9 @@ exports.isImageFile = isImageFile;
 exports.isReactionResponse = isReactionResponse;
 exports.isVideoFile = isVideoFile;
 exports.isVoteAnswer = isVoteAnswer;
+exports.ownFeedFields = ownFeedFields;
 exports.replaceUniqueArrayMerge = replaceUniqueArrayMerge;
 exports.shouldUpdateState = shouldUpdateState;
 exports.uniqueArrayMerge = uniqueArrayMerge;
 exports.updateEntityInArray = updateEntityInArray;
-//# sourceMappingURL=feeds-client-BUZVIyHd.js.map
+//# sourceMappingURL=feeds-client-DUD5wy6N.js.map