feat(llc): handle missing events (#71)

Author: xsahil03x

melos.yaml

@@ -48,7 +48,7 @@ command:
       shared_preferences: ^2.5.3
       state_notifier: ^1.0.0
       stream_feeds: ^0.5.0
-      stream_core: ^0.3.2
+      stream_core: ^0.3.3
       video_player: ^2.10.0
       uuid: ^4.5.1
 

packages/stream_feeds/CHANGELOG.md

@@ -1,3 +1,6 @@
+## Upcoming
+- Added missing state updates for the websocket events.
+
 ## 0.5.0
 - [BREAKING] Unified `ThreadedCommentData` into `CommentData` to handle both flat and threaded comments.
 - [BREAKING] Renamed `ActivitiesFilterField.type` to `ActivitiesFilterField.activityType`.

packages/stream_feeds/dart_test.yaml

@@ -1,11 +1,17 @@
 tags:
-  feed:
-  feed-list:
   activity:
+  activity-comment-list:
   activity-list:
-  bookmark-list:
+  activity-reaction-list:
   bookmark-folder-list:
+  bookmark-list:
   comment-list:
+  comment-reaction-list:
+  comment-reply-list:
+  feed:
+  feed-list:
   follow-list:
+  member-list:
+  moderation-config-list:
   poll-list:
   poll-vote-list:

packages/stream_feeds/lib/src/client/feeds_client_impl.dart

@@ -388,6 +388,7 @@ class StreamFeedsClientImpl implements StreamFeedsClient {
       query: query,
       commentsRepository: _commentsRepository,
       eventsEmitter: events,
+      currentUserId: user.id,
     );
   }
 
@@ -444,6 +445,7 @@ class StreamFeedsClientImpl implements StreamFeedsClient {
       query: query,
       pollsRepository: _pollsRepository,
       eventsEmitter: events,
+      currentUserId: user.id,
     );
   }
 

packages/stream_feeds/lib/src/models/activity_data.dart

@@ -341,6 +341,22 @@ extension ActivityDataMutations on ActivityData {
     );
   }
 
+  /// Conditionally updates this activity based on a filter.
+  ///
+  /// If [filter] returns true for this activity, applies the [update] function
+  /// to produce a new updated activity. Otherwise, returns this activity unchanged.
+  ///
+  /// This is useful for applying updates only when certain conditions are met.
+  ///
+  /// Returns a new [ActivityData] instance, either updated or unchanged.
+  ActivityData updateIf({
+    required bool Function(ActivityData) filter,
+    required ActivityData Function(ActivityData) update,
+  }) {
+    if (!filter(this)) return this;
+    return update(this);
+  }
+
   /// Adds or updates a comment in this activity.
   ///
   /// Updates the comments list by adding or updating [comment]. If the comment already
@@ -381,6 +397,75 @@ extension ActivityDataMutations on ActivityData {
     );
   }
 
+  /// Adds or updates a reaction in a comment within this activity with unique enforcement.
+  ///
+  /// Updates the own reactions list of the comment by adding or updating [reaction]. Only adds reactions
+  /// that belong to [currentUserId]. When unique enforcement is enabled, replaces any
+  /// existing reaction from the same user.
+  ///
+  /// Returns a new [ActivityData] instance with the updated comment reactions.
+  ActivityData upsertUniqueCommentReaction(
+    CommentData updatedComment,
+    FeedsReactionData reaction,
+    String currentUserId,
+  ) {
+    return upsertCommentReaction(
+      updatedComment,
+      reaction,
+      currentUserId,
+      enforceUnique: true,
+    );
+  }
+
+  /// Adds or updates a reaction in a comment within this activity.
+  ///
+  /// Updates the own reactions list of the comment by adding or updating [reaction]. Only adds reactions
+  /// that belong to [currentUserId]. When [enforceUnique] is true, replaces any existing
+  /// reaction from the same user; otherwise, allows multiple reactions from the same user.
+  ///
+  /// Returns a new [ActivityData] instance with the updated comment reactions.
+  ActivityData upsertCommentReaction(
+    CommentData updatedComment,
+    FeedsReactionData reaction,
+    String currentUserId, {
+    bool enforceUnique = false,
+  }) {
+    final updatedComments = comments.updateWhere(
+      (it) => it.id == updatedComment.id,
+      update: (it) => it.upsertReaction(
+        updatedComment,
+        reaction,
+        currentUserId,
+        enforceUnique: enforceUnique,
+      ),
+    );
+
+    return copyWith(comments: updatedComments);
+  }
+
+  /// Removes a reaction from a comment within this activity.
+  ///
+  /// Updates the own reactions list of the comment by removing [reaction]. Only removes reactions
+  /// that belong to [currentUserId].
+  ///
+  /// Returns a new [ActivityData] instance with the updated comment reactions.
+  ActivityData removeCommentReaction(
+    CommentData updatedComment,
+    FeedsReactionData reaction,
+    String currentUserId,
+  ) {
+    final updatedComments = comments.updateWhere(
+      (it) => it.id == updatedComment.id,
+      update: (it) => it.removeReaction(
+        updatedComment,
+        reaction,
+        currentUserId,
+      ),
+    );
+
+    return copyWith(comments: updatedComments);
+  }
+
   /// Adds or updates a bookmark in this activity.
   ///
   /// Updates the own bookmarks list by adding or updating [bookmark]. Only adds bookmarks

packages/stream_feeds/lib/src/models/mark_activity_data.dart

@@ -45,8 +45,8 @@ class MarkActivityData with _$MarkActivityData {
   final List<String>? markWatched;
 }
 
-extension MarkActivityDataHandler<R> on MarkActivityData {
-  R handle({
+extension MarkActivityDataHandler on MarkActivityData {
+  R handle<R>({
     R Function()? markAllRead,
     R Function()? markAllSeen,
     R Function(Set<String> read)? markRead,

packages/stream_feeds/lib/src/models/poll_data.dart

@@ -176,10 +176,10 @@ extension PollDataMutations on PollData {
   /// exists (by ID), it will be updated.
   ///
   /// Returns a new [PollData] instance with the updated options.
-  PollData addOption(PollOptionData option) {
+  PollData upsertOption(PollOptionData option) {
     final updatedOptions = options.upsert(
       option,
-      key: (it) => it.id == option.id,
+      key: (it) => it.id,
     );
 
     return copyWith(options: updatedOptions);
@@ -191,44 +191,97 @@ extension PollDataMutations on PollData {
   ///
   /// Returns a new [PollData] instance with the updated options.
   PollData removeOption(String optionId) {
-    final updatedOptions = options.where((it) => it.id != optionId).toList();
+    final updatedOptions = options.where((it) {
+      return it.id != optionId;
+    }).toList();
 
     return copyWith(options: updatedOptions);
   }
 
-  /// Updates an existing option in this poll.
+  /// Adds or updates a vote in this poll.
   ///
-  /// Updates the options list by replacing the option with the same ID as [option]
-  /// with the new [option] data.
+  /// Updates the own votes and answers list by adding or updating [vote]. Only adds votes
+  /// that belong to [currentUserId].
   ///
-  /// Returns a new [PollData] instance with the updated options.
-  PollData updateOption(PollOptionData option) {
-    final updatedOptions = options.map((it) {
-      if (it.id != option.id) return it;
-      return option;
-    }).toList();
+  /// Returns a new [PollData] instance with the updated own votes and answers.
+  PollData upsertVote(
+    PollData updatedPoll,
+    PollVoteData vote,
+    String currentUserId,
+  ) {
+    final updatedOwnVotesAndAnswers = ownVotesAndAnswers.let((it) {
+      if (vote.userId != currentUserId) return it;
+      return it.upsert(vote, key: (it) => it.id);
+    });
 
-    return copyWith(options: updatedOptions);
+    return updateWith(
+      updatedPoll,
+      ownVotesAndAnswers: updatedOwnVotesAndAnswers,
+    );
   }
 
-  /// Casts an answer to this poll.
+  /// Adds or updates an answer in this poll.
   ///
-  /// Updates the latest answers and own votes/answers lists by adding or updating [answer].
-  /// Only adds answers that belong to [currentUserId] to the own votes/answers list.
+  /// Updates the own votes and answers list by adding or updating [answer]. Only adds answers
+  /// that belong to [currentUserId].
   ///
-  /// Returns a new [PollData] instance with the updated answers.
-  PollData castAnswer(PollVoteData answer, String currentUserId) {
-    final updatedLatestAnswers = latestAnswers.let((it) {
-      return it.upsert(answer, key: (it) => it.id == answer.id);
+  /// Returns a new [PollData] instance with the updated own votes and answers.
+  PollData upsertAnswer(
+    PollData updatedPoll,
+    PollVoteData answer,
+    String currentUserId,
+  ) {
+    final updatedOwnVotesAndAnswers = ownVotesAndAnswers.let((it) {
+      if (answer.userId != currentUserId) return it;
+      return it.upsert(answer, key: (it) => it.id);
     });
 
+    return updateWith(
+      updatedPoll,
+      ownVotesAndAnswers: updatedOwnVotesAndAnswers,
+    );
+  }
+
+  /// Removes a vote from this poll.
+  ///
+  /// Updates the own votes and answers list by removing [vote]. Only removes votes
+  /// that belong to [currentUserId].
+  ///
+  /// Returns a new [PollData] instance with the updated own votes and answers.
+  PollData removeVote(
+    PollData updatedPoll,
+    PollVoteData vote,
+    String currentUserId,
+  ) {
+    final updatedOwnVotesAndAnswers = ownVotesAndAnswers.let((it) {
+      if (vote.userId != currentUserId) return it;
+      return it.where((it) => it.id != vote.id).toList();
+    });
+
+    return updateWith(
+      updatedPoll,
+      ownVotesAndAnswers: updatedOwnVotesAndAnswers,
+    );
+  }
+
+  /// Removes an answer from this poll.
+  ///
+  /// Updates the own votes and answers list by removing [answer]. Only removes answers
+  /// that belong to [currentUserId].
+  ///
+  /// Returns a new [PollData] instance with the updated own votes and answers.
+  PollData removeAnswer(
+    PollData updatedPoll,
+    PollVoteData answer,
+    String currentUserId,
+  ) {
     final updatedOwnVotesAndAnswers = ownVotesAndAnswers.let((it) {
       if (answer.userId != currentUserId) return it;
-      return it.upsert(answer, key: (it) => it.id == answer.id);
+      return it.where((it) => it.id != answer.id).toList();
     });
 
-    return copyWith(
-      latestAnswers: updatedLatestAnswers,
+    return updateWith(
+      updatedPoll,
       ownVotesAndAnswers: updatedOwnVotesAndAnswers,
     );
   }

packages/stream_feeds/lib/src/repository/polls_repository.dart

@@ -33,6 +33,7 @@ class PollsRepository {
     const request = api.UpdatePollPartialRequest(
       set: {'is_closed': true},
     );
+
     final result = await _api.updatePollPartial(
       pollId: pollId,
       updatePollPartialRequest: request,

packages/stream_feeds/lib/src/state/activity.dart

@@ -57,7 +57,6 @@ class Activity with Disposable {
 
     final initialActivityState = ActivityState(
       activity: initialActivityData,
-      poll: initialActivityData?.poll,
     );
 
     _stateNotifier = ActivityStateNotifier(
@@ -110,7 +109,7 @@ class Activity with Disposable {
     final result = await activitiesRepository.getActivity(activityId);
 
     result.onSuccess((activity) {
-      _stateNotifier.onActivityUpdated(activity);
+      _stateNotifier.onActivityGet(activity);
       if (activity.currentFeed case final feed?) {
         capabilitiesRepository.cacheCapabilitiesForFeeds([feed]);
       }

packages/stream_feeds/lib/src/state/activity_comment_list_state.dart

@@ -45,6 +45,14 @@ class ActivityCommentListStateNotifier
     );
   }
 
+  /// Handles the deletion of the activity.
+  void onActivityDeleted() {
+    state = state.copyWith(
+      comments: [], // Clear all comments when the activity is deleted
+      pagination: null,
+    );
+  }
+
   /// Handles the addition of a new comment.
   void onCommentAdded(CommentData comment) {
     final parentId = comment.parentId;