revert: rename FeedData.fid to FeedData.feed

Author: xsahil03x

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

@@ -19,7 +19,7 @@ class FeedData with _$FeedData {
     required this.createdBy,
     this.deletedAt,
     required this.description,
-    required this.feed,
+    required this.fid,
     this.filterTags = const [],
     required this.followerCount,
     required this.followingCount,
@@ -52,7 +52,7 @@ class FeedData with _$FeedData {
 
   /// The unique identifier for the feed.
   @override
-  final FeedId feed;
+  final FeedId fid;
 
   /// A list of tags used to filter the feed.
   @override
@@ -115,7 +115,7 @@ extension FeedResponseMapper on FeedResponse {
       createdBy: createdBy.toModel(),
       deletedAt: deletedAt,
       description: description,
-      feed: FeedId.fromRawValue(feed),
+      fid: FeedId.fromRawValue(feed),
       filterTags: [...?filterTags],
       followerCount: followerCount,
       followingCount: followingCount,

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

@@ -72,8 +72,8 @@ class FollowData with _$FollowData {
   /// and the creation timestamp.
   /// Used for simpler identification of follow relationships.
   String get id {
-    final sourceFid = sourceFeed.feed;
-    final targetFid = targetFeed.feed;
+    final sourceFid = sourceFeed.fid;
+    final targetFid = targetFeed.fid;
     final createdAt = this.createdAt.millisecondsSinceEpoch;
     return '$sourceFid-$targetFid-$createdAt';
   }
@@ -92,14 +92,14 @@ class FollowData with _$FollowData {
   /// - Parameters:
   ///   - fid: The feed ID to check against.
   /// - Returns: true if this is an accepted follow relationship where the target feed matches the given ID.
-  bool isFollowerOf(FeedId feed) => isFollower && targetFeed.feed == feed;
+  bool isFollowerOf(FeedId feed) => isFollower && targetFeed.fid == feed;
 
   /// Checks if this follow relationship represents following the specified feed.
   ///
   /// - Parameters:
   ///   - fid: The feed ID to check against.
   /// - Returns: true if this is an accepted follow relationship where the source feed matches the given ID.
-  bool isFollowingFeed(FeedId fid) => isFollowing && sourceFeed.feed == fid;
+  bool isFollowingFeed(FeedId fid) => isFollowing && sourceFeed.fid == fid;
 }
 
 /// Extension type representing the status of a follow relationship.

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

@@ -28,7 +28,7 @@ class FeedListEventHandler implements StateEventHandler {
       final feed = event.feed.toModel();
       if (!matchesQueryFilter(feed)) {
         // If the updated feed no longer matches the query filter, remove it
-        return state.onFeedRemoved(feed.feed.rawValue);
+        return state.onFeedRemoved(feed.fid.rawValue);
       }
 
       return state.onFeedUpdated(feed);

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

@@ -33,7 +33,7 @@ class FeedListStateNotifier extends StateNotifier<FeedListState> {
     // Merge the new feeds with the existing ones (keeping the sort order)
     final updatedFeeds = state.feeds.merge(
       result.items,
-      key: (it) => it.feed.rawValue,
+      key: (it) => it.fid.rawValue,
       compare: feedsSort.compare,
     );
 
@@ -46,7 +46,7 @@ class FeedListStateNotifier extends StateNotifier<FeedListState> {
   /// Handles updates to a specific feed.
   void onFeedUpdated(FeedData feed) {
     final updatedFeeds = state.feeds.map((it) {
-      if (it.feed.rawValue != feed.feed.rawValue) return it;
+      if (it.fid.rawValue != feed.fid.rawValue) return it;
       return feed;
     }).toList();
 
@@ -56,7 +56,7 @@ class FeedListStateNotifier extends StateNotifier<FeedListState> {
   /// Handles the removal of a specific feed.
   void onFeedRemoved(String feed) {
     final updatedFeeds = state.feeds.where((it) {
-      return it.feed.rawValue != feed;
+      return it.fid.rawValue != feed;
     }).toList();
 
     state = state.copyWith(feeds: updatedFeeds);

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

@@ -96,7 +96,7 @@ class FeedsFilterField extends FilterField<FeedData> {
   /// **Supported operators:** `.equal`, `.in`
   static final feed = FeedsFilterField(
     'feed',
-    (data) => data.feed.rawValue,
+    (data) => data.fid.rawValue,
   );
 
   /// Filter by the creation timestamp of the feed.

packages/stream_feeds/lib/src/state/query/feeds_query.dart

@@ -96,15 +96,15 @@ class FollowsFilterField extends FilterField<FollowData> {
   /// **Supported operators:** `.equal`, `.in`
   static final sourceFeed = FollowsFilterField(
     'source_feed',
-    (data) => data.sourceFeed.feed.rawValue,
+    (data) => data.sourceFeed.fid.rawValue,
   );
 
   /// Filter by the target feed ID (the feed being followed).
   ///
   /// **Supported operators:** `.equal`, `.in`
   static final targetFeed = FollowsFilterField(
     'target_feed',
-    (data) => data.targetFeed.feed.rawValue,
+    (data) => data.targetFeed.fid.rawValue,
   );
 
   /// Filter by the status of the follow relationship (e.g., "accepted", "pending").

packages/stream_feeds/lib/src/state/query/follows_query.dart

@@ -86,7 +86,7 @@ class _UserProfileState extends State<UserProfile> {
               ),
               onFollow: (targetFeed) async {
                 final result = await widget.timelineFeed.follow(
-                  targetFid: targetFeed.feed,
+                  targetFid: targetFeed.fid,
                   createNotificationActivity: true,
                 );
 
@@ -99,7 +99,7 @@ class _UserProfileState extends State<UserProfile> {
               },
               onUnfollow: (targetFeed) async {
                 final result = await widget.timelineFeed.unfollow(
-                  targetFid: targetFeed.feed,
+                  targetFid: targetFeed.fid,
                 );
 
                 // Add the unfollowed user back to suggestions
@@ -163,7 +163,7 @@ class _UserProfileContent extends StatelessWidget {
 
     final followIncludesCurrentUser = following
             .any((it) => it.targetFeed.id == currentUser.id) ||
-        (followSuggestions?.any((it) => it.feed.id == currentUser.id) ?? false);
+        (followSuggestions?.any((it) => it.fid.id == currentUser.id) ?? false);
 
     return SingleChildScrollView(
       controller: scrollController,
@@ -196,9 +196,9 @@ class _UserProfileContent extends StatelessWidget {
             itemBuilder: (followRequest) => FollowRequestListItem(
               followRequest: followRequest,
               onAcceptPressed: () =>
-                  onAcceptFollow(followRequest.sourceFeed.feed),
+                  onAcceptFollow(followRequest.sourceFeed.fid),
               onRejectPressed: () =>
-                  onRejectFollow(followRequest.sourceFeed.feed),
+                  onRejectFollow(followRequest.sourceFeed.fid),
             ),
           ),