merge feed and activity event handlers

Author: renefloor

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

@@ -68,7 +68,11 @@ class Activity with Disposable {
     );
 
     // Attach event handlers for real-time updates
-    final handler = ActivityEventHandler(fid: fid, state: _stateNotifier);
+    final handler = ActivityEventHandler(
+      fid: fid,
+      state: _stateNotifier,
+      capabilitiesRepository: capabilitiesRepository,
+    );
     _eventsSubscription = eventsEmitter.listen(handler.handleEvent);
   }
 

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

@@ -3,19 +3,24 @@ import 'package:state_notifier/state_notifier.dart';
 import 'package:stream_core/stream_core.dart';
 
 import '../models/activity_data.dart';
+import '../models/activity_pin_data.dart';
+import '../models/comment_data.dart';
+import '../models/feeds_reaction_data.dart';
+import '../models/mark_activity_data.dart';
 import '../models/pagination_data.dart';
 import '../models/poll_data.dart';
 import '../models/poll_vote_data.dart';
 import '../models/threaded_comment_data.dart';
 import 'activity_comment_list_state.dart';
+import 'event/partial_activity_event_handler.dart';
 
 part 'activity_state.freezed.dart';
 
 /// Manages the state of an activity and handles state updates.
 ///
 /// Provides methods to update the activity state in response to data changes
 /// and real-time events from the Stream Feeds API.
-class ActivityStateNotifier extends StateNotifier<ActivityState> {
+class ActivityStateNotifier extends StateNotifier<ActivityState> implements StateWithUpdatableActivity {
   ActivityStateNotifier({
     required ActivityState initialState,
     required this.currentUserId,
@@ -167,6 +172,41 @@ class ActivityStateNotifier extends StateNotifier<ActivityState> {
     _removeCommentListListener?.call();
     super.dispose();
   }
+
+  @override
+  void onActivityMarked(MarkActivityData activityMark) {
+    // TODO: implement onActivityMarked
+  }
+
+  @override
+  void onActivityPinned(ActivityPinData activityPin) {
+    // TODO: implement onActivityPinned
+  }
+
+  @override
+  void onActivityUnpinned(String activityId) {
+    // TODO: implement onActivityUnpinned
+  }
+
+  @override
+  void onCommentAdded(CommentData comment) {
+    // TODO: implement onCommentAdded
+  }
+
+  @override
+  void onCommentRemoved(CommentData comment) {
+    // TODO: implement onCommentRemoved
+  }
+
+  @override
+  void onReactionAdded(FeedsReactionData reaction) {
+    // TODO: implement onReactionAdded
+  }
+
+  @override
+  void onReactionRemoved(FeedsReactionData reaction) {
+    // TODO: implement onReactionRemoved
+  }
 }
 
 /// An observable state object that manages the current state of an activity.

packages/stream_feeds/lib/src/state/event/activity_event_handler.dart

@@ -4,26 +4,38 @@ import '../../generated/api/models.dart' as api;
 import '../../models/feed_id.dart';
 import '../../models/poll_data.dart';
 import '../../models/poll_vote_data.dart';
+import '../../repository/capabilities_repository.dart';
 import '../../resolvers/poll/poll_answer_casted.dart';
 import '../../resolvers/poll/poll_answer_removed.dart';
 import '../activity_state.dart';
+import 'partial_activity_event_handler.dart';
 import 'state_event_handler.dart';
 
 /// Event handler for activity real-time updates.
 ///
 /// Processes WebSocket events related to polls and their associated voting
 /// and updates the activity state accordingly.
 class ActivityEventHandler implements StateEventHandler {
-  const ActivityEventHandler({
+  ActivityEventHandler({
     required this.fid,
     required this.state,
+    required this.capabilitiesRepository,
   });
 
   final FeedId fid;
   final ActivityStateNotifier state;
+  final CapabilitiesRepository capabilitiesRepository;
+
+  late final PartialActivityEventHandler _partialActivityEventHandler =
+      PartialActivityEventHandler(
+    state: state,
+    capabilitiesRepository: capabilitiesRepository,
+    fid: fid,
+  );
 
   @override
-  void handleEvent(WsEvent event) {
+  Future<void> handleEvent(WsEvent event) async {
+    if(await _partialActivityEventHandler.handleEvent(event)) return;
     if (event is api.PollClosedFeedEvent) {
       return state.onPollClosed(event.poll.toModel());
     }

packages/stream_feeds/lib/src/state/event/feed_event_handler.dart

@@ -15,10 +15,12 @@ import '../feed_state.dart';
 
 import '../query/feed_query.dart';
 import 'feed_capabilities_mixin.dart';
+import 'partial_activity_event_handler.dart';
+import 'partial_activity_list_event_handler.dart';
 import 'state_event_handler.dart';
 
 class FeedEventHandler with FeedCapabilitiesMixin implements StateEventHandler {
-  const FeedEventHandler({
+  FeedEventHandler({
     required this.query,
     required this.state,
     required this.capabilitiesRepository,
@@ -30,100 +32,27 @@ class FeedEventHandler with FeedCapabilitiesMixin implements StateEventHandler {
   @override
   final CapabilitiesRepository capabilitiesRepository;
 
+  late final PartialActivityListEventHandler _partialActivityListEventHandler =
+      PartialActivityListEventHandler(
+    state: state,
+    capabilitiesRepository: capabilitiesRepository,
+    fid: query.fid,
+    activityFilter: query.activityFilter,
+  );
+
+  late final PartialActivityEventHandler _partialActivityEventHandler =
+      PartialActivityEventHandler(
+    state: state,
+    capabilitiesRepository: capabilitiesRepository,
+    fid: query.fid,
+  );
+
   @override
   Future<void> handleEvent(WsEvent event) async {
-    final fid = query.fid;
-
-    bool matchesQueryFilter(ActivityData activity) {
-      final filter = query.activityFilter;
-      if (filter == null) return true;
-      return filter.matches(activity);
-    }
-
-    if (event is api.ActivityAddedEvent) {
-      if (event.fid != fid.rawValue) return;
-
-      final activity = event.activity.toModel();
-      if (!matchesQueryFilter(activity)) return;
-
-      state.onActivityAdded(activity);
-
-      final updatedActivity = await withUpdatedFeedCapabilities(activity);
-      if (updatedActivity != null) state.onActivityUpdated(updatedActivity);
-
-      return;
-    }
-
-    if (event is api.ActivityUpdatedEvent) {
-      if (event.fid != fid.rawValue) return;
-
-      final activity = event.activity.toModel();
-      if (!matchesQueryFilter(activity)) {
-        // If the updated activity no longer matches the filter, remove it
-        return state.onActivityRemoved(activity);
-      }
-
-      final updatedActivity = await withUpdatedFeedCapabilities(activity);
-      return state.onActivityUpdated(updatedActivity ?? activity);
-    }
-
-    if (event is api.ActivityDeletedEvent) {
-      if (event.fid != fid.rawValue) return;
-      return state.onActivityRemoved(event.activity.toModel());
-    }
-
-    if (event is api.ActivityReactionAddedEvent) {
-      if (event.fid != fid.rawValue) return;
-
-      final activity = event.activity.toModel();
-      if (!matchesQueryFilter(activity)) {
-        // If the reaction's activity no longer matches the filter, remove it
-        return state.onActivityRemoved(activity);
-      }
-
-      return state.onReactionAdded(event.reaction.toModel());
-    }
-
-    if (event is api.ActivityReactionDeletedEvent) {
-      if (event.fid != fid.rawValue) return;
-
-      final activity = event.activity.toModel();
-      if (!matchesQueryFilter(activity)) {
-        // If the reaction's activity no longer matches the filter, remove it
-        return state.onActivityRemoved(activity);
-      }
-
-      return state.onReactionRemoved(event.reaction.toModel());
-    }
+    if (await _partialActivityListEventHandler.handleEvent(event)) return;
+    if (await _partialActivityEventHandler.handleEvent(event)) return;
 
-    if (event is api.ActivityPinnedEvent) {
-      if (event.fid != fid.rawValue) return;
-
-      final activity = event.pinnedActivity.activity.toModel();
-      if (!matchesQueryFilter(activity)) {
-        // If the pinned activity no longer matches the filter, remove it
-        return state.onActivityRemoved(activity);
-      }
-
-      return state.onActivityPinned(event.pinnedActivity.toModel());
-    }
-
-    if (event is api.ActivityUnpinnedEvent) {
-      if (event.fid != fid.rawValue) return;
-
-      final activity = event.pinnedActivity.activity.toModel();
-      if (!matchesQueryFilter(activity)) {
-        // If the unpinned activity no longer matches the filter, remove it
-        return state.onActivityRemoved(activity);
-      }
-
-      return state.onActivityUnpinned(event.pinnedActivity.activity.id);
-    }
-
-    if (event is api.ActivityMarkEvent) {
-      if (event.fid != fid.rawValue) return;
-      return state.onActivityMarked(event.toModel());
-    }
+    final fid = query.fid;
 
     if (event is api.NotificationFeedUpdatedEvent) {
       if (event.fid != fid.rawValue) return;
@@ -133,48 +62,6 @@ class FeedEventHandler with FeedCapabilitiesMixin implements StateEventHandler {
       );
     }
 
-    if (event is api.BookmarkAddedEvent) {
-      final activity = event.bookmark.activity.toModel();
-      if (!activity.feeds.contains(fid.rawValue)) return;
-
-      if (!matchesQueryFilter(activity)) {
-        // If the bookmark's activity no longer matches the filter, remove it
-        return state.onActivityRemoved(activity);
-      }
-
-      return state.onBookmarkAdded(event.bookmark.toModel());
-    }
-
-    if (event is api.BookmarkDeletedEvent) {
-      final activity = event.bookmark.activity.toModel();
-      if (!activity.feeds.contains(fid.rawValue)) return;
-
-      if (!matchesQueryFilter(activity)) {
-        // If the bookmark's activity no longer matches the filter, remove it
-        return state.onActivityRemoved(activity);
-      }
-
-      return state.onBookmarkRemoved(event.bookmark.toModel());
-    }
-
-    if (event is api.CommentAddedEvent) {
-      if (event.fid != fid.rawValue) return;
-
-      final activity = event.activity.toModel();
-      if (!matchesQueryFilter(activity)) {
-        // If the comment's activity no longer matches the filter, remove it
-        return state.onActivityRemoved(activity);
-      }
-
-      return state.onCommentAdded(event.comment.toModel());
-    }
-
-    if (event is api.CommentDeletedEvent) {
-      if (event.fid != fid.rawValue) return;
-      // TODO: Match event activity against filter once available in the event
-      return state.onCommentRemoved(event.comment.toModel());
-    }
-
     if (event is api.FeedDeletedEvent) {
       if (event.fid != fid.rawValue) return;
       return state.onFeedDeleted();