Merge remote-tracking branch 'origin/main' into feat/add-missing-event-handlers

# Conflicts:
#	packages/stream_feeds/lib/src/state/feed_state.dart

Author: xsahil03x

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

@@ -8,7 +8,6 @@ import 'feed_data.dart';
 import 'feed_member_data.dart';
 import 'follow_data.dart';
 import 'pagination_data.dart';
-import 'query_configuration.dart';
 
 part 'get_or_create_feed_data.freezed.dart';
 
@@ -20,29 +19,29 @@ part 'get_or_create_feed_data.freezed.dart';
 class GetOrCreateFeedData with _$GetOrCreateFeedData {
   /// Creates a new [GetOrCreateFeedData] instance.
   const GetOrCreateFeedData({
+    required this.pagination,
     required this.activities,
-    required this.activitiesQueryConfig,
+    this.aggregatedActivities = const [],
     required this.feed,
     this.followers = const [],
     this.following = const [],
     this.followRequests = const [],
     required this.members,
     this.pinnedActivities = const [],
-    this.aggregatedActivities = const [],
     this.notificationStatus,
   });
 
-  /// A paginated result of activities associated with the feed.
+  /// Pagination information for the feed data.
   @override
-  final PaginationResult<ActivityData> activities;
+  final PaginationData pagination;
 
-  /// The list of aggregated activities in the feed.
+  /// The list of activities in the feed.
   @override
-  final List<AggregatedActivityData> aggregatedActivities;
+  final List<ActivityData> activities;
 
-  /// The configuration used to query activities.
+  /// The list of aggregated activities in the feed.
   @override
-  final QueryConfiguration<ActivityData> activitiesQueryConfig;
+  final List<AggregatedActivityData> aggregatedActivities;
 
   /// The feed data associated with the feed.
   @override

packages/stream_feeds/lib/src/models/get_or_create_feed_data.freezed.dart

@@ -1,4 +1,3 @@
-import 'package:collection/collection.dart';
 import 'package:stream_core/stream_core.dart';
 
 import '../generated/api/api.dart' as api;
@@ -13,8 +12,6 @@ import '../models/follow_data.dart';
 import '../models/get_or_create_feed_data.dart';
 import '../models/model_updates.dart';
 import '../models/pagination_data.dart';
-import '../models/query_configuration.dart';
-import '../state/query/activities_query.dart';
 import '../state/query/feed_query.dart';
 import '../state/query/feeds_query.dart';
 
@@ -56,19 +53,13 @@ class FeedsRepository {
       final rawFollowing = response.following.map((f) => f.toModel());
 
       return GetOrCreateFeedData(
-        activities: PaginationResult(
-          items: response.activities
-              .map((a) => a.toModel())
-              .sorted(ActivitiesSort.defaultSort.compare),
-          pagination: PaginationData(
-            next: response.next,
-            previous: response.prev,
-          ),
-        ),
-        activitiesQueryConfig: QueryConfiguration(
-          filter: query.activityFilter,
-          sort: ActivitiesSort.defaultSort,
+        pagination: PaginationData(
+          next: response.next,
+          previous: response.prev,
         ),
+        activities: response.activities.map((a) => a.toModel()).toList(),
+        aggregatedActivities:
+            response.aggregatedActivities.map((a) => a.toModel()).toList(),
         feed: response.feed.toModel(),
         followers: rawFollowers.where((f) => f.isFollowerOf(fid)).toList(),
         following: rawFollowing.where((f) => f.isFollowingFeed(fid)).toList(),
@@ -82,8 +73,6 @@ class FeedsRepository {
         ),
         pinnedActivities:
             response.pinnedActivities.map((a) => a.toModel()).toList(),
-        aggregatedActivities:
-            response.aggregatedActivities.map((a) => a.toModel()).toList(),
         notificationStatus: response.notificationStatus,
       );
     });

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

@@ -127,9 +127,7 @@ class Feed with Disposable {
 
       capabilitiesRepository.cacheCapabilitiesForFeeds([
         feedData.feed,
-        ...feedData.activities.items
-            .map((activity) => activity.currentFeed)
-            .nonNulls,
+        ...feedData.activities.map((activity) => activity.currentFeed).nonNulls,
       ]);
     });
 
@@ -470,19 +468,19 @@ class Feed with Disposable {
         _stateNotifier.onQueryMoreActivities(
           feedData.activities,
           feedData.aggregatedActivities,
-          feedData.activitiesQueryConfig,
+          feedData.pagination,
         );
 
         capabilitiesRepository.cacheCapabilitiesForFeeds([
           feedData.feed,
-          ...feedData.activities.items
+          ...feedData.activities
               .map((activity) => activity.currentFeed)
               .nonNulls,
         ]);
       },
     );
 
-    return result.map((feedData) => feedData.activities.items);
+    return result.map((feedData) => feedData.activities);
   }
 
   /// Queries for feed suggestions that the current user might want to follow.

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

@@ -24,7 +24,6 @@ import '../models/poll_vote_data.dart';
 import '../models/query_configuration.dart';
 import 'insertion_action.dart';
 import 'member_list_state.dart';
-import 'query/activities_query.dart';
 import 'query/feed_query.dart';
 
 part 'feed_state.freezed.dart';
@@ -54,18 +53,12 @@ class FeedStateNotifier extends StateNotifier<FeedState> {
     });
   }
 
-  QueryConfiguration<ActivityData>? _activitiesQueryConfig;
-  List<Sort<ActivityData>> get activitiesSort {
-    return _activitiesQueryConfig?.sort ?? ActivitiesSort.defaultSort;
-  }
-
   /// Handles the result of a query for the feed.
   void onQueryFeed(GetOrCreateFeedData result) {
-    _activitiesQueryConfig = result.activitiesQueryConfig;
-
     state = state.copyWith(
-      activities: result.activities.items,
-      activitiesPagination: result.activities.pagination,
+      activities: result.activities,
+      aggregatedActivities: result.aggregatedActivities,
+      activitiesPagination: result.pagination,
       feed: result.feed,
       followers: result.followers,
       following: result.following,
@@ -76,7 +69,6 @@ class FeedStateNotifier extends StateNotifier<FeedState> {
       // members: result.members.items,
       followRequests: result.followRequests,
       pinnedActivities: result.pinnedActivities,
-      aggregatedActivities: result.aggregatedActivities,
       notificationStatus: result.notificationStatus,
     );
 
@@ -86,18 +78,16 @@ class FeedStateNotifier extends StateNotifier<FeedState> {
 
   /// Handles the result of a query for more activities.
   void onQueryMoreActivities(
-    PaginationResult<ActivityData> activities,
+    List<ActivityData> activities,
     List<AggregatedActivityData> aggregatedActivities,
-    QueryConfiguration<ActivityData> queryConfig,
+    PaginationData pagination,
   ) {
-    _activitiesQueryConfig = queryConfig;
-
     // Merge the new activities with the existing ones
     final updatedActivities = state.activities.merge(
-      activities.items,
+      activities,
       key: (it) => it.id,
-      compare: activitiesSort.compare,
     );
+
     final updatedAggregatedActivities = state.aggregatedActivities.merge(
       aggregatedActivities,
       key: (it) => it.group,
@@ -106,7 +96,7 @@ class FeedStateNotifier extends StateNotifier<FeedState> {
     state = state.copyWith(
       activities: updatedActivities,
       aggregatedActivities: updatedAggregatedActivities,
-      activitiesPagination: activities.pagination,
+      activitiesPagination: pagination,
     );
   }
 
@@ -139,7 +129,6 @@ class FeedStateNotifier extends StateNotifier<FeedState> {
     state = state.updateActivitiesWhere(
       (it) => it.id == activity.id,
       update: (it) => it.updateWith(activity),
-      compare: activitiesSort.compare,
     );
   }
 
@@ -161,7 +150,6 @@ class FeedStateNotifier extends StateNotifier<FeedState> {
     state = state.updateActivitiesWhere(
       (it) => it.id == activityId,
       update: (it) => it.copyWith(hidden: hidden),
-      compare: activitiesSort.compare,
     );
   }
 
@@ -253,7 +241,6 @@ class FeedStateNotifier extends StateNotifier<FeedState> {
     state = state.updateActivitiesWhere(
       (it) => it.id == bookmark.activity.id,
       update: (it) => it.upsertBookmark(bookmark, currentUserId),
-      compare: activitiesSort.compare,
     );
   }
 
@@ -266,7 +253,6 @@ class FeedStateNotifier extends StateNotifier<FeedState> {
     state = state.updateActivitiesWhere(
       (it) => it.id == bookmark.activity.id,
       update: (it) => it.removeBookmark(bookmark, currentUserId),
-      compare: activitiesSort.compare,
     );
   }
 
@@ -279,7 +265,6 @@ class FeedStateNotifier extends StateNotifier<FeedState> {
     state = state.updateActivitiesWhere(
       (it) => it.id == comment.objectId,
       update: (it) => it.upsertComment(comment),
-      compare: activitiesSort.compare,
     );
   }
 
@@ -289,7 +274,6 @@ class FeedStateNotifier extends StateNotifier<FeedState> {
     state = state.updateActivitiesWhere(
       (it) => it.id == comment.objectId,
       update: (it) => it.removeComment(comment),
-      compare: activitiesSort.compare,
     );
   }