chore: add require trailing comma lint

famedly · Nov 7, 2024 · 9c32193 · 9c32193
1 parent 989dbd8
commit 9c32193
Show file tree

Hide file tree

Showing 135 changed files with 13,207 additions and 8,964 deletions.
diff --git a/analysis_options.yaml b/analysis_options.yaml
@@ -36,6 +36,7 @@ linter:
     prefer_single_quotes: true
     sort_child_properties_last: true
     sort_pub_dependencies: true
+    require_trailing_commas: true
 
     # Be nice to our users and allow them to configure what gets logged.
     avoid_print: true

diff --git a/lib/encryption/cross_signing.dart b/lib/encryption/cross_signing.dart
@@ -72,11 +72,12 @@ class CrossSigning {
             null;
   }
 
-  Future<void> selfSign(
-      {String? passphrase,
-      String? recoveryKey,
-      String? keyOrPassphrase,
-      OpenSSSS? openSsss}) async {
+  Future<void> selfSign({
+    String? passphrase,
+    String? recoveryKey,
+    String? keyOrPassphrase,
+    OpenSSSS? openSsss,
+  }) async {
     var handle = openSsss;
     if (handle == null) {
       handle = encryption.ssss.open(EventTypes.CrossSigningMasterKey);
@@ -89,7 +90,8 @@ class CrossSigning {
       await handle.maybeCacheAll();
     }
     final masterPrivateKey = base64decodeUnpadded(
-        await handle.getStored(EventTypes.CrossSigningMasterKey));
+      await handle.getStored(EventTypes.CrossSigningMasterKey),
+    );
     final keyObj = olm.PkSigning();
     String? masterPubkey;
     try {
@@ -117,11 +119,13 @@ class CrossSigning {
     ]);
   }
 
-  bool signable(List<SignableKey> keys) => keys.any((key) =>
-      key is CrossSigningKey && key.usage.contains('master') ||
-      key is DeviceKeys &&
-          key.userId == client.userID &&
-          key.identifier != client.deviceID);
+  bool signable(List<SignableKey> keys) => keys.any(
+        (key) =>
+            key is CrossSigningKey && key.usage.contains('master') ||
+            key is DeviceKeys &&
+                key.userId == client.userID &&
+                key.identifier != client.deviceID,
+      );
 
   Future<void> sign(List<SignableKey> keys) async {
     final signedKeys = <MatrixSignableKey>[];
@@ -133,7 +137,10 @@ class CrossSigning {
     }
 
     void addSignature(
-        SignableKey key, SignableKey signedWith, String signature) {
+      SignableKey key,
+      SignableKey signedWith,
+      String signature,
+    ) {
       final signedKey = key.cloneForSigning();
       ((signedKey.signatures ??=
               <String, Map<String, String>>{})[signedWith.userId] ??=
@@ -154,19 +161,22 @@ class CrossSigning {
           // we don't care about signing other cross-signing keys
         } else {
           // okay, we'll sign a device key with our self signing key
-          selfSigningKey ??= base64decodeUnpadded(await encryption.ssss
-                  .getCached(EventTypes.CrossSigningSelfSigning) ??
-              '');
+          selfSigningKey ??= base64decodeUnpadded(
+            await encryption.ssss
+                    .getCached(EventTypes.CrossSigningSelfSigning) ??
+                '',
+          );
           if (selfSigningKey.isNotEmpty) {
             final signature = _sign(key.signingContent, selfSigningKey);
             addSignature(key, userKeys.selfSigningKey!, signature);
           }
         }
       } else if (key is CrossSigningKey && key.usage.contains('master')) {
         // we are signing someone elses master key
-        userSigningKey ??= base64decodeUnpadded(await encryption.ssss
-                .getCached(EventTypes.CrossSigningUserSigning) ??
-            '');
+        userSigningKey ??= base64decodeUnpadded(
+          await encryption.ssss.getCached(EventTypes.CrossSigningUserSigning) ??
+              '',
+        );
         if (userSigningKey.isNotEmpty) {
           final signature = _sign(key.signingContent, userSigningKey);
           addSignature(key, userKeys.userSigningKey!, signature);

diff --git a/lib/encryption/encryption.dart b/lib/encryption/encryption.dart
@@ -105,9 +105,15 @@ class Encryption {
       );
 
   void handleDeviceOneTimeKeysCount(
-      Map<String, int>? countJson, List<String>? unusedFallbackKeyTypes) {
-    runInRoot(() async => olmManager.handleDeviceOneTimeKeysCount(
-        countJson, unusedFallbackKeyTypes));
+    Map<String, int>? countJson,
+    List<String>? unusedFallbackKeyTypes,
+  ) {
+    runInRoot(
+      () async => olmManager.handleDeviceOneTimeKeysCount(
+        countJson,
+        unusedFallbackKeyTypes,
+      ),
+    );
   }
 
   void onSync() {
@@ -173,9 +179,10 @@ class Encryption {
       return await olmManager.decryptToDeviceEvent(event);
     } catch (e, s) {
       Logs().w(
-          '[LibOlm] Could not decrypt to device event from ${event.sender} with content: ${event.content}',
-          e,
-          s);
+        '[LibOlm] Could not decrypt to device event from ${event.sender} with content: ${event.content}',
+        e,
+        s,
+      );
       client.onEncryptionError.add(
         SdkError(
           exception: e is Exception ? e : Exception(e),
@@ -241,7 +248,10 @@ class Encryption {
         client.database
             // ignore: discarded_futures
             ?.updateInboundGroupSessionIndexes(
-                json.encode(inboundGroupSession.indexes), roomId, sessionId)
+              json.encode(inboundGroupSession.indexes),
+              roomId,
+              sessionId,
+            )
             // ignore: discarded_futures
             .onError((e, _) => Logs().e('Ignoring error for updating indexes'));
       }
@@ -255,8 +265,10 @@ class Encryption {
                       ?.session_id() ??
                   '') ==
               content.sessionId) {
-        runInRoot(() async =>
-            keyManager.clearOrUseOutboundGroupSession(roomId, wipe: true));
+        runInRoot(
+          () async =>
+              keyManager.clearOrUseOutboundGroupSession(roomId, wipe: true),
+        );
       }
       if (canRequestSession) {
         decryptedPayload = {
@@ -295,9 +307,12 @@ class Encryption {
     );
   }
 
-  Future<Event> decryptRoomEvent(String roomId, Event event,
-      {bool store = false,
-      EventUpdateType updateType = EventUpdateType.timeline}) async {
+  Future<Event> decryptRoomEvent(
+    String roomId,
+    Event event, {
+    bool store = false,
+    EventUpdateType updateType = EventUpdateType.timeline,
+  }) async {
     if (event.type != EventTypes.Encrypted || event.redacted) {
       return event;
     }
@@ -351,8 +366,10 @@ class Encryption {
   /// Encrypts the given json payload and creates a send-ready m.room.encrypted
   /// payload. This will create a new outgoingGroupSession if necessary.
   Future<Map<String, dynamic>> encryptGroupMessagePayload(
-      String roomId, Map<String, dynamic> payload,
-      {String type = EventTypes.Message}) async {
+    String roomId,
+    Map<String, dynamic> payload, {
+    String type = EventTypes.Message,
+  }) async {
     payload = copyMap(payload);
     final Map<String, dynamic>? mRelatesTo = payload.remove('m.relates_to');
 
@@ -403,9 +420,10 @@ class Encryption {
   }
 
   Future<Map<String, Map<String, Map<String, dynamic>>>> encryptToDeviceMessage(
-      List<DeviceKeys> deviceKeys,
-      String type,
-      Map<String, dynamic> payload) async {
+    List<DeviceKeys> deviceKeys,
+    String type,
+    Map<String, dynamic> payload,
+  ) async {
     return await olmManager.encryptToDeviceMessage(deviceKeys, type, payload);
   }