style: code format

ice-blockchain · Jan 8, 2025 · 9330702 · 9330702
1 parent c4dd9ad
commit 9330702
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 95 deletions.
diff --git a/lib/app/features/chat/providers/conversation_message_actions_provider.c.dart b/lib/app/features/chat/providers/conversation_message_actions_provider.c.dart
@@ -25,16 +25,14 @@ import 'package:riverpod_annotation/riverpod_annotation.dart';
 part 'conversation_message_actions_provider.c.g.dart';
 
 @Riverpod(keepAlive: true)
-Raw<Future<ConversationMessageActionsService>>
-    conversationMessageActionsService(
+Raw<Future<ConversationMessageActionsService>> conversationMessageActionsService(
   Ref ref,
 ) async {
   final databaseService = ref.watch(conversationsDBServiceProvider);
   final conversationMessageManagementService =
       await ref.watch(conversationMessageManagementServiceProvider);
 
-  final eventSigner =
-      await ref.watch(currentUserNostrEventSignerProvider.future);
+  final eventSigner = await ref.watch(currentUserNostrEventSignerProvider.future);
 
   return ConversationMessageActionsService(
     eventSigner: eventSigner,
@@ -67,8 +65,7 @@ class ConversationMessageActionsService {
   final IonConnectSealService sealService;
   final IonConnectGiftWrapService wrapService;
   final ConversationsDBService databaseService;
-  final ConversationMessageManagementService
-      conversationMessageManagementService;
+  final ConversationMessageManagementService conversationMessageManagementService;
 
   Future<void> deleteMessage(String id) async {
     await databaseService.markConversationMessageAsDeleted(id);

diff --git a/lib/app/features/chat/providers/conversation_message_management_provider.c.dart b/lib/app/features/chat/providers/conversation_message_management_provider.c.dart
@@ -29,12 +29,10 @@ import 'package:riverpod_annotation/riverpod_annotation.dart';
 part 'conversation_message_management_provider.c.g.dart';
 
 @Riverpod(keepAlive: true)
-Raw<Future<ConversationMessageManagementService>>
-    conversationMessageManagementService(
+Raw<Future<ConversationMessageManagementService>> conversationMessageManagementService(
   Ref ref,
 ) async {
-  final eventSigner =
-      await ref.watch(currentUserNostrEventSignerProvider.future);
+  final eventSigner = await ref.watch(currentUserNostrEventSignerProvider.future);
 
   return ConversationMessageManagementService(
     eventSigner: eventSigner,
@@ -89,8 +87,7 @@ class ConversationMessageManagementService {
 
       final results = await Future.wait(
         participantsPubkeys.map((participantPubkey) async {
-          final encryptedMediaFiles =
-              await _encryptMediaFiles(compressedMediaFiles);
+          final encryptedMediaFiles = await _encryptMediaFiles(compressedMediaFiles);
 
           final uploadedMediaFilesWithKeys = await Future.wait(
             encryptedMediaFiles.map((encryptedMediaFile) async {
@@ -192,8 +189,7 @@ class ConversationMessageManagementService {
         );
 
         if (attachment.mediaType == MediaType.unknown) {
-          final decompressedFile =
-              await compressionService.decompressBrotli(file);
+          final decompressedFile = await compressionService.decompressBrotli(file);
 
           decryptedDecompressedFiles.add(decompressedFile);
         } else {
@@ -294,8 +290,7 @@ class ConversationMessageManagementService {
           final mediaType = MediaType.fromMimeType(mediaFile.mimeType ?? '');
 
           final compressedMediaFile = switch (mediaType) {
-            MediaType.video =>
-              await compressionService.compressVideo(mediaFile),
+            MediaType.video => await compressionService.compressVideo(mediaFile),
             MediaType.image => await compressionService.compressImage(
                 mediaFile,
                 width: mediaFile.width,
@@ -308,9 +303,7 @@ class ConversationMessageManagementService {
                 path: await compressionService.compressAudio(mediaFile.path),
               ),
             MediaType.unknown => MediaFile(
-                path: (await compressionService
-                        .compressWithBrotli(File(mediaFile.path)))
-                    .path,
+                path: (await compressionService.compressWithBrotli(File(mediaFile.path))).path,
               )
           };
 
@@ -332,14 +325,12 @@ class ConversationMessageManagementService {
   ) async {
     final encryptedMediaFiles = await Future.wait(
       compressedMediaFiles.map(
-        (compressedMediaFile) =>
-            Isolate.run<(MediaFile, String, String, String)>(() async {
+        (compressedMediaFile) => Isolate.run<(MediaFile, String, String, String)>(() async {
           final secretKey = await AesGcm.with256bits().newSecretKey();
           final secretKeyBytes = await secretKey.extractBytes();
           final secretKeyString = base64Encode(secretKeyBytes);
 
-          final compressedMediaFileBytes =
-              await File(compressedMediaFile.path).readAsBytes();
+          final compressedMediaFileBytes = await File(compressedMediaFile.path).readAsBytes();
 
           final secretBox = await AesGcm.with256bits().encrypt(
             compressedMediaFileBytes,
@@ -350,8 +341,7 @@ class ConversationMessageManagementService {
           final nonceString = base64Encode(nonceBytes);
           final macString = base64Encode(secretBox.mac.bytes);
 
-          final compressedEncryptedFile =
-              File('${compressedMediaFile.path}.enc');
+          final compressedEncryptedFile = File('${compressedMediaFile.path}.enc');
           // Rewrite compressed fieles with encrypted data
           await compressedEncryptedFile.writeAsBytes(secretBox.cipherText);
 

diff --git a/lib/app/features/chat/providers/e2ee_group_conversation_management_provider.c.dart b/lib/app/features/chat/providers/e2ee_group_conversation_management_provider.c.dart
@@ -11,8 +11,7 @@ import 'package:riverpod_annotation/riverpod_annotation.dart';
 part 'e2ee_group_conversation_management_provider.c.g.dart';
 
 @Riverpod(keepAlive: true)
-Raw<Future<E2EEGroupConversationManagementService>>
-    e2eeGroupConversationManagementService(
+Raw<Future<E2EEGroupConversationManagementService>> e2eeGroupConversationManagementService(
   Ref ref,
 ) async {
   final databaseService = ref.watch(conversationsDBServiceProvider);
@@ -32,8 +31,7 @@ class E2EEGroupConversationManagementService {
   });
 
   final ConversationsDBService databaseService;
-  final ConversationMessageManagementService
-      conversationMessageManagementService;
+  final ConversationMessageManagementService conversationMessageManagementService;
 
   Future<void> createGroup({
     required String subject,
@@ -55,12 +53,10 @@ class E2EEGroupConversationManagementService {
     assert(conversationSubject.isNotEmpty, 'Conversation subject is empty');
     assert(participantPubkey.isNotEmpty, 'Participant pubkey is empty');
 
-    final conversationsEventMessages =
-        await databaseService.getAllConversations();
+    final conversationsEventMessages = await databaseService.getAllConversations();
 
-    final conversationsEntities = conversationsEventMessages
-        .map(PrivateDirectMessageEntity.fromEventMessage)
-        .toList();
+    final conversationsEntities =
+        conversationsEventMessages.map(PrivateDirectMessageEntity.fromEventMessage).toList();
 
     final pubkeys = conversationsEntities
             .singleWhere(
@@ -87,12 +83,10 @@ class E2EEGroupConversationManagementService {
     assert(conversationSubject.isNotEmpty, 'Conversation subject is empty');
     assert(participantPubkey.isNotEmpty, 'Participant pubkey is empty');
 
-    final conversationsEventMessages =
-        await databaseService.getAllConversations();
+    final conversationsEventMessages = await databaseService.getAllConversations();
 
-    final conversationsEntities = conversationsEventMessages
-        .map(PrivateDirectMessageEntity.fromEventMessage)
-        .toList();
+    final conversationsEntities =
+        conversationsEventMessages.map(PrivateDirectMessageEntity.fromEventMessage).toList();
 
     final pubkeys = conversationsEntities
             .singleWhere(
@@ -123,12 +117,10 @@ class E2EEGroupConversationManagementService {
     assert(currentSubject.isNotEmpty, 'Current conversation subject is empty');
     assert(newSubject.isNotEmpty, 'New conversation subject is empty');
 
-    final conversationsEventMessages =
-        await databaseService.getAllConversations();
+    final conversationsEventMessages = await databaseService.getAllConversations();
 
-    final conversationsEntities = conversationsEventMessages
-        .map(PrivateDirectMessageEntity.fromEventMessage)
-        .toList();
+    final conversationsEntities =
+        conversationsEventMessages.map(PrivateDirectMessageEntity.fromEventMessage).toList();
 
     final pubkeys = conversationsEntities
             .singleWhere(

diff --git a/lib/app/features/chat/views/pages/new_group_modal/pages/create_group_modal.dart b/lib/app/features/chat/views/pages/new_group_modal/pages/create_group_modal.dart
@@ -34,8 +34,7 @@ class CreateGroupModal extends HookConsumerWidget {
     final formKey = useMemoized(GlobalKey<FormState>.new);
     final currentPubkey = ref.watch(currentPubkeySelectorProvider).valueOrNull;
     final createGroupForm = ref.watch(createGroupFormControllerProvider);
-    final createGroupFormNotifier =
-        ref.watch(createGroupFormControllerProvider.notifier);
+    final createGroupFormNotifier = ref.watch(createGroupFormControllerProvider.notifier);
     final nameController = useTextEditingController(text: createGroupForm.name);
     final members = createGroupForm.members.toList();
 
@@ -115,8 +114,7 @@ class CreateGroupModal extends HookConsumerWidget {
                         Assets.svg.iconCategoriesFollowing.icon(size: 16.0.s),
                         SizedBox(width: 6.0.s),
                         Text(
-                          context.i18n
-                              .group_create_members_number(members.length),
+                          context.i18n.group_create_members_number(members.length),
                         ),
                         const Spacer(),
                         TextButton(
@@ -174,8 +172,7 @@ class CreateGroupModal extends HookConsumerWidget {
                         e2eeGroupConversationManagementServiceProvider,
                       );
 
-                      final avatarProcessorState =
-                          ref.read(avatarProcessorNotifierProvider);
+                      final avatarProcessorState = ref.read(avatarProcessorNotifierProvider);
 
                       final groupPicture = avatarProcessorState.whenOrNull(
                         cropped: (file) => file,

diff --git a/lib/app/features/nostr/providers/nostr_notifier.c.dart b/lib/app/features/nostr/providers/nostr_notifier.c.dart
@@ -59,8 +59,7 @@ class NostrNotifier extends _$NostrNotifier {
 
         return null;
       },
-      retryWhen: (error) =>
-          error is RelayRequestFailedException || _isAuthRequired(error),
+      retryWhen: (error) => error is RelayRequestFailedException || _isAuthRequired(error),
       onRetry: () {
         if (relay != null) dislikedRelaysUrls.add(relay!.url);
       },
@@ -72,15 +71,13 @@ class NostrNotifier extends _$NostrNotifier {
     ActionSource actionSource = const ActionSourceCurrentUser(),
     bool cache = true,
   }) async {
-    final result =
-        await sendEvents([event], actionSource: actionSource, cache: cache);
+    final result = await sendEvents([event], actionSource: actionSource, cache: cache);
     return result?.elementAtOrNull(0);
   }
 
   Future<void> sendAuthEvent(NostrRelay relay) async {
     final challenge = ref.read(authChallengeProvider(relay.url));
-    if (challenge == null && challenge.isEmpty)
-      throw AuthChallengeIsEmptyException();
+    if (challenge == null && challenge.isEmpty) throw AuthChallengeIsEmptyException();
 
     final authEvent = AuthEvent(
       challenge: challenge!,
@@ -120,8 +117,7 @@ class NostrNotifier extends _$NostrNotifier {
     ActionSource actionSource = const ActionSourceCurrentUser(),
     bool cache = true,
   }) async {
-    final entities = await sendEntitiesData([entityData],
-        actionSource: actionSource, cache: cache);
+    final entities = await sendEntitiesData([entityData], actionSource: actionSource, cache: cache);
     return entities?.elementAtOrNull(0);
   }
 
@@ -141,8 +137,8 @@ class NostrNotifier extends _$NostrNotifier {
           await sendAuthEvent(relay!);
         }
 
-        await for (final event in nd.requestEvents(requestMessage, relay!,
-            keepSubscription: keepSubscription)) {
+        await for (final event
+            in nd.requestEvents(requestMessage, relay!, keepSubscription: keepSubscription)) {
           if (event is NoticeMessage || event is ClosedMessage) {
             throw RelayRequestFailedException(
               relayUrl: relay!.url,
@@ -153,8 +149,7 @@ class NostrNotifier extends _$NostrNotifier {
           }
         }
       },
-      retryWhen: (error) =>
-          error is RelayRequestFailedException || _isAuthRequired(error),
+      retryWhen: (error) => error is RelayRequestFailedException || _isAuthRequired(error),
       onRetry: () {
         if (relay != null) dislikedRelaysUrls.add(relay!.url);
       },
@@ -165,8 +160,7 @@ class NostrNotifier extends _$NostrNotifier {
     RequestMessage requestMessage, {
     ActionSource actionSource = const ActionSourceCurrentUser(),
   }) async {
-    final eventsStream =
-        requestEvents(requestMessage, actionSource: actionSource);
+    final eventsStream = requestEvents(requestMessage, actionSource: actionSource);
     final events = await eventsStream.toList();
     return events.isNotEmpty ? events.first : null;
   }
@@ -175,13 +169,11 @@ class NostrNotifier extends _$NostrNotifier {
     RequestMessage requestMessage, {
     ActionSource actionSource = const ActionSourceCurrentUser(),
   }) async* {
-    await for (final event
-        in requestEvents(requestMessage, actionSource: actionSource)) {
+    await for (final event in requestEvents(requestMessage, actionSource: actionSource)) {
       try {
         yield _parseAndCache(event);
       } catch (error, stackTrace) {
-        Logger.log('Failed to process event ${event.id}',
-            error: error, stackTrace: stackTrace);
+        Logger.log('Failed to process event ${event.id}', error: error, stackTrace: stackTrace);
       }
     }
   }
@@ -190,8 +182,7 @@ class NostrNotifier extends _$NostrNotifier {
     RequestMessage requestMessage, {
     ActionSource actionSource = const ActionSourceCurrentUser(),
   }) async {
-    final entitiesStream =
-        requestEntities(requestMessage, actionSource: actionSource);
+    final entitiesStream = requestEntities(requestMessage, actionSource: actionSource);
     final entities = await entitiesStream.toList();
     return entities.isNotEmpty ? entities.first as T : null;
   }
@@ -204,20 +195,16 @@ class NostrNotifier extends _$NostrNotifier {
     final relay = await _getRelay(actionSource);
     relay.sendMessage(requestEventMessage);
     return relay.messages
-        .where((message) =>
-            message is EventMessage &&
-            message.kind == EventCountResultEntity.kind)
+        .where((message) => message is EventMessage && message.kind == EventCountResultEntity.kind)
         .cast<EventMessage>()
         .map(EventCountResultEntity.fromEventMessage)
         .firstWhere(
-          (countResult) =>
-              countResult.data.requestEventId == requestEventMessage.id,
+          (countResult) => countResult.data.requestEventId == requestEventMessage.id,
         );
   }
 
   Future<EventMessage> sign(EventSerializable entityData) async {
-    final eventSigner =
-        ref.read(currentUserNostrEventSignerProvider).valueOrNull;
+    final eventSigner = ref.read(currentUserNostrEventSignerProvider).valueOrNull;
     final mainWallet = ref.read(mainWalletProvider).valueOrNull;
 
     if (eventSigner == null) {
@@ -237,9 +224,7 @@ class NostrNotifier extends _$NostrNotifier {
   }
 
   bool _isAuthRequired(Object? error) =>
-      error != null &&
-      (error is SendEventException) &&
-      error.code.startsWith('auth-required');
+      error != null && (error is SendEventException) && error.code.startsWith('auth-required');
 
   Future<NostrRelay> _getRelay(
     ActionSource actionSource, {
@@ -253,15 +238,13 @@ class NostrNotifier extends _$NostrNotifier {
             throw UserMasterPubkeyNotFoundException();
           }
           final userRelays = await _getUserRelays(pubkey);
-          final relays = _userRelaysAvoidingDislikedUrls(
-              userRelays.data.list, dislikedUrls);
+          final relays = _userRelaysAvoidingDislikedUrls(userRelays.data.list, dislikedUrls);
           return await ref.read(relayProvider(relays.random.url).future);
         }
       case ActionSourceUser():
         {
           final userRelays = await _getUserRelays(actionSource.pubkey);
-          final relays = _userRelaysAvoidingDislikedUrls(
-              userRelays.data.list, dislikedUrls);
+          final relays = _userRelaysAvoidingDislikedUrls(userRelays.data.list, dislikedUrls);
           return await ref.read(relayProvider(relays.random.url).future);
         }
       case ActionSourceIndexers():
@@ -285,15 +268,13 @@ class NostrNotifier extends _$NostrNotifier {
             throw UserMasterPubkeyNotFoundException();
           }
           final userChatRelays = await _getUserChatRelays(pubkey);
-          final relays = _userRelaysAvoidingDislikedUrls(
-              userChatRelays.data.list, dislikedUrls);
+          final relays = _userRelaysAvoidingDislikedUrls(userChatRelays.data.list, dislikedUrls);
           return await ref.read(relayProvider(relays.random.url).future);
         }
       case ActionSourceUserChat():
         {
           final userChatRelays = await _getUserChatRelays(actionSource.pubkey);
-          final relays = _userRelaysAvoidingDislikedUrls(
-              userChatRelays.data.list, dislikedUrls);
+          final relays = _userRelaysAvoidingDislikedUrls(userChatRelays.data.list, dislikedUrls);
           return await ref.read(relayProvider(relays.random.url).future);
         }
     }
@@ -328,17 +309,13 @@ class NostrNotifier extends _$NostrNotifier {
     List<UserRelay> relays,
     Set<String> dislikedRelaysUrls,
   ) {
-    final urls = relays
-        .where((relay) => !dislikedRelaysUrls.contains(relay.url))
-        .toList();
+    final urls = relays.where((relay) => !dislikedRelaysUrls.contains(relay.url)).toList();
     if (urls.isEmpty) return relays;
     return urls;
   }
 
-  List<String> _indexersAvoidingDislikedUrls(
-      List<String> indexers, Set<String> dislikedUrls) {
-    var urls =
-        indexers.where((indexer) => !dislikedUrls.contains(indexer)).toList();
+  List<String> _indexersAvoidingDislikedUrls(List<String> indexers, Set<String> dislikedUrls) {
+    var urls = indexers.where((indexer) => !dislikedUrls.contains(indexer)).toList();
     if (urls.isEmpty) {
       urls = indexers;
     }