@stream-io/feeds-client 0.3.51 → 1.0.0

package/dist/{feeds-client-B4zeBggL.js → feeds-client-tw63OGrd.js}

@@ -2,6 +2,7 @@
 const stateStore = require("@stream-io/state-store");
 const loggerInternal = require("@stream-io/logger");
 const axiosImport = require("axios");
+const filter = require("@stream-io/filter");
 function _interopNamespaceDefault(e) {
   const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });
   if (e) {
@@ -4128,7 +4129,7 @@ const getRateLimitFromResponseHeader = (response_headers) => {
   };
   return result;
 };
-const version = "0.3.51";
+const version = "1.0.0";
 const axios = axiosImport.default ?? axiosImport;
 class ApiClient {
   constructor(apiKey, tokenManager, connectionIdManager, options) {
@@ -5063,7 +5064,7 @@ function updateEntityInArray({
   updatedEntities[index] = newEntity;
   return { changed: true, entities: updatedEntities };
 }
-const updateStateFollowCreated = (follow, currentState, currentFeedId, connectedUserId) => {
+const updateStateFollowCreated = (follow, currentState, currentFeedId, connectedUserId, hasOwnFields = false) => {
   if (follow.status !== "accepted") {
     return { changed: false, data: currentState };
   }
@@ -5072,7 +5073,12 @@ const updateStateFollowCreated = (follow, currentState, currentFeedId, connected
     newState = {
       ...newState,
       // Update FeedResponse fields, that has the new follower/following count
-      ...follow.source_feed
+      ...follow.source_feed,
+      ...hasOwnFields ? {
+        own_capabilities: follow.source_feed.own_capabilities,
+        own_follows: follow.source_feed.own_follows,
+        own_followings: follow.source_feed.own_followings
+      } : {}
     };
     if (currentState.following !== void 0) {
       newState.following = [follow, ...currentState.following];
@@ -5085,9 +5091,14 @@ const updateStateFollowCreated = (follow, currentState, currentFeedId, connected
     newState = {
       ...newState,
       // Update FeedResponse fields, that has the new follower/following count
-      ...follow.target_feed
-    };
-    if (source.created_by.id === connectedUserId) {
+      ...follow.target_feed,
+      ...hasOwnFields ? {
+        own_capabilities: follow.target_feed.own_capabilities,
+        own_follows: follow.target_feed.own_follows,
+        own_followings: follow.target_feed.own_followings
+      } : {}
+    };
+    if (source.created_by.id === connectedUserId && !hasOwnFields) {
       newState.own_follows = currentState.own_follows ? currentState.own_follows.concat(follow) : [follow];
     }
     if (currentState.followers !== void 0) {
@@ -5096,7 +5107,7 @@ const updateStateFollowCreated = (follow, currentState, currentFeedId, connected
   }
   return { changed: true, data: newState };
 };
-function handleFollowCreated(eventOrResponse, fromWs) {
+function handleFollowCreated(eventOrResponse, fromWs, hasOwnFields = false) {
   const follow = eventOrResponse.follow;
   if (!shouldUpdateState({
     stateUpdateQueueId: getStateUpdateQueueId(follow, "follow-created"),
@@ -5112,7 +5123,8 @@ function handleFollowCreated(eventOrResponse, fromWs) {
     follow,
     this.currentState,
     this.feed,
-    connectedUser?.id
+    connectedUser?.id,
+    hasOwnFields
   );
   if (result.changed) {
     this.state.next(result.data);
@@ -5336,14 +5348,14 @@ function handleCommentUpdated(payload, fromWs) {
   const { comment } = payload;
   const entityId = comment.parent_id ?? comment.object_id;
   if (!shouldUpdateState({
-    stateUpdateQueueId: getStateUpdateQueueId(
-      payload,
-      "comment-updated"
-    ),
+    stateUpdateQueueId: getStateUpdateQueueId(payload, "comment-updated"),
     stateUpdateQueue: this.stateUpdateQueue,
     watch: this.currentState.watch,
     fromWs,
-    isTriggeredByConnectedUser: eventTriggeredByConnectedUser.call(this, payload)
+    isTriggeredByConnectedUser: eventTriggeredByConnectedUser.call(
+      this,
+      payload
+    )
   })) {
     return;
   }
@@ -5353,7 +5365,10 @@ function handleCommentUpdated(payload, fromWs) {
     const index = this.getCommentIndex(comment, currentState);
     if (index === -1) return currentState;
     const newComments = [...entityState.comments];
-    newComments[index] = comment;
+    newComments[index] = {
+      ...comment,
+      own_reactions: entityState.comments[index].own_reactions
+    };
     return {
       ...currentState,
       comments_by_entity_id: {
@@ -5782,7 +5797,13 @@ function handleBookmarkUpdated(event) {
     });
   }
 }
-function addActivitiesToState(newActivities, activities, position, { fromWebSocket } = { fromWebSocket: false }) {
+function addActivitiesToState(newActivities, activities, position, {
+  hasOwnFields,
+  backfillOwnFields
+} = {
+  hasOwnFields: true,
+  backfillOwnFields: true
+}) {
   if (activities === void 0) {
     return {
       changed: false,
@@ -5805,23 +5826,31 @@ function addActivitiesToState(newActivities, activities, position, { fromWebSock
       ...activities,
       ...position === "end" ? newActivitiesDeduplicated : []
     ];
-    this.newActivitiesAdded(newActivitiesDeduplicated, { fromWebSocket });
+    this.activitiesAddedOrUpdated(newActivitiesDeduplicated, {
+      hasOwnFields,
+      backfillOwnFields
+    });
     result = { changed: true, activities: updatedActivities };
   }
   return result;
 }
 function handleActivityAdded(event) {
-  if (this.activityAddedEventFilter) {
-    if (!this.activityAddedEventFilter(event)) {
-      return;
-    }
+  const currentUser = this.client.state.getLatestValue().connected_user;
+  const decision = this.resolveNewActivityDecision(
+    event.activity,
+    currentUser,
+    false
+  );
+  if (decision === "ignore") {
+    return;
   }
+  const position = decision === "add-to-end" ? "end" : "start";
   const currentActivities = this.currentState.activities;
   const result = addActivitiesToState.bind(this)(
     [event.activity],
     currentActivities,
-    this.currentState.addNewActivitiesTo,
-    { fromWebSocket: true }
+    position,
+    { hasOwnFields: false, backfillOwnFields: true }
   );
   if (result.changed) {
     const activity = event.activity;
@@ -5938,7 +5967,10 @@ function handleActivityUpdated(payload, fromWs) {
     updatePinnedActivityInState(payload, currentPinnedActivities)
   ];
   if (result1?.changed || result2.changed) {
-    this.client.hydratePollCache([payload.activity]);
+    this.activitiesAddedOrUpdated([payload.activity], {
+      hasOwnFields: payload.activity.current_feed?.own_capabilities !== void 0,
+      backfillOwnFields: false
+    });
     this.state.partialNext({
       activities: result1?.changed ? result1.entities : currentActivities,
       pinned_activities: result2.entities
@@ -6450,6 +6482,30 @@ function handleWatchStarted() {
 function handleWatchStopped() {
   this.state.partialNext({ watch: false });
 }
+const activityResolvers = [
+  {
+    matchesField: (field) => field === "activity_type",
+    resolve: (activity) => activity.type
+  },
+  {
+    matchesField: (field) => field === "within_bounds",
+    resolve: (activity) => activity.location
+  },
+  {
+    matchesField: () => true,
+    resolve: (item, path) => filter.resolveDotPathValue(item, path)
+  }
+];
+function activityFilter(activity, requestConfig) {
+  const filter$1 = requestConfig?.filter;
+  if (!filter$1 || typeof filter$1 !== "object") {
+    return true;
+  }
+  return filter.itemMatchesFilter(activity, filter$1, {
+    resolvers: [...activityResolvers],
+    arrayEqMode: "contains"
+  });
+}
 const DEFAULT_MAX_RETRIES = 3;
 function isRetryableError(error) {
   if (error instanceof StreamApiError) {
@@ -6641,9 +6697,9 @@ function clearQueuedFeeds() {
   queuedFeeds.clear();
 }
 const _Feed = class _Feed extends FeedApi {
-  constructor(client, groupId, id, data, watch = false, addNewActivitiesTo = "start", activityAddedEventFilter) {
+  constructor(client, groupId, id, data, watch = false, onNewActivity) {
     super(client, groupId, id);
-    this.activityAddedEventFilter = activityAddedEventFilter;
+    this.onNewActivity = onNewActivity;
     this.indexedActivityIds = /* @__PURE__ */ new Set();
     this.stateUpdateQueue = /* @__PURE__ */ new Set();
     this.eventHandlers = {
@@ -6713,8 +6769,7 @@ const _Feed = class _Feed extends FeedApi {
       is_loading: false,
       is_loading_activities: false,
       comments_by_entity_id: {},
-      watch,
-      addNewActivitiesTo
+      watch
     });
     this.client = client;
     this.state.subscribeWithSelector(
@@ -6735,9 +6790,6 @@ const _Feed = class _Feed extends FeedApi {
   get currentState() {
     return this.state.getLatestValue();
   }
-  set addNewActivitiesTo(value) {
-    this.state.partialNext({ addNewActivitiesTo: value });
-  }
   hasActivity(activityId) {
     return this.indexedActivityIds.has(activityId);
   }
@@ -6746,6 +6798,24 @@ const _Feed = class _Feed extends FeedApi {
       (pinnedActivity) => pinnedActivity.activity.id === activityId
     );
   }
+  /**
+   * Resolves how to handle a new activity (WS or HTTP): ignore, add-to-start, or add-to-end.
+   * Uses onNewActivity if set; else default (current user + filter match) adds to start.
+   */
+  resolveNewActivityDecision(activity, currentUser, _fromHttp) {
+    if (this.onNewActivity) {
+      return this.onNewActivity({ activity, currentUser });
+    }
+    if (!currentUser) return "ignore";
+    if (activity.user?.id !== currentUser.id) return "ignore";
+    if (!activityFilter(
+      activity,
+      this.currentState.last_get_or_create_request_config
+    )) {
+      return "ignore";
+    }
+    return "add-to-start";
+  }
   async synchronize() {
     const { last_get_or_create_request_config } = this.state.getLatestValue();
     if (last_get_or_create_request_config?.watch) {
@@ -6783,7 +6853,8 @@ const _Feed = class _Feed extends FeedApi {
         const result = addActivitiesToState.bind(this)(
           response.activities,
           currentActivities,
-          "end"
+          "end",
+          { hasOwnFields: true, backfillOwnFields: false }
         );
         const aggregatedActivitiesResult = addAggregatedActivitiesToState(
           response.aggregated_activities,
@@ -6832,7 +6903,7 @@ const _Feed = class _Feed extends FeedApi {
           return nextState;
         });
       }
-      this.newActivitiesAdded(response.activities);
+      this.activitiesAddedOrUpdated(response.activities);
       return response;
     } finally {
       this.state.partialNext({
@@ -7140,11 +7211,11 @@ const _Feed = class _Feed extends FeedApi {
    * _Note: Useful only for feeds with `groupId` of `user` value._
    */
   async queryFollowers(request) {
-    const filter = {
+    const filter2 = {
       target_feed: this.feed
     };
     const response = await this.client.queryFollows({
-      filter,
+      filter: filter2,
       ...request
     });
     return response;
@@ -7155,11 +7226,11 @@ const _Feed = class _Feed extends FeedApi {
    * _Note: Useful only for feeds with `groupId` of `timeline` value._
    */
   async queryFollowing(request) {
-    const filter = {
+    const filter2 = {
       source_feed: this.feed
     };
     const response = await this.client.queryFollows({
-      filter,
+      filter: filter2,
       ...request
     });
     return response;
@@ -7207,11 +7278,41 @@ const _Feed = class _Feed extends FeedApi {
       next: currentState.next
     });
   }
+  /**
+   * Applies a new activity to this feed's state (decision + add to activities).
+   * Used when the activity was added via this feed's addActivity or via client.addActivity.
+   */
+  addActivityFromHTTPResponse(activity) {
+    const currentUser = this.client.state.getLatestValue().connected_user;
+    const decision = this.resolveNewActivityDecision(
+      activity,
+      currentUser,
+      true
+    );
+    if (decision !== "ignore") {
+      const position = decision === "add-to-end" ? "end" : "start";
+      const currentActivities = this.currentState.activities;
+      const result = addActivitiesToState.bind(this)(
+        [activity],
+        currentActivities,
+        position,
+        {
+          hasOwnFields: activity.current_feed?.own_capabilities !== void 0,
+          backfillOwnFields: false
+        }
+      );
+      if (result.changed) {
+        this.client.hydratePollCache([activity]);
+        this.state.partialNext({ activities: result.activities });
+      }
+    }
+  }
   async addActivity(request) {
     const response = await this.client.addActivity({
       ...request,
       feeds: [this.feed]
     });
+    this.addActivityFromHTTPResponse(response.activity);
     return response;
   }
   handleWSEvent(event) {
@@ -7232,7 +7333,7 @@ const _Feed = class _Feed extends FeedApi {
     }
     this.eventDispatcher.dispatch(event);
   }
-  newActivitiesAdded(activities, options = { fromWebSocket: false }) {
+  activitiesAddedOrUpdated(activities, options = { hasOwnFields: true, backfillOwnFields: true }) {
     this.client.hydratePollCache(activities);
     this.getOrCreateFeeds(activities, options);
   }
@@ -7250,7 +7351,7 @@ const _Feed = class _Feed extends FeedApi {
       });
       const newFeeds = Array.from(feedsToGetOrCreate.values());
       const fieldsToUpdate = [];
-      if (!options.fromWebSocket) {
+      if (options.hasOwnFields) {
         fieldsToUpdate.push("own_membership");
         if (!enrichmentOptions?.skip_own_capabilities) {
           fieldsToUpdate.push("own_capabilities");
@@ -7270,7 +7371,7 @@ const _Feed = class _Feed extends FeedApi {
           fieldsToUpdate
         });
       });
-      if (options.fromWebSocket) {
+      if (!options.hasOwnFields && options.backfillOwnFields) {
         const uninitializedFeeds = newFeeds.filter((feedResponse) => {
           const feed = this.client.feed(feedResponse.group_id, feedResponse.id);
           return feed.currentState.own_capabilities === void 0;
@@ -7293,6 +7394,9 @@ const _Feed = class _Feed extends FeedApi {
 _Feed.noop = () => {
 };
 let Feed = _Feed;
+function applyNewActivityToActiveFeeds(activity) {
+  return this.addActivityFromHTTPResponse(activity);
+}
 function handleUserUpdated(event) {
   this.state.next((currentState) => {
     let newState;
@@ -7372,7 +7476,9 @@ function disconnectActivityFromFeed(activity) {
   }
 }
 class ActivityWithStateUpdates {
-  constructor(id, feedsClient, { fromResponse } = { fromResponse: void 0 }) {
+  constructor(id, feedsClient, { fromResponse } = {
+    fromResponse: void 0
+  }) {
     this.id = id;
     this.feedsClient = feedsClient;
     this.state = new stateStore.StateStore({
@@ -7423,7 +7529,7 @@ class ActivityWithStateUpdates {
       initialState: activityResponse
     });
     if (this.feed) {
-      this.feed.activityAddedEventFilter = () => false;
+      this.feed.onNewActivity = () => "ignore";
     }
     if (comments) {
       await this.loadNextPageActivityComments(comments);
@@ -7476,7 +7582,11 @@ class ActivityWithStateUpdates {
     const { activities } = addActivitiesToState.bind(this.feed)(
       [initialState],
       [],
-      "start"
+      "start",
+      {
+        hasOwnFields: initialState.current_feed?.own_capabilities !== void 0,
+        backfillOwnFields: false
+      }
     );
     this.feed?.state.partialNext({
       activities
@@ -7834,9 +7944,9 @@ class FeedsClient extends FeedsApi {
       return response;
     };
     this.queryPollAnswers = async (request) => {
-      const filter = request.filter ?? {};
+      const filter2 = request.filter ?? {};
       const queryPollAnswersFilter = {
-        ...filter,
+        ...filter2,
         is_answer: true
       };
       const queryPollAnswersRequest = {
@@ -7907,18 +8017,12 @@ class FeedsClient extends FeedsApi {
           id,
           data,
           watch,
-          options2?.addNewActivitiesTo,
-          options2?.activityAddedEventFilter
+          options2?.onNewActivity
         );
       }
       const feed = this.activeFeeds[fid];
-      if (!isCreated && options2) {
-        if (options2?.addNewActivitiesTo) {
-          feed.addNewActivitiesTo = options2.addNewActivitiesTo;
-        }
-        if (options2?.activityAddedEventFilter) {
-          feed.activityAddedEventFilter = options2.activityAddedEventFilter;
-        }
+      if (!isCreated && options2?.onNewActivity !== void 0) {
+        feed.onNewActivity = options2.onNewActivity;
       }
       if (!feed.currentState.watch) {
         if (!isCreated && data) {
@@ -8098,6 +8202,16 @@ class FeedsClient extends FeedsApi {
       });
     }
   }
+  async addActivity(request) {
+    const response = await super.addActivity(request);
+    request.feeds.forEach((fid) => {
+      const feed = this.activeFeeds[fid];
+      if (feed) {
+        applyNewActivityToActiveFeeds.call(feed, response.activity);
+      }
+    });
+    return response;
+  }
   async queryFeeds(request) {
     const response = await this._queryFeeds(request);
     const feedResponses = response.feeds;
@@ -8107,12 +8221,12 @@ class FeedsClient extends FeedsApi {
         id: feedResponse.id,
         data: feedResponse,
         watch: request?.watch,
-        fieldsToUpdate: [
+        fieldsToUpdate: request?.enrich_own_fields ? [
           "own_capabilities",
           "own_follows",
           "own_membership",
           "own_followings"
-        ]
+        ] : []
       })
     );
     return {
@@ -8147,7 +8261,7 @@ 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);
-    this.updateStateFromFollows([response.follow]);
+    this.updateStateFromFollows([response.follow], !!request.enrich_own_fields);
     return response;
   }
   /**
@@ -8157,12 +8271,12 @@ class FeedsClient extends FeedsApi {
    */
   async followBatch(request) {
     const response = await super.followBatch(request);
-    this.updateStateFromFollows(response.follows);
+    this.updateStateFromFollows(response.follows, !!request.enrich_own_fields);
     return response;
   }
   async getOrCreateFollows(request) {
     const response = await super.getOrCreateFollows(request);
-    this.updateStateFromFollows(response.created);
+    this.updateStateFromFollows(response.created, !!request.enrich_own_fields);
     return response;
   }
   async unfollow(request) {
@@ -8253,13 +8367,15 @@ class FeedsClient extends FeedsApi {
       }).map((a) => getFeed.call(a))
     ];
   }
-  updateStateFromFollows(follows) {
+  updateStateFromFollows(follows, hasOwnFields) {
     follows.forEach((follow) => {
       const feeds = [
         ...this.findAllActiveFeedsByFid(follow.source_feed.feed),
         ...this.findAllActiveFeedsByFid(follow.target_feed.feed)
       ];
-      feeds.forEach((f) => handleFollowCreated.bind(f)({ follow }, false));
+      feeds.forEach(
+        (f) => handleFollowCreated.bind(f)({ follow }, false, hasOwnFields)
+      );
     });
   }
   updateStateFromUnfollows(follows) {
@@ -8290,6 +8406,7 @@ exports.Feed = Feed;
 exports.FeedsClient = FeedsClient;
 exports.StreamApiError = StreamApiError;
 exports.StreamPoll = StreamPoll;
+exports.activityFilter = activityFilter;
 exports.checkHasAnotherPage = checkHasAnotherPage;
 exports.debounce = debounce;
 exports.ensureExhausted = ensureExhausted;
@@ -8305,4 +8422,4 @@ exports.replaceUniqueArrayMerge = replaceUniqueArrayMerge;
 exports.shouldUpdateState = shouldUpdateState;
 exports.uniqueArrayMerge = uniqueArrayMerge;
 exports.updateEntityInArray = updateEntityInArray;
-//# sourceMappingURL=feeds-client-B4zeBggL.js.map
+//# sourceMappingURL=feeds-client-tw63OGrd.js.map