Rename CircleData to TimelineGroupingListData since includes Circles, Groups, and Channels

lib/data/interfaces/circles_repo_intf.dart

@@ -1,27 +1,31 @@
 import 'package:result_monad/result_monad.dart';
 
-import '../../models/circle_data.dart';
 import '../../models/connection.dart';
 import '../../models/exec_error.dart';
+import '../../models/timeline_grouping_list_data.dart';
 
 abstract class ICirclesRepo {
   void clear();
 
-  void addAllCircles(List<CircleData> circles);
+  void addAllCircles(List<TimelineGroupingListData> circles);
 
-  void addConnectionToCircle(CircleData circle, Connection connection);
+  void addConnectionToCircle(
+      TimelineGroupingListData circle, Connection connection);
 
   void clearMyCircles();
 
-  void upsertCircle(CircleData circle);
+  void upsertCircle(TimelineGroupingListData circle);
 
-  void deleteCircle(CircleData circle);
+  void deleteCircle(TimelineGroupingListData circle);
 
-  List<CircleData> getMyCircles();
+  List<TimelineGroupingListData> getMyCircles();
 
-  Result<List<Connection>, ExecError> getCircleMembers(CircleData circle);
+  Result<List<Connection>, ExecError> getCircleMembers(
+      TimelineGroupingListData circle);
 
-  Result<List<CircleData>, ExecError> getCirclesForUser(String id);
+  Result<List<TimelineGroupingListData>, ExecError> getCirclesForUser(
+      String id);
 
-  bool updateConnectionCircleData(String id, List<CircleData> currentCircless);
+  bool updateConnectionCircleData(
+      String id, List<TimelineGroupingListData> currentCircless);
 }

lib/data/memory/memory_circles_repo.dart

@@ -1,14 +1,14 @@
 import 'package:result_monad/result_monad.dart';
 
-import '../../models/circle_data.dart';
 import '../../models/connection.dart';
 import '../../models/exec_error.dart';
+import '../../models/timeline_grouping_list_data.dart';
 import '../interfaces/circles_repo_intf.dart';
 
 class MemoryCirclesRepo implements ICirclesRepo {
-  final _circlesForConnection = <String, List<CircleData>>{};
+  final _circlesForConnection = <String, List<TimelineGroupingListData>>{};
   final _connectionsForCircle = <String, Set<Connection>>{};
-  final _myCircles = <CircleData>{};
+  final _myCircles = <TimelineGroupingListData>{};
 
   @override
   void clear() {
@@ -18,7 +18,8 @@ class MemoryCirclesRepo implements ICirclesRepo {
   }
 
   @override
-  Result<List<CircleData>, ExecError> getCirclesForUser(String id) {
+  Result<List<TimelineGroupingListData>, ExecError> getCirclesForUser(
+      String id) {
     if (!_circlesForConnection.containsKey(id)) {
       return Result.error(ExecError(
         type: ErrorType.notFound,
@@ -30,12 +31,13 @@ class MemoryCirclesRepo implements ICirclesRepo {
   }
 
   @override
-  List<CircleData> getMyCircles() {
+  List<TimelineGroupingListData> getMyCircles() {
     return _myCircles.toList();
   }
 
   @override
-  Result<List<Connection>, ExecError> getCircleMembers(CircleData circle) {
+  Result<List<Connection>, ExecError> getCircleMembers(
+      TimelineGroupingListData circle) {
     if (_connectionsForCircle.containsKey(circle.id)) {
       return Result.ok(_connectionsForCircle[circle.id]!.toList());
     }
@@ -52,31 +54,33 @@ class MemoryCirclesRepo implements ICirclesRepo {
   }
 
   @override
-  void addConnectionToCircle(CircleData circle, Connection connection) {
+  void addConnectionToCircle(
+      TimelineGroupingListData circle, Connection connection) {
     _connectionsForCircle.putIfAbsent(circle.id, () => {}).add(connection);
     _circlesForConnection[connection.id]?.add(circle);
   }
 
   @override
-  void addAllCircles(List<CircleData> circle) {
+  void addAllCircles(List<TimelineGroupingListData> circle) {
     _myCircles.addAll(circle);
   }
 
   @override
-  bool updateConnectionCircleData(String id, List<CircleData> currentCircles) {
+  bool updateConnectionCircleData(
+      String id, List<TimelineGroupingListData> currentCircles) {
     _circlesForConnection[id] = currentCircles;
     return true;
   }
 
   @override
-  void upsertCircle(CircleData circle) {
+  void upsertCircle(TimelineGroupingListData circle) {
     _connectionsForCircle.putIfAbsent(circle.id, () => {});
     _myCircles.remove(circle);
     _myCircles.add(circle);
   }
 
   @override
-  void deleteCircle(CircleData circle) {
+  void deleteCircle(TimelineGroupingListData circle) {
     for (final conCircles in _circlesForConnection.values) {
       conCircles.remove(circle);
     }

lib/friendica_client/friendica_client.dart

@@ -9,7 +9,6 @@ import 'package:result_monad/result_monad.dart';
 import '../friendica_client/paged_response.dart';
 import '../globals.dart';
 import '../models/auth/profile.dart';
-import '../models/circle_data.dart';
 import '../models/connection.dart';
 import '../models/direct_message.dart';
 import '../models/exec_error.dart';
@@ -21,6 +20,7 @@ import '../models/media_attachment_uploads/image_types_enum.dart';
 import '../models/search_results.dart';
 import '../models/search_types.dart';
 import '../models/timeline_entry.dart';
+import '../models/timeline_grouping_list_data.dart';
 import '../models/timeline_identifiers.dart';
 import '../models/user_notification.dart';
 import '../models/visibility.dart';
@@ -28,13 +28,13 @@ import '../serializers/friendica/direct_message_friendica_extensions.dart';
 import '../serializers/friendica/gallery_data_friendica_extensions.dart';
 import '../serializers/friendica/image_entry_friendica_extensions.dart';
 import '../serializers/friendica/visibility_friendica_extensions.dart';
-import '../serializers/mastodon/circle_data_mastodon_extensions.dart';
 import '../serializers/mastodon/connection_mastodon_extensions.dart';
 import '../serializers/mastodon/follow_request_mastodon_extensions.dart';
 import '../serializers/mastodon/instance_info_mastodon_extensions.dart';
 import '../serializers/mastodon/notification_mastodon_extension.dart';
 import '../serializers/mastodon/search_result_mastodon_extensions.dart';
 import '../serializers/mastodon/timeline_entry_mastodon_extensions.dart';
+import '../serializers/mastodon/timeline_grouping_list_data.dart';
 import '../serializers/mastodon/visibility_mastodon_extensions.dart';
 import '../services/fediverse_server_validator.dart';
 import '../services/network_status_service.dart';
@@ -168,18 +168,20 @@ class GalleryClient extends FriendicaClient {
   }
 }
 
-class CirclesClient extends FriendicaClient {
+class TimelineGroupingListClient extends FriendicaClient {
-  static final _logger = Logger('$CirclesClient');
+  static final _logger = Logger('$TimelineGroupingListClient');
 
-  CirclesClient(super.credentials) : super();
+  TimelineGroupingListClient(super.credentials) : super();
 
-  FutureResult<List<CircleData>, ExecError> getCircles() async {
+  FutureResult<List<TimelineGroupingListData>, ExecError>
-    _logger.finest(() => 'Getting circle (Mastodon List) data');
+      getTimelineGroupingListData() async {
+    _logger.finest(() => 'Getting timeline grouping data (Mastodon List) data');
     final url = 'https://$serverName/api/v1/lists';
     final request = Uri.parse(url);
     return (await _getApiListRequest(request).andThenSuccessAsync(
             (listsJson) async => listsJson.data
-                .map((json) => CircleDataMastodonExtensions.fromJson(json))
+                .map((json) =>
+                    TimelineGroupingListDataMastodonExtensions.fromJson(json))
                 .toList()))
         .mapError((error) => error is ExecError
             ? error
@@ -187,7 +189,7 @@ class CirclesClient extends FriendicaClient {
   }
 
   FutureResult<PagedResponse<List<Connection>>, ExecError> getCircleMembers(
-    CircleData circleData,
+    TimelineGroupingListData circleData,
     PagingData page,
   ) async {
     _networkStatusService.startConnectionUpdateStatus();
@@ -206,7 +208,8 @@ class CirclesClient extends FriendicaClient {
         .execErrorCast();
   }
 
-  FutureResult<CircleData, ExecError> createCircle(String title) async {
+  FutureResult<TimelineGroupingListData, ExecError> createCircle(
+      String title) async {
     _logger.finest(() => 'Creating circle (Mastodon List) of name $title');
     final url = 'https://$serverName/api/v1/lists';
     final body = {
@@ -217,11 +220,11 @@ class CirclesClient extends FriendicaClient {
       body,
       headers: _headers,
     ).andThenSuccessAsync((data) async =>
-        CircleDataMastodonExtensions.fromJson(jsonDecode(data)));
+        TimelineGroupingListDataMastodonExtensions.fromJson(jsonDecode(data)));
     return result.execErrorCast();
   }
 
-  FutureResult<CircleData, ExecError> renameCircle(
+  FutureResult<TimelineGroupingListData, ExecError> renameCircle(
       String id, String title) async {
     _logger.finest(() => 'Reanming circle (Mastodon List) to name $title');
     final url = 'https://$serverName/api/v1/lists/$id';
@@ -234,12 +237,13 @@ class CirclesClient extends FriendicaClient {
       headers: _headers,
     ).andThenSuccessAsync((data) async {
       final json = jsonDecode(data);
-      return CircleDataMastodonExtensions.fromJson(json);
+      return TimelineGroupingListDataMastodonExtensions.fromJson(json);
     });
     return result.execErrorCast();
   }
 
-  FutureResult<bool, ExecError> deleteCircle(CircleData circleData) async {
+  FutureResult<bool, ExecError> deleteCircle(
+      TimelineGroupingListData circleData) async {
     _logger.finest(
         () => 'Reanming circle (Mastodon List) to name ${circleData.name}');
     final url = 'https://$serverName/api/v1/lists/${circleData.id}';
@@ -247,21 +251,22 @@ class CirclesClient extends FriendicaClient {
     return result.mapValue((_) => true).execErrorCast();
   }
 
-  FutureResult<List<CircleData>, ExecError> getMemberCirclesForConnection(
+  FutureResult<List<TimelineGroupingListData>, ExecError>
-      String connectionId) async {
+      getMemberCirclesForConnection(String connectionId) async {
     _logger.finest(() =>
         'Getting circles (Mastodon Lists) containing connection: $connectionId');
     final url = 'https://$serverName/api/v1/accounts/$connectionId/lists';
     final request = Uri.parse(url);
     return (await _getApiListRequest(request).andThenSuccessAsync(
             (listsJson) async => listsJson.data
-                .map((json) => CircleDataMastodonExtensions.fromJson(json))
+                .map((json) =>
+                    TimelineGroupingListDataMastodonExtensions.fromJson(json))
                 .toList()))
         .mapError((error) => error as ExecError);
   }
 
   FutureResult<bool, ExecError> addConnectionToCircle(
-    CircleData circle,
+    TimelineGroupingListData circle,
     Connection connection,
   ) async {
     _logger.finest(() => 'Adding connection to circle');
@@ -275,7 +280,7 @@ class CirclesClient extends FriendicaClient {
   }
 
   FutureResult<bool, ExecError> removeConnectionFromCircle(
-    CircleData circle,
+    TimelineGroupingListData circle,
     Connection connection,
   ) async {
     _logger.finest(() => 'Adding connection to circle');

lib/models/circle_data.dart

@@ -1,22 +0,0 @@
-class CircleData {
-  static final followersPseudoCircle = CircleData('~', 'Followers');
-
-  final String id;
-
-  final String name;
-
-  CircleData(this.id, this.name);
-
-  @override
-  String toString() {
-    return 'CircleData{id: $id, name: $name}';
-  }
-
-  @override
-  bool operator ==(Object other) =>
-      identical(this, other) ||
-      other is CircleData && runtimeType == other.runtimeType && id == other.id;
-
-  @override
-  int get hashCode => id.hashCode;
-}

lib/models/timeline_grouping_list_data.dart

@@ -0,0 +1,25 @@
+class TimelineGroupingListData {
+  static final followersPseudoCircle =
+      TimelineGroupingListData('~', 'Followers');
+
+  final String id;
+
+  final String name;
+
+  TimelineGroupingListData(this.id, this.name);
+
+  @override
+  String toString() {
+    return 'CircleData{id: $id, name: $name}';
+  }
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      other is TimelineGroupingListData &&
+          runtimeType == other.runtimeType &&
+          id == other.id;
+
+  @override
+  int get hashCode => id.hashCode;
+}

lib/screens/circle_add_users_screen.dart

@@ -8,9 +8,9 @@ import '../controls/linear_status_indicator.dart';
 import '../controls/responsive_max_width.dart';
 import '../controls/status_and_refresh_button.dart';
 import '../globals.dart';
-import '../models/circle_data.dart';
 import '../models/connection.dart';
 import '../models/exec_error.dart';
+import '../models/timeline_grouping_list_data.dart';
 import '../routes.dart';
 import '../services/connections_manager.dart';
 import '../services/network_status_service.dart';
@@ -29,7 +29,7 @@ class CircleAddUsersScreen extends StatefulWidget {
 class _CircleAddUsersScreenState extends State<CircleAddUsersScreen> {
   static final _logger = Logger('$CircleAddUsersScreen');
   var filterText = '';
-  late CircleData circleData;
+  late TimelineGroupingListData circleData;
 
   @override
   void initState() {

lib/screens/circle_editor_screen.dart

@@ -9,8 +9,8 @@ import '../controls/responsive_max_width.dart';
 import '../controls/standard_appbar.dart';
 import '../controls/status_and_refresh_button.dart';
 import '../globals.dart';
-import '../models/circle_data.dart';
 import '../models/connection.dart';
+import '../models/timeline_grouping_list_data.dart';
 import '../routes.dart';
 import '../services/connections_manager.dart';
 import '../services/network_status_service.dart';
@@ -31,7 +31,7 @@ class _CircleEditorScreenState extends State<CircleEditorScreen> {
   var processingUpdate = false;
   var allowNameEditing = false;
   var filterText = '';
-  late CircleData circleData;
+  late TimelineGroupingListData circleData;
 
   Future<void> updateCircleName(
       BuildContext context, ConnectionsManager manager) async {

lib/screens/editor.dart

@@ -17,12 +17,12 @@ import '../controls/standard_appbar.dart';
 import '../controls/timeline/status_header_control.dart';
 import '../controls/visibility_dialog.dart';
 import '../globals.dart';
-import '../models/circle_data.dart';
 import '../models/exec_error.dart';
 import '../models/image_entry.dart';
 import '../models/link_preview_data.dart';
 import '../models/media_attachment_uploads/new_entry_media_items.dart';
 import '../models/timeline_entry.dart';
+import '../models/timeline_grouping_list_data.dart';
 import '../models/visibility.dart';
 import '../serializers/friendica/link_preview_friendica_extensions.dart';
 import '../services/connections_manager.dart';
@@ -58,7 +58,7 @@ class _EditorScreenState extends State<EditorScreen> {
   final existingMediaItems = <ImageEntry>[];
   final focusNode = FocusNode();
   Visibility visibility = Visibility.public();
-  CircleData? currentCircle;
+  TimelineGroupingListData? currentCircle;
 
   var isSubmitting = false;
 
@@ -603,17 +603,19 @@ class _EditorScreenState extends State<EditorScreen> {
         .getValueOrElse(() => []);
     circles.sort((g1, g2) => g1.name.compareTo(g2.name));
 
-    final circleMenuItems = <DropdownMenuItem<CircleData>>[];
+    final circleMenuItems = <DropdownMenuItem<TimelineGroupingListData>>[];
     circleMenuItems.add(DropdownMenuItem(
-        value: CircleData.followersPseudoCircle,
+        value: TimelineGroupingListData.followersPseudoCircle,
-        child: Text(CircleData.followersPseudoCircle.name)));
+        child: Text(TimelineGroupingListData.followersPseudoCircle.name)));
     circleMenuItems.add(DropdownMenuItem(
-        value: CircleData('', ''), enabled: false, child: const Divider()));
+        value: TimelineGroupingListData('', ''),
+        enabled: false,
+        child: const Divider()));
     circleMenuItems.addAll(circles.map((g) => DropdownMenuItem(
           value: g,
           child: Text(g.name),
         )));
-    if (currentCircle != CircleData.followersPseudoCircle &&
+    if (currentCircle != TimelineGroupingListData.followersPseudoCircle &&
         !circles.contains(currentCircle)) {
       currentCircle = null;
     }
@@ -660,7 +662,7 @@ class _EditorScreenState extends State<EditorScreen> {
         const HorizontalPadding(),
         if (visibility.type == VisibilityType.private)
           Expanded(
-            child: DropdownButton<CircleData>(
+            child: DropdownButton<TimelineGroupingListData>(
               value: currentCircle,
               isExpanded: true,
               onChanged: widget.forEditing

lib/screens/user_profile_screen.dart

@@ -6,8 +6,8 @@ import '../controls/html_text_viewer_control.dart';
 import '../controls/login_aware_cached_network_image.dart';
 import '../controls/padding.dart';
 import '../globals.dart';
-import '../models/circle_data.dart';
 import '../models/connection.dart';
+import '../models/timeline_grouping_list_data.dart';
 import '../routes.dart';
 import '../services/auth_service.dart';
 import '../services/blocks_manager.dart';
@@ -157,7 +157,7 @@ class _UserProfileScreenState extends State<UserProfileScreen> {
         onSuccess: (circles) => circles.toSet(),
         onError: (error) {
           buildSnackbar(context, 'Error getting circle data: $error');
-          return <CircleData>{};
+          return <TimelineGroupingListData>{};
         });
     myCircles.sort((g1, g2) => g1.name.compareTo(g2.name));
 

lib/serializers/mastodon/circle_data_mastodon_extensions.dart

@@ -1,8 +0,0 @@
-import '../../models/circle_data.dart';
-
-extension CircleDataMastodonExtensions on CircleData {
-  static CircleData fromJson(Map<String, dynamic> json) => CircleData(
-        json['id'],
-        json['title'],
-      );
-}

lib/serializers/mastodon/timeline_grouping_list_data.dart

@@ -0,0 +1,10 @@
+import '../../models/timeline_grouping_list_data.dart';
+
+extension TimelineGroupingListDataMastodonExtensions
+    on TimelineGroupingListData {
+  static TimelineGroupingListData fromJson(Map<String, dynamic> json) =>
+      TimelineGroupingListData(
+        json['id'],
+        json['title'],
+      );
+}

lib/serializers/mastodon/visibility_mastodon_extensions.dart

@@ -1,5 +1,4 @@
-import 'package:relatica/models/circle_data.dart';
+import '../../models/timeline_grouping_list_data.dart';
-
 import '../../models/visibility.dart';
 
 extension VisibilityMastodonExtensions on Visibility {
@@ -15,7 +14,7 @@ extension VisibilityMastodonExtensions on Visibility {
     if (!onComment && hasDetails) {
       final circleId =
           allowedCircleIds.firstOrNull ?? allowedUserIds.firstOrNull;
-      if (circleId == CircleData.followersPseudoCircle.id) {
+      if (circleId == TimelineGroupingListData.followersPseudoCircle.id) {
         return 'private';
       }
 

lib/services/connections_manager.dart

@@ -11,9 +11,9 @@ import '../friendica_client/friendica_client.dart';
 import '../friendica_client/paging_data.dart';
 import '../globals.dart';
 import '../models/auth/profile.dart';
-import '../models/circle_data.dart';
 import '../models/connection.dart';
 import '../models/exec_error.dart';
+import '../models/timeline_grouping_list_data.dart';
 import '../utils/active_profile_selector.dart';
 import 'persistent_info_service.dart';
 
@@ -238,7 +238,7 @@ class ConnectionsManager extends ChangeNotifier {
     notifyListeners();
   }
 
-  List<CircleData> getMyCircles() {
+  List<TimelineGroupingListData> getMyCircles() {
     if (circlesNotInitialized) {
       circlesNotInitialized = false;
       _updateMyCircles(true);
@@ -247,7 +247,8 @@ class ConnectionsManager extends ChangeNotifier {
     return circlesRepo.getMyCircles();
   }
 
-  Result<List<Connection>, ExecError> getCircleMembers(CircleData circle) {
+  Result<List<Connection>, ExecError> getCircleMembers(
+      TimelineGroupingListData circle) {
     return circlesRepo
         .getCircleMembers(circle)
         .transform(
@@ -258,8 +259,9 @@ class ConnectionsManager extends ChangeNotifier {
         .execErrorCast();
   }
 
-  FutureResult<CircleData, ExecError> createCircle(String newName) async {
+  FutureResult<TimelineGroupingListData, ExecError> createCircle(
-    final result = await CirclesClient(profile)
+      String newName) async {
+    final result = await TimelineGroupingListClient(profile)
         .createCircle(newName)
         .withResultAsync((newCircle) async {
       circlesRepo.upsertCircle(newCircle);
@@ -268,9 +270,9 @@ class ConnectionsManager extends ChangeNotifier {
     return result.execErrorCast();
   }
 
-  FutureResult<CircleData, ExecError> renameCircle(
+  FutureResult<TimelineGroupingListData, ExecError> renameCircle(
       String id, String newName) async {
-    final result = await CirclesClient(profile)
+    final result = await TimelineGroupingListClient(profile)
         .renameCircle(id, newName)
         .withResultAsync((renamedCircle) async {
       circlesRepo.upsertCircle(renamedCircle);
@@ -279,8 +281,9 @@ class ConnectionsManager extends ChangeNotifier {
     return result.execErrorCast();
   }
 
-  FutureResult<bool, ExecError> deleteCircle(CircleData circleData) async {
+  FutureResult<bool, ExecError> deleteCircle(
-    final result = await CirclesClient(profile)
+      TimelineGroupingListData circleData) async {
+    final result = await TimelineGroupingListClient(profile)
         .deleteCircle(circleData)
         .withResultAsync((_) async {
       circlesRepo.deleteCircle(circleData);
@@ -293,9 +296,9 @@ class ConnectionsManager extends ChangeNotifier {
     _updateMyCircles(true);
   }
 
-  Future<void> refreshCircleMemberships(CircleData circle) async {
+  Future<void> refreshCircleMemberships(TimelineGroupingListData circle) async {
     var page = PagingData(limit: 50);
-    final client = CirclesClient(profile);
+    final client = TimelineGroupingListClient(profile);
     final allResults = <Connection>{};
     var moreResults = true;
     while (moreResults) {
@@ -319,7 +322,8 @@ class ConnectionsManager extends ChangeNotifier {
     notifyListeners();
   }
 
-  Result<List<CircleData>, ExecError> getCirclesForUser(String id) {
+  Result<List<TimelineGroupingListData>, ExecError> getCirclesForUser(
+      String id) {
     final result = circlesRepo.getCirclesForUser(id);
     if (result.isSuccess) {
       _logger.finer("Circles for user $id: $result");
@@ -335,9 +339,9 @@ class ConnectionsManager extends ChangeNotifier {
   }
 
   FutureResult<bool, ExecError> addUserToCircle(
-      CircleData circle, Connection connection) async {
+      TimelineGroupingListData circle, Connection connection) async {
     _logger.finest('Adding ${connection.name} to circle: ${circle.name}');
-    return await CirclesClient(profile)
+    return await TimelineGroupingListClient(profile)
         .addConnectionToCircle(circle, connection)
         .withResultAsync((_) async => await refreshCircleMemberships(circle))
         .withResult((_) => notifyListeners())
@@ -349,9 +353,9 @@ class ConnectionsManager extends ChangeNotifier {
   }
 
   FutureResult<bool, ExecError> removeUserFromCircle(
-      CircleData circle, Connection connection) async {
+      TimelineGroupingListData circle, Connection connection) async {
     _logger.finest('Removing ${connection.name} from circle: ${circle.name}');
-    return CirclesClient(profile)
+    return TimelineGroupingListClient(profile)
         .removeConnectionFromCircle(circle, connection)
         .withResultAsync((_) async => await refreshCircleMemberships(circle))
         .withResult((_) => notifyListeners())
@@ -405,7 +409,9 @@ class ConnectionsManager extends ChangeNotifier {
 
   Future<void> _refreshCircleListData(String id, bool withNotification) async {
     _logger.finest('Refreshing member list data for Connection $id');
-    await CirclesClient(profile).getMemberCirclesForConnection(id).match(
+    await TimelineGroupingListClient(profile)
+        .getMemberCirclesForConnection(id)
+        .match(
       onSuccess: (circles) {
         circlesRepo.updateConnectionCircleData(id, circles);
         if (withNotification) {
@@ -438,7 +444,9 @@ class ConnectionsManager extends ChangeNotifier {
 
   Future<void> _updateMyCircles(bool withNotification) async {
     _logger.finest('Refreshing my circles list');
-    await CirclesClient(profile).getCircles().match(
+    await TimelineGroupingListClient(profile)
+        .getTimelineGroupingListData()
+        .match(
       onSuccess: (circles) {
         _logger.finest('Got updated circles:${circles.map((e) => e.name)}');
         circlesRepo.clearMyCircles();

lib/services/timeline_manager.dart

@@ -5,13 +5,13 @@ import 'package:result_monad/result_monad.dart';
 import '../data/interfaces/circles_repo_intf.dart';
 import '../friendica_client/friendica_client.dart';
 import '../models/auth/profile.dart';
-import '../models/circle_data.dart';
 import '../models/entry_tree_item.dart';
 import '../models/exec_error.dart';
 import '../models/image_entry.dart';
 import '../models/media_attachment_uploads/new_entry_media_items.dart';
 import '../models/timeline.dart';
 import '../models/timeline_entry.dart';
+import '../models/timeline_grouping_list_data.dart';
 import '../models/timeline_identifiers.dart';
 import '../models/visibility.dart';
 import 'entry_manager_service.dart';
@@ -42,7 +42,7 @@ class TimelineManager extends ChangeNotifier {
     notifyListeners();
   }
 
-  Result<List<CircleData>, ExecError> getCircles() {
+  Result<List<TimelineGroupingListData>, ExecError> getCircles() {
     if (circlesNotInitialized) {
       _refreshCircleData();
       circlesNotInitialized = false;
@@ -54,7 +54,9 @@ class TimelineManager extends ChangeNotifier {
 
   Future<void> _refreshCircleData() async {
     _logger.finer('Refreshing member circle data ');
-    await CirclesClient(profile).getCircles().match(
+    await TimelineGroupingListClient(profile)
+        .getTimelineGroupingListData()
+        .match(
       onSuccess: (circles) {
         circlesRepo.addAllCircles(circles);
         notifyListeners();