@stream-io/feeds-client 0.3.17 → 0.3.19

package/dist/{feeds-client-BGF3utPy.js → feeds-client-BwOGqhU9.js}

@@ -3932,7 +3932,7 @@ const getRateLimitFromResponseHeader = (response_headers) => {
   };
   return result;
 };
-const version = "0.3.17";
+const version = "0.3.19";
 class ApiClient {
   constructor(apiKey, tokenManager, connectionIdManager, options) {
     this.apiKey = apiKey;
@@ -4875,10 +4875,10 @@ const updateStateFollowDeleted = (follow, currentState, currentFeedId, connected
       // Update FeedResponse fields, that has the new follower/following count
       ...follow.target_feed
     };
-    if (source.created_by.id === connectedUserId && currentState.own_follows !== void 0) {
-      newState.own_follows = currentState.own_follows.filter(
+    if (source.created_by.id === connectedUserId) {
+      newState.own_follows = currentState.own_follows ? currentState.own_follows.filter(
         (followItem) => followItem.source_feed.feed !== follow.source_feed.feed
-      );
+      ) : [];
     }
     if (currentState.followers !== void 0) {
       newState.followers = currentState.followers.filter(
@@ -5297,13 +5297,10 @@ const sharedUpdateActivity$6 = ({
   if (eventBelongsToCurrentUser) {
     newOwnBookmarks = [...newOwnBookmarks, event.bookmark];
   }
-  if (!event.bookmark.activity.current_feed && event.bookmark.activity.feeds.length === 1 && currentActivity.current_feed) {
-    event.bookmark.activity.current_feed = currentActivity.current_feed;
-  }
   return {
-    ...event.bookmark.activity,
-    own_bookmarks: newOwnBookmarks,
-    own_reactions: currentActivity.own_reactions
+    ...currentActivity,
+    bookmark_count: event.bookmark.activity.bookmark_count,
+    own_bookmarks: newOwnBookmarks
   };
 };
 const addBookmarkToActivities = (event, activities, eventBelongsToCurrentUser) => updateEntityInArray({
@@ -5373,13 +5370,10 @@ const sharedUpdateActivity$5 = ({
       (bookmark) => !isSameBookmark(bookmark, event.bookmark)
     );
   }
-  if (!event.bookmark.activity.current_feed && event.bookmark.activity.feeds.length === 1 && currentActivity.current_feed) {
-    event.bookmark.activity.current_feed = currentActivity.current_feed;
-  }
   return {
-    ...event.bookmark.activity,
-    own_bookmarks: newOwnBookmarks,
-    own_reactions: currentActivity.own_reactions
+    ...currentActivity,
+    bookmark_count: event.bookmark.activity.bookmark_count,
+    own_bookmarks: newOwnBookmarks
   };
 };
 const removeBookmarkFromActivities = (event, activities, eventBelongsToCurrentUser) => updateEntityInArray({
@@ -5451,9 +5445,9 @@ const sharedUpdateActivity$4 = ({
     }
   }
   return {
-    ...event.bookmark.activity,
-    own_bookmarks: newOwnBookmarks,
-    own_reactions: currentActivity.own_reactions
+    ...currentActivity,
+    bookmark_count: event.bookmark.activity.bookmark_count,
+    own_bookmarks: newOwnBookmarks
   };
 };
 const updateBookmarkInActivities = (event, activities, eventBelongsToCurrentUser) => updateEntityInArray({
@@ -5532,6 +5526,7 @@ function addActivitiesToState(newActivities, activities, position) {
       ...activities,
       ...position === "end" ? newActivitiesDeduplicated : []
     ];
+    this.newActivitiesAdded(newActivitiesDeduplicated);
     result = { changed: true, activities: updatedActivities };
   }
   return result;
@@ -5611,9 +5606,6 @@ const updateActivity = ({
   currentActivity,
   newActivtiy
 }) => {
-  if (!newActivtiy.current_feed && newActivtiy.feeds.length === 1 && currentActivity.current_feed) {
-    newActivtiy.current_feed = currentActivity.current_feed;
-  }
   return {
     ...newActivtiy,
     own_reactions: currentActivity.own_reactions,
@@ -5663,12 +5655,6 @@ function handleActivityUpdated(payload, fromWs) {
     activities: currentActivities,
     pinned_activities: currentPinnedActivities
   } = this.currentState;
-  const currentActivity = currentActivities?.find(
-    (a) => a.id === payload.activity.id
-  );
-  if (!payload.activity.current_feed && payload.activity.feeds.length === 1 && currentActivity?.current_feed) {
-    payload.activity.current_feed = currentActivity.current_feed;
-  }
   const [result1, result2] = [
     this.hasActivity(payload.activity.id) ? updateActivityInState(payload, currentActivities) : void 0,
     updatePinnedActivityInState(payload, currentPinnedActivities)
@@ -6259,6 +6245,9 @@ const deepEqual = (x, y) => {
     return false;
   }
 };
+function getOrCreateActiveFeed(group, id, data, watch) {
+  return this.getOrCreateActiveFeed(group, id, data, watch);
+}
 const _Feed = class _Feed extends FeedApi {
   constructor(client, groupId, id, data, watch = false, addNewActivitiesTo = "start", activityAddedEventFilter) {
     super(client, groupId, id);
@@ -6451,7 +6440,7 @@ const _Feed = class _Feed extends FeedApi {
           return nextState;
         });
       }
-      this.client.hydratePollCache(response.activities);
+      this.newActivitiesAdded(response.activities);
       return response;
     } finally {
       this.state.partialNext({
@@ -6832,6 +6821,19 @@ const _Feed = class _Feed extends FeedApi {
   handleWSEvent(event) {
     const eventHandler = this.eventHandlers[event.type];
     if (eventHandler !== _Feed.noop) {
+      if ("activity" in event && this.hasActivity(event.activity.id)) {
+        const currentActivity = this.currentState.activities?.find(
+          (a) => a.id === event.activity.id
+        );
+        if (event.activity.feeds.length > 1 && !event.activity.current_feed && currentActivity?.current_feed) {
+          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;
+        }
+      }
       eventHandler?.(event);
     }
     if (typeof eventHandler === "undefined") {
@@ -6839,6 +6841,18 @@ const _Feed = class _Feed extends FeedApi {
     }
     this.eventDispatcher.dispatch(event);
   }
+  newActivitiesAdded(activities) {
+    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
+        );
+      }
+    });
+  }
 };
 _Feed.noop = () => {
 };
@@ -7383,8 +7397,7 @@ class FeedsClient extends FeedsApi {
         id,
         void 0,
         void 0,
-        options2?.addNewActivitiesTo,
-        options2?.activityAddedEventFilter
+        options2
       );
     };
     this.activityWithStateUpdates = (id) => {
@@ -7402,20 +7415,30 @@ class FeedsClient extends FeedsApi {
       };
       this.eventDispatcher.dispatch(networkEvent);
     };
-    this.getOrCreateActiveFeed = (group, id, data, watch, addNewActivitiesTo, activityAddedEventFilter) => {
+    this.getOrCreateActiveFeed = (group, id, data, watch, options2) => {
       const fid = `${group}:${id}`;
+      let isCreated = false;
       if (!this.activeFeeds[fid]) {
+        isCreated = true;
         this.activeFeeds[fid] = new Feed(
           this,
           group,
           id,
           data,
           watch,
-          addNewActivitiesTo,
-          activityAddedEventFilter
+          options2?.addNewActivitiesTo,
+          options2?.activityAddedEventFilter
         );
       }
       const feed = this.activeFeeds[fid];
+      if (!isCreated && options2) {
+        if (options2?.addNewActivitiesTo) {
+          feed.addNewActivitiesTo = options2.addNewActivitiesTo;
+        }
+        if (options2?.activityAddedEventFilter) {
+          feed.activityAddedEventFilter = options2.activityAddedEventFilter;
+        }
+      }
       if (!feed.currentState.watch) {
         if (data) handleFeedUpdated.call(feed, { feed: data });
         if (watch) handleWatchStarted.call(feed);
@@ -7687,6 +7710,17 @@ class FeedsClient extends FeedsApi {
     }
     return response;
   }
+  async getFollowSuggestions(...params) {
+    const response = await super.getFollowSuggestions(...params);
+    response.suggestions.forEach((suggestion) => {
+      this.getOrCreateActiveFeed(
+        suggestion.group_id,
+        suggestion.id,
+        suggestion
+      );
+    });
+    return response;
+  }
   findAllActiveFeedsByActivityId(activityId) {
     return [
       ...Object.values(this.activeFeeds),
@@ -7766,4 +7800,4 @@ exports.replaceUniqueArrayMerge = replaceUniqueArrayMerge;
 exports.shouldUpdateState = shouldUpdateState;
 exports.uniqueArrayMerge = uniqueArrayMerge;
 exports.updateEntityInArray = updateEntityInArray;
-//# sourceMappingURL=feeds-client-BGF3utPy.js.map
+//# sourceMappingURL=feeds-client-BwOGqhU9.js.map