formatring

Lama-Thematique · Lama-Thematique · commit e1f73dbefa1c · 2026-02-18T18:15:14.000-05:00
diff --git a/commet/lib/client/client_manager.dart b/commet/lib/client/client_manager.dart
@@ -17,9 +17,11 @@ class ClientManager {
 
   final NotifyingMap<String, Client> _clients = NotifyingMap();
 
-  late final NotifyingMap<String, Room> _rooms = NotifyingSubMap(_all_rooms, null);
+  late final NotifyingMap<String, Room> _rooms =
+      NotifyingSubMap(_all_rooms, null);
 
-  late final NotifyingMap<String, Space> _spaces = NotifyingSubMap(_all_rooms, null);
+  late final NotifyingMap<String, Space> _spaces =
+      NotifyingSubMap(_all_rooms, null);
 
   NotifyingMap<String, Room> get motifyingMapRoom => _rooms;
   NotifyingMap<String, Space> get motifyingMapSpace => _spaces;
diff --git a/commet/lib/client/components/calendar_room/calendar_sync.dart b/commet/lib/client/components/calendar_room/calendar_sync.dart
@@ -26,7 +26,7 @@ class CalendarSync {
     ]);
 
     Timer(Duration(minutes: 30), () => syncAllClients());
-    }
+  }
 
   Future<void> syncClient(Client client) async {
     // Wait for client to come online
diff --git a/commet/lib/client/components/user_presence/user_presence_lifecycle_watcher.dart b/commet/lib/client/components/user_presence/user_presence_lifecycle_watcher.dart
@@ -52,7 +52,7 @@ class UserPresenceLifecycleWatcher {
         component.setStatus(state);
       }
     }
-  
+
     lastUpdatedStatus = now;
   }
 }
diff --git a/commet/lib/client/matrix/components/direct_messages/matrix_direct_messages_component.dart b/commet/lib/client/matrix/components/direct_messages/matrix_direct_messages_component.dart
@@ -113,8 +113,8 @@ class MatrixDirectMessagesComponent
 
   void updateNotificationsList() {
     highlightedRoomsList = directMessageRooms
-        .where((e) =>
-            e.displayNotificationCount > 0 && e.roomId != currentRoomId)
+        .where(
+            (e) => e.displayNotificationCount > 0 && e.roomId != currentRoomId)
         .toList();
 
     highlightedListUpdated.add(null);
diff --git a/commet/lib/client/matrix/extensions/matrix_client_extensions.dart b/commet/lib/client/matrix/extensions/matrix_client_extensions.dart
@@ -62,7 +62,8 @@ extension MatrixExtensions on Client {
           avatar: image,
           numMembers: numMembers,
           visibility: visibility,
-          topic: topic, clientId: this.clientName);
+          topic: topic,
+          clientId: this.clientName);
     }
 
     return null;
diff --git a/commet/lib/client/matrix/matrix_client.dart b/commet/lib/client/matrix/matrix_client.dart
@@ -53,9 +53,11 @@ class MatrixClient extends Client {
 
   late String _id;
 
-  late final NotifyingMap<String, Room> _rooms = NotifyingSubMap(clientManager.motifyingMapRoom, (e) => e?.clientId == _id);
+  late final NotifyingMap<String, Room> _rooms = NotifyingSubMap(
+      clientManager.motifyingMapRoom, (e) => e?.clientId == _id);
 
-  late final NotifyingMap<String, Space> _spaces = NotifyingSubMap(clientManager.motifyingMapSpace, (e) => e?.clientId == _id);
+  late final NotifyingMap<String, Space> _spaces = NotifyingSubMap(
+      clientManager.motifyingMapSpace, (e) => e?.clientId == _id);
 
   late final NotifyingMap<String, Peer> _peers = NotifyingMap();
 
@@ -602,12 +604,14 @@ class MatrixClient extends Client {
 
   @override
   bool hasRoom(String identifier) {
-    return _rooms.containsKey(BaseRoom.get_localId(identifier, this.identifier));
+    return _rooms
+        .containsKey(BaseRoom.get_localId(identifier, this.identifier));
   }
 
   @override
   bool hasSpace(String identifier) {
-    return _spaces.containsKey(BaseRoom.get_localId(identifier, this.identifier));
+    return _spaces
+        .containsKey(BaseRoom.get_localId(identifier, this.identifier));
   }
 
   (String, List<String>?)? parseAddressToIdAndVia(String address) {
diff --git a/commet/lib/client/matrix/matrix_room.dart b/commet/lib/client/matrix/matrix_room.dart
@@ -847,7 +847,7 @@ class MatrixRoom extends Room {
 
     await tl.setReadMarker();
   }
-  
+
   @override
   String get clientId => client.identifier;
 }
diff --git a/commet/lib/client/matrix/matrix_room_preview.dart b/commet/lib/client/matrix/matrix_room_preview.dart
@@ -48,8 +48,7 @@ class MatrixSpaceRoomChunkPreview extends RoomPreview {
 
   @override
   RoomVisibility? get visibility => null;
-  
+
   @override
   String get clientId => matrixClient.clientName;
-  
 }
diff --git a/commet/lib/client/matrix/matrix_space.dart b/commet/lib/client/matrix/matrix_space.dart
@@ -289,11 +289,9 @@ class MatrixSpace extends Space {
         }
 
         if (room != null) {
-          if (!containsRoom(room.roomId) &&
-              !client.hasSpace(room.roomId)) {
+          if (!containsRoom(room.roomId) && !client.hasSpace(room.roomId)) {
             _rooms.add(room);
-            _previews
-                .removeWhere((element) => element.roomId == room.roomId);
+            _previews.removeWhere((element) => element.roomId == room.roomId);
           }
         }
       }
@@ -329,8 +327,7 @@ class MatrixSpace extends Space {
 
   @override
   Future<List<RoomPreview>> fetchChildren() async {
-    var response =
-        await _matrixClient.getSpaceHierarchy(roomId, maxDepth: 5);
+    var response = await _matrixClient.getSpaceHierarchy(roomId, maxDepth: 5);
 
     return response.rooms
         .where((element) => element.roomId != roomId)
@@ -354,8 +351,7 @@ class MatrixSpace extends Space {
 
   @override
   Future<void> loadExtra() async {
-    var response =
-        await _matrixClient.getSpaceHierarchy(roomId, maxDepth: 1);
+    var response = await _matrixClient.getSpaceHierarchy(roomId, maxDepth: 1);
 
     // read child rooms
     response.rooms
@@ -499,7 +495,7 @@ class MatrixSpace extends Space {
   Future<void> removeChild(SpaceChild<dynamic> child) async {
     await matrixRoom.removeSpaceChild(child.id);
   }
-  
+
   @override
   String get clientId => client.identifier;
 }
diff --git a/commet/lib/client/matrix_background/matrix_background_room.dart b/commet/lib/client/matrix_background/matrix_background_room.dart
@@ -128,8 +128,7 @@ class MatrixBackgroundRoom implements Room {
   Future<Member> fetchMember(String id) async {
     var db = backgroundClient.database.db;
     var data = await (db.select(db.roomMembers)
-          ..where(
-              (tbl) => tbl.roomId.equals(roomId) & tbl.userId.equals(id)))
+          ..where((tbl) => tbl.roomId.equals(roomId) & tbl.userId.equals(id)))
         .getSingleOrNull();
 
     MatrixBackgroundMember result = MatrixBackgroundMember(id);
@@ -163,8 +162,7 @@ class MatrixBackgroundRoom implements Room {
 
   @override
   Future<TimelineEvent<Client>?> getEvent(String eventId) async {
-    var result =
-        await backgroundClient.api.getOneRoomEvent(roomId, eventId);
+    var result = await backgroundClient.api.getOneRoomEvent(roomId, eventId);
     Log.i("Received event: ${result}");
 
     if ([
@@ -346,7 +344,7 @@ class MatrixBackgroundRoom implements Room {
     // TODO: implement markAsRead
     throw UnimplementedError();
   }
-  
+
   @override
   // TODO: implement clientId
   String get clientId => client.identifier;
diff --git a/commet/lib/client/room.dart b/commet/lib/client/room.dart
@@ -39,6 +39,7 @@ abstract class BaseRoom {
   @override
   int get hashCode => localId.hashCode;
 }
+
 /// The Room object should only be used for rooms which the user is a member of.
 /// Rooms which the user has not joined should be represented with a RoomPreview
 abstract class Room extends BaseRoom {
diff --git a/commet/lib/client/room_preview.dart b/commet/lib/client/room_preview.dart
@@ -37,14 +37,15 @@ class GenericRoomPreview extends RoomPreview {
       required this.type,
       this.numMembers,
       this.visibility,
-      this.topic, required this.clientId});
+      this.topic,
+      required this.clientId});
 
   @override
   Color get color => Colors.grey;
 
   @override
   RoomVisibility? visibility;
-  
+
   @override
   final String clientId;
 }
diff --git a/commet/lib/ui/organisms/chat/chat_view.dart b/commet/lib/ui/organisms/chat/chat_view.dart
@@ -140,8 +140,7 @@ class ChatView extends StatelessWidget {
             ?.getPrefixedAccount(input, state.room)
             ?.$1,
         onTapOverrideClient: (overrideClient) {
-          EventBus.openRoom
-              .add((state.room.roomId, overrideClient.identifier));
+          EventBus.openRoom.add((state.room.roomId, overrideClient.identifier));
 
           if (state.isThread) {
             WidgetsBinding.instance.addPostFrameCallback((_) {
@@ -165,8 +164,8 @@ class ChatView extends StatelessWidget {
         typingIndicatorWidget: state.typingIndicators != null
             ? TypingIndicatorsWidget(
                 component: state.typingIndicators!,
-                key: ValueKey(
-                    "room_typing_indicators_key_${state.room.roomId}"),
+                key:
+                    ValueKey("room_typing_indicators_key_${state.room.roomId}"),
               )
             : null,
         processAutofill: (text) =>
diff --git a/commet/lib/ui/organisms/home_screen/home_screen.dart b/commet/lib/ui/organisms/home_screen/home_screen.dart
@@ -71,8 +71,8 @@ class _HomeScreenState extends State<HomeScreen> {
   }
 
   void onSync(void event) {
-      setState(() {
-        updateRecent();
+    setState(() {
+      updateRecent();
     });
   }
 
diff --git a/commet/lib/ui/organisms/home_screen/home_screen_view.dart b/commet/lib/ui/organisms/home_screen/home_screen_view.dart
@@ -158,8 +158,7 @@ class HomeScreenView extends StatelessWidget {
                       : null,
                   onTap: () => onRoomClicked?.call(room),
                   showUserAvatar: clientManager.rooms
-                          .where((element) =>
-                              element.roomId == room.roomId)
+                          .where((element) => element.roomId == room.roomId)
                           .length >
                       1,
                   userAvatar: room.client.self!.avatar,
diff --git a/commet/lib/ui/organisms/room_quick_access_menu/room_quick_access_menu.dart b/commet/lib/ui/organisms/room_quick_access_menu/room_quick_access_menu.dart
@@ -48,8 +48,7 @@ class RoomQuickAccessMenu {
       if (canCall)
         RoomQuickAccessMenuEntry(
             name: "Call",
-            action: (context) =>
-                calls.startCall(room.roomId, CallType.voice),
+            action: (context) => calls.startCall(room.roomId, CallType.voice),
             icon: Icons.call),
       if (!preferences.hideRoomSidePanel) ...[
         if (calendar?.hasCalendar == true && calendar?.isCalendarRoom == false)
diff --git a/commet/lib/ui/pages/settings/categories/account/account_management/account_management_tab.dart b/commet/lib/ui/pages/settings/categories/account/account_management/account_management_tab.dart
@@ -60,16 +60,16 @@ class _AccountManagementSettingsTabState
 
     onClientRemovedListener =
         widget.clientManager.onClientRemoved.listen((client) {
-        int index = _clientList.indexOf(client);
-        _listKey.currentState?.removeItem(
-            index,
-            (context, animation) => SizeTransition(
-                  sizeFactor: animation,
-                  child: accountListItem(
-                      displayName: client.self!.displayName,
-                      avatar: client.self!.avatar,
-                      detail: client.self!.identifier),
-                ));
+      int index = _clientList.indexOf(client);
+      _listKey.currentState?.removeItem(
+          index,
+          (context, animation) => SizeTransition(
+                sizeFactor: animation,
+                child: accountListItem(
+                    displayName: client.self!.displayName,
+                    avatar: client.self!.avatar,
+                    detail: client.self!.identifier),
+              ));
     });
 
     super.initState();
diff --git a/commet/lib/utils/notifying_map.dart b/commet/lib/utils/notifying_map.dart
@@ -6,13 +6,13 @@ class NotifyingMap<K, V> implements Map<K, V> {
   late final StreamController<MapEntry<K, V>> _onAdd;
 
   late final StreamController<MapEntry<K, V>> _onRemove;
-  
+
   // This stream is called after an item is added to the list
   Stream<MapEntry<K, V>> get onAdd => _onAdd.stream;
 
   // This stream is called just before an item is removed from the list, the item will still be accessible at this index until the stream is completed
   Stream<MapEntry<K, V>> get onRemove => _onRemove.stream;
-  
+
   NotifyingMap({bool sync = true}) {
     _internalMap = Map();
     _onAdd = StreamController.broadcast(sync: sync);
@@ -48,7 +48,7 @@ class NotifyingMap<K, V> implements Map<K, V> {
 
   @override
   void clear() {
-    Map<K,V> oldmap = this._internalMap;
+    Map<K, V> oldmap = this._internalMap;
     this._internalMap = Map();
     for (final entry in oldmap.entries) {
       _onRemove.add(entry);
@@ -107,21 +107,32 @@ class NotifyingMap<K, V> implements Map<K, V> {
 
   @override
   void removeWhere(bool Function(K key, V value) test) {
-    List<MapEntry<K,V>> removed = List.empty(growable: true);
-    _internalMap.removeWhere((key, value) {if (test(key, value)) {removed.add(MapEntry(key,value)) ;return true;}; return false;});
+    List<MapEntry<K, V>> removed = List.empty(growable: true);
+    _internalMap.removeWhere((key, value) {
+      if (test(key, value)) {
+        removed.add(MapEntry(key, value));
+        return true;
+      }
+      ;
+      return false;
+    });
     for (final entry in removed) {
       _onRemove.add(entry);
     }
   }
 
   @override
   V update(K key, V Function(V value) update, {V Function()? ifAbsent}) {
-    if (ifAbsent == null){
+    if (ifAbsent == null) {
       return _internalMap.update(key, update);
     }
     bool absent = true;
     V? old_value = null;
-    V value = _internalMap.update(key, (V value) {absent = false; old_value = value; return update(value);}, ifAbsent: ifAbsent);
+    V value = _internalMap.update(key, (V value) {
+      absent = false;
+      old_value = value;
+      return update(value);
+    }, ifAbsent: ifAbsent);
     if (absent) {
       _onAdd.add(MapEntry(key, value));
     } else {
diff --git a/commet/lib/utils/notifying_set.dart b/commet/lib/utils/notifying_set.dart
diff --git a/commet/lib/utils/notifying_sub_map.dart b/commet/lib/utils/notifying_sub_map.dart
diff --git a/commet/lib/utils/shortcuts_manager.dart b/commet/lib/utils/shortcuts_manager.dart
diff --git a/commet/lib/utils/text_utils.dart b/commet/lib/utils/text_utils.dart
diff --git a/commet/lib/utils/window_management.dart b/commet/lib/utils/window_management.dart

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ class UserPresenceLifecycleWatcher {`
`52`	`52`	`component.setStatus(state);`
`53`	`53`	`}`
`54`	`54`	`}`
`55`		`-`
	`55`	`+`
`56`	`56`	`lastUpdatedStatus = now;`
`57`	`57`	`}`
`58`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,8 @@ extension MatrixExtensions on Client {`
`62`	`62`	`avatar: image,`
`63`	`63`	`numMembers: numMembers,`
`64`	`64`	`visibility: visibility,`
`65`		`- topic: topic, clientId: this.clientName);`
	`65`	`+ topic: topic,`
	`66`	`+ clientId: this.clientName);`
`66`	`67`	`}`
`67`	`68`
`68`	`69`	`return null;`
Original file line number	Diff line number	Diff line change
`@@ -847,7 +847,7 @@ class MatrixRoom extends Room {`
`847`	`847`
`848`	`848`	`await tl.setReadMarker();`
`849`	`849`	`}`
`850`		`-`
	`850`	`+`
`851`	`851`	`@override`
`852`	`852`	`String get clientId => client.identifier;`
`853`	`853`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,8 +48,7 @@ class MatrixSpaceRoomChunkPreview extends RoomPreview {`
`48`	`48`
`49`	`49`	`@override`
`50`	`50`	`RoomVisibility? get visibility => null;`
`51`		`-`
	`51`	`+`
`52`	`52`	`@override`
`53`	`53`	`String get clientId => matrixClient.clientName;`
`54`		`-`
`55`	`54`	`}`