@stream-io/feeds-client 1.1.0 → 1.3.0

package/src/feeds-client/feeds-client.ts

@@ -865,6 +865,7 @@ export class FeedsClient extends FeedsApi {
         typeof handleFeedUpdated
       >[0]);
     }
+    this.checkIfOwnFieldsChanged(response.feed, !!args[0].enrich_own_fields);
     return response;
   };
 
@@ -1094,6 +1095,14 @@ export class FeedsClient extends FeedsApi {
       feeds.forEach((f) => handleFollowUpdated.bind(f)(response, false));
     });
 
+    this.checkIfOwnFieldsChanged(
+      response.follow.source_feed,
+      !!request.enrich_own_fields,
+    );
+    this.checkIfOwnFieldsChanged(
+      response.follow.target_feed,
+      !!request.enrich_own_fields,
+    );
     return response;
   }
 
@@ -1115,7 +1124,14 @@ export class FeedsClient extends FeedsApi {
   async follow(request: FollowRequest) {
     const response = await super.follow(request);
     this.updateStateFromFollows([response.follow], !!request.enrich_own_fields);
-
+    this.checkIfOwnFieldsChanged(
+      response.follow.source_feed,
+      !!request.enrich_own_fields,
+    );
+    this.checkIfOwnFieldsChanged(
+      response.follow.target_feed,
+      !!request.enrich_own_fields,
+    );
     return response;
   }
 
@@ -1127,7 +1143,11 @@ export class FeedsClient extends FeedsApi {
   async followBatch(request: FollowBatchRequest) {
     const response = await super.followBatch(request);
     this.updateStateFromFollows(response.follows, !!request.enrich_own_fields);
-
+    const enrichOwnFields = !!request.enrich_own_fields;
+    for (const follow of response.follows) {
+      this.checkIfOwnFieldsChanged(follow.source_feed, enrichOwnFields);
+      this.checkIfOwnFieldsChanged(follow.target_feed, enrichOwnFields);
+    }
     return response;
   }
 
@@ -1135,7 +1155,12 @@ export class FeedsClient extends FeedsApi {
     const response = await super.getOrCreateFollows(request);
 
     this.updateStateFromFollows(response.created, !!request.enrich_own_fields);
-
+    const enrichOwnFields = !!request.enrich_own_fields;
+    const allFollows = [...response.created, ...response.follows];
+    for (const follow of allFollows) {
+      this.checkIfOwnFieldsChanged(follow.source_feed, enrichOwnFields);
+      this.checkIfOwnFieldsChanged(follow.target_feed, enrichOwnFields);
+    }
     return response;
   }
 
@@ -1146,14 +1171,25 @@ export class FeedsClient extends FeedsApi {
   }) {
     const response = await super.unfollow(request);
     this.updateStateFromUnfollows([response.follow]);
-
+    this.checkIfOwnFieldsChanged(
+      response.follow.source_feed,
+      !!request.enrich_own_fields,
+    );
+    this.checkIfOwnFieldsChanged(
+      response.follow.target_feed,
+      !!request.enrich_own_fields,
+    );
     return response;
   }
 
   async getOrCreateUnfollows(request: UnfollowBatchRequest) {
     const response = await super.getOrCreateUnfollows(request);
     this.updateStateFromUnfollows(response.follows);
-
+    const enrichOwnFields = !!request.enrich_own_fields;
+    for (const follow of response.follows) {
+      this.checkIfOwnFieldsChanged(follow.source_feed, enrichOwnFields);
+      this.checkIfOwnFieldsChanged(follow.target_feed, enrichOwnFields);
+    }
     return response;
   }
 
@@ -1253,6 +1289,7 @@ export class FeedsClient extends FeedsApi {
       feed.onNewActivity = options.onNewActivity;
     }
 
+    let wasFullUpdate = isCreated;
     if (!feed.currentState.watch) {
       if (!isCreated && data) {
         if (
@@ -1260,54 +1297,76 @@ export class FeedsClient extends FeedsApi {
           data.updated_at.getTime()
         ) {
           handleFeedUpdated.call(feed, { feed: data });
-        } else if (
-          (feed.currentState.updated_at?.getTime() ?? 0) ===
-          data.updated_at.getTime()
-        ) {
-          const fieldsToUpdateData: Array<keyof FeedResponse> = [];
-          const fieldChecks: Array<
-            [
-              (
-                | 'own_capabilities'
-                | 'own_follows'
-                | 'own_membership'
-                | 'own_followings'
-              ),
-              (currentState: FeedState, newState: FeedResponse) => boolean,
-            ]
-          > = [
-            ['own_capabilities', isOwnCapabilitiesEqual],
-            ['own_follows', isOwnFollowsEqual],
-            ['own_membership', isOwnMembershipEqual],
-            ['own_followings', isOwnFollowingsEqual],
-          ];
-          fieldChecks.forEach(([field, isEqual]) => {
-            if (
-              fieldsToUpdate.includes(field) &&
-              !isEqual(feed.currentState, data)
-            ) {
-              fieldsToUpdateData.push(field);
-            }
-          });
-          if (fieldsToUpdateData.length > 0) {
-            const fieldsToUpdatePayload = fieldsToUpdateData.reduce(
-              (acc: Partial<FeedResponse>, field) => {
-                // @ts-expect-error TODO: fix this
-                acc[field] = data[field];
-                return acc;
-              },
-              {},
-            );
-            feed.state.partialNext(fieldsToUpdatePayload);
-          }
+          wasFullUpdate = true;
         }
       }
       if (watch) handleWatchStarted.call(feed);
     }
 
+    // If we didn't do a full update, check if own_* fields have changed
+    if (!wasFullUpdate && data && fieldsToUpdate.length > 0) {
+      const fieldsToUpdateData: Array<keyof FeedResponse> = [];
+      const fieldChecks: Array<
+        [
+          (
+            | 'own_capabilities'
+            | 'own_follows'
+            | 'own_membership'
+            | 'own_followings'
+          ),
+          (currentState: FeedState, newState: FeedResponse) => boolean,
+        ]
+      > = [
+        ['own_capabilities', isOwnCapabilitiesEqual],
+        ['own_follows', isOwnFollowsEqual],
+        ['own_membership', isOwnMembershipEqual],
+        ['own_followings', isOwnFollowingsEqual],
+      ];
+      fieldChecks.forEach(([field, isEqual]) => {
+        if (
+          fieldsToUpdate.includes(field) &&
+          !isEqual(feed.currentState, data)
+        ) {
+          fieldsToUpdateData.push(field);
+        }
+      });
+      if (fieldsToUpdateData.length > 0) {
+        const fieldsToUpdatePayload = fieldsToUpdateData.reduce(
+          (acc: Partial<FeedResponse>, field) => {
+            // @ts-expect-error TODO: fix this
+            acc[field] = data[field];
+            return acc;
+          },
+          {},
+        );
+        feed.state.partialNext(fieldsToUpdatePayload);
+      }
+    }
+
     return feed;
   };
 
+  // Used when updating from HTTP responses to check if own_* fields have changed
+  // It'll do a state update if WS update ran before HTTP, but WS doesn't have own_* fields
+  private checkIfOwnFieldsChanged(
+    feed: FeedResponse,
+    enrichOwnFields: boolean,
+  ) {
+    if (!enrichOwnFields || !this.activeFeeds[feed.feed]) return false;
+
+    this.getOrCreateActiveFeed({
+      group: feed.group_id,
+      id: feed.id,
+      data: feed,
+      fieldsToUpdate: [
+        'own_capabilities',
+        'own_follows',
+        'own_membership',
+        'own_followings',
+      ],
+    });
+  }
+
   private findAllActiveFeedsByActivityId(activityId: string) {
     return [
       ...Object.values(this.activeFeeds),

package/src/gen/feeds/FeedsApi.ts

@@ -113,6 +113,8 @@ import type {
   Response,
   RestoreActivityRequest,
   RestoreActivityResponse,
+  RestoreCommentRequest,
+  RestoreCommentResponse,
   SearchUserGroupsResponse,
   SharedLocationResponse,
   SharedLocationsResponse,
@@ -1379,6 +1381,30 @@ export class FeedsApi {
     return { ...response.body, metadata: response.metadata };
   }
 
+  async restoreComment(
+    request: RestoreCommentRequest & { id: string },
+  ): Promise<StreamResponse<RestoreCommentResponse>> {
+    const pathParams = {
+      id: request?.id,
+    };
+    const body = {};
+
+    const response = await this.apiClient.sendRequest<
+      StreamResponse<RestoreCommentResponse>
+    >(
+      'POST',
+      '/api/v2/feeds/comments/{id}/restore',
+      pathParams,
+      undefined,
+      body,
+      'application/json',
+    );
+
+    decoders.RestoreCommentResponse?.(response.body);
+
+    return { ...response.body, metadata: response.metadata };
+  }
+
   async deleteFeed(request: {
     feed_group_id: string;
     feed_id: string;

package/src/gen/model-decoders/decoders.ts

@@ -685,6 +685,17 @@ decoders.CommentResponse = (input?: Record<string, any>) => {
   return decode(typeMappings, input);
 };
 
+decoders.CommentRestoredEvent = (input?: Record<string, any>) => {
+  const typeMappings: TypeMapping = {
+    created_at: { type: 'DatetimeType', isSingle: true },
+
+    comment: { type: 'CommentResponse', isSingle: true },
+
+    received_at: { type: 'DatetimeType', isSingle: true },
+  };
+  return decode(typeMappings, input);
+};
+
 decoders.CommentUpdatedEvent = (input?: Record<string, any>) => {
   const typeMappings: TypeMapping = {
     created_at: { type: 'DatetimeType', isSingle: true },
@@ -1707,6 +1718,15 @@ decoders.RestoreActivityResponse = (input?: Record<string, any>) => {
   return decode(typeMappings, input);
 };
 
+decoders.RestoreCommentResponse = (input?: Record<string, any>) => {
+  const typeMappings: TypeMapping = {
+    activity: { type: 'ActivityResponse', isSingle: true },
+
+    comment: { type: 'CommentResponse', isSingle: true },
+  };
+  return decode(typeMappings, input);
+};
+
 decoders.ReviewQueueItemResponse = (input?: Record<string, any>) => {
   const typeMappings: TypeMapping = {
     created_at: { type: 'DatetimeType', isSingle: true },

package/src/gen/model-decoders/event-decoder-mapping.ts

@@ -73,6 +73,9 @@ const eventDecoderMapping: Record<
   'feeds.comment.reaction.updated': (data: Record<string, any>) =>
     decoders.CommentReactionUpdatedEvent(data),
 
+  'feeds.comment.restored': (data: Record<string, any>) =>
+    decoders.CommentRestoredEvent(data),
+
   'feeds.comment.updated': (data: Record<string, any>) =>
     decoders.CommentUpdatedEvent(data),
 

package/src/gen/models/index.ts

@@ -8,6 +8,16 @@ export interface AIImageConfig {
   async?: boolean;
 }
 
+export interface AIImageLabelDefinition {
+  description: string;
+
+  group: string;
+
+  key: string;
+
+  label: string;
+}
+
 export interface AITextConfig {
   enabled: boolean;
 
@@ -59,7 +69,7 @@ export interface AWSRekognitionRule {
 
   min_confidence: number;
 
-  subclassifications?: Record<string, boolean>;
+  subclassifications?: Record<string, any>;
 }
 
 export interface AcceptFeedMemberInviteRequest {}
@@ -1508,6 +1518,8 @@ export interface ChannelConfigWithInfo {
 
   automod_thresholds?: Thresholds;
 
+  chat_preferences?: ChatPreferences;
+
   grants?: Record<string, string[]>;
 }
 
@@ -1612,6 +1624,8 @@ export interface ChannelPushPreferencesResponse {
   chat_level?: string;
 
   disabled_until?: Date;
+
+  chat_preferences?: ChatPreferencesResponse;
 }
 
 export interface ChannelResponse {
@@ -1672,6 +1686,56 @@ export interface ChannelResponse {
   truncated_by?: UserResponse;
 }
 
+export interface ChatPreferences {
+  channel_mentions?: string;
+
+  default_preference?: string;
+
+  direct_mentions?: string;
+
+  distinct_channel_messages?: string;
+
+  group_mentions?: string;
+
+  here_mentions?: string;
+
+  role_mentions?: string;
+
+  thread_replies?: string;
+}
+
+export interface ChatPreferencesInput {
+  channel_mentions?: 'all' | 'none';
+
+  default_preference?: 'all' | 'none';
+
+  direct_mentions?: 'all' | 'none';
+
+  group_mentions?: 'all' | 'none';
+
+  here_mentions?: 'all' | 'none';
+
+  role_mentions?: 'all' | 'none';
+
+  thread_replies?: 'all' | 'none';
+}
+
+export interface ChatPreferencesResponse {
+  channel_mentions?: string;
+
+  default_preference?: string;
+
+  direct_mentions?: string;
+
+  group_mentions?: string;
+
+  here_mentions?: string;
+
+  role_mentions?: string;
+
+  thread_replies?: string;
+}
+
 export interface ClosedCaptionRuleParameters {
   threshold?: number;
 
@@ -1868,6 +1932,24 @@ export interface CommentResponse {
   reaction_groups?: Record<string, FeedsReactionGroupResponse>;
 }
 
+export interface CommentRestoredEvent {
+  created_at: Date;
+
+  fid: string;
+
+  comment: CommentResponse;
+
+  custom: Record<string, any>;
+
+  type: string;
+
+  feed_visibility?: string;
+
+  received_at?: Date;
+
+  user?: UserResponseCommonFields;
+}
+
 export interface CommentUpdatedEvent {
   created_at: Date;
 
@@ -1903,6 +1985,8 @@ export interface ConfigResponse {
 
   supported_video_call_harm_types: string[];
 
+  ai_image_label_definitions?: AIImageLabelDefinition[];
+
   ai_image_config?: AIImageConfig;
 
   ai_image_subclassifications?: Record<string, string[]>;
@@ -2953,6 +3037,8 @@ export interface FilterConfigResponse {
   llm_labels: string[];
 
   ai_text_labels?: string[];
+
+  config_keys?: string[];
 }
 
 export interface FlagCountRuleParameters {
@@ -4349,6 +4435,8 @@ export interface PushPreferenceInput {
 
   user_id?: string;
 
+  chat_preferences?: ChatPreferencesInput;
+
   feeds_preferences?: FeedsPreferences;
 }
 
@@ -4361,6 +4449,8 @@ export interface PushPreferencesResponse {
 
   feeds_level?: string;
 
+  chat_preferences?: ChatPreferencesResponse;
+
   feeds_preferences?: FeedsPreferencesResponse;
 }
 
@@ -4944,6 +5034,16 @@ export interface RestoreActivityResponse {
   activity: ActivityResponse;
 }
 
+export interface RestoreCommentRequest {}
+
+export interface RestoreCommentResponse {
+  duration: string;
+
+  activity: ActivityResponse;
+
+  comment: CommentResponse;
+}
+
 export interface ReviewQueueItemResponse {
   ai_text_severity: string;
 
@@ -5021,6 +5121,8 @@ export interface RingSettingsResponse {
 }
 
 export interface RuleBuilderAction {
+  skip_inbox?: boolean;
+
   type?:
     | 'ban_user'
     | 'flag_user'
@@ -6389,6 +6491,7 @@ export type WSClientEvent =
   | ({ type: 'feeds.comment.reaction.added' } & CommentReactionAddedEvent)
   | ({ type: 'feeds.comment.reaction.deleted' } & CommentReactionDeletedEvent)
   | ({ type: 'feeds.comment.reaction.updated' } & CommentReactionUpdatedEvent)
+  | ({ type: 'feeds.comment.restored' } & CommentRestoredEvent)
   | ({ type: 'feeds.comment.updated' } & CommentUpdatedEvent)
   | ({ type: 'feeds.feed.created' } & FeedCreatedEvent)
   | ({ type: 'feeds.feed.deleted' } & FeedDeletedEvent)
@@ -6446,6 +6549,7 @@ export type WSEvent =
   | ({ type: 'feeds.comment.reaction.added' } & CommentReactionAddedEvent)
   | ({ type: 'feeds.comment.reaction.deleted' } & CommentReactionDeletedEvent)
   | ({ type: 'feeds.comment.reaction.updated' } & CommentReactionUpdatedEvent)
+  | ({ type: 'feeds.comment.restored' } & CommentRestoredEvent)
   | ({ type: 'feeds.comment.updated' } & CommentUpdatedEvent)
   | ({ type: 'feeds.feed.created' } & FeedCreatedEvent)
   | ({ type: 'feeds.feed.deleted' } & FeedDeletedEvent)