refactor: replace contact word for user profile

CHANGELOG.md

@@ -15,7 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added localization support with multi-language support (English, German, Spanish, French, Italian, Portuguese, Russian, Turkish)
 
 ### Changed
-
+- Renamed contact to user profile everywhere [#710](https://github.com/parres-hq/whitenoise_flutter/pull/710)
 ### Deprecated
 
 ### Removed

ios/Podfile.lock

@@ -99,23 +99,23 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/workmanager_apple/ios"
 
 SPEC CHECKSUMS:
-  audio_session: 19e9480dbdd4e5f6c4543826b2e8b0e4ab6145fe
-  emoji_picker_flutter: 8e50ec5caac456a23a78637e02c6293ea0ac8771
+  audio_session: 9bb7f6c970f21241b19f5a3658097ae459681ba0
+  emoji_picker_flutter: ece213fc274bdddefb77d502d33080dc54e616cc
   Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
-  flutter_local_notifications: df98d66e515e1ca797af436137b4459b160ad8c9
-  flutter_native_splash: df59bb2e1421aa0282cb2e95618af4dcb0c56c29
-  flutter_secure_storage: d33dac7ae2ea08509be337e775f6b59f1ff45f12
-  flutter_timezone: ac3da59ac941ff1c98a2e1f0293420e020120282
-  image_picker_ios: c560581cceedb403a6ff17f2f816d7fea1421fc1
-  integration_test: 252f60fa39af5e17c3aa9899d35d908a0721b573
-  just_audio: a42c63806f16995daf5b219ae1d679deb76e6a79
-  mobile_scanner: 77265f3dc8d580810e91849d4a0811a90467ed5e
-  package_info_plus: c0502532a26c7662a62a356cebe2692ec5fe4ec4
-  path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
-  rust_lib_whitenoise: 69ef24b69b2aba78a7ebabc09a504b5a39177d21
-  share_plus: 8b6f8b3447e494cca5317c8c3073de39b3600d1f
-  shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
-  sqflite_darwin: 5a7236e3b501866c1c9befc6771dfd73ffb8702d
+  flutter_local_notifications: 395056b3175ba4f08480a7c5de30cd36d69827e4
+  flutter_native_splash: c32d145d68aeda5502d5f543ee38c192065986cf
+  flutter_secure_storage: 1ed9476fba7e7a782b22888f956cce43e2c62f13
+  flutter_timezone: 7c838e17ffd4645d261e87037e5bebf6d38fe544
+  image_picker_ios: 7fe1ff8e34c1790d6fff70a32484959f563a928a
+  integration_test: 4a889634ef21a45d28d50d622cf412dc6d9f586e
+  just_audio: 4e391f57b79cad2b0674030a00453ca5ce817eed
+  mobile_scanner: 9157936403f5a0644ca3779a38ff8404c5434a93
+  package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499
+  path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
+  rust_lib_whitenoise: 22de658398f8e36a1a396d35b6b6547a0732e6bb
+  share_plus: 50da8cb520a8f0f65671c6c6a99b3617ed10a58a
+  shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7
+  sqflite_darwin: 20b2a3a3b70e43edae938624ce550a3cbf66a3d0
 
 PODFILE CHECKSUM: e30f02f9d1c72c47bb6344a0a748c9d268180865
 

lib/config/providers/create_group_provider.dart

@@ -5,7 +5,7 @@ import 'package:whitenoise/config/providers/active_account_provider.dart';
 import 'package:whitenoise/config/providers/active_pubkey_provider.dart';
 import 'package:whitenoise/config/providers/group_provider.dart';
 import 'package:whitenoise/config/states/create_group_state.dart';
-import 'package:whitenoise/domain/models/contact_model.dart';
+import 'package:whitenoise/domain/models/user_profile.dart';
 import 'package:whitenoise/domain/services/image_picker_service.dart';
 import 'package:whitenoise/src/rust/api/groups.dart';
 import 'package:whitenoise/src/rust/api/users.dart';
@@ -52,28 +52,28 @@ class CreateGroupNotifier extends StateNotifier<CreateGroupState> {
     }
   }
 
-  Future<void> filterContactsWithKeyPackage(
-    List<ContactModel> selectedContacts,
+  Future<void> filterUserProfilesWithKeyPackage(
+    List<UserProfile> selectedUserProfiles,
   ) async {
     try {
-      final filteredContacts = await _filterContactsByKeyPackage(selectedContacts);
-      final contactsWithKeyPackage = filteredContacts['withKeyPackage']!;
-      final contactsWithoutKeyPackage = filteredContacts['withoutKeyPackage']!;
+      final filteredUserProfiles = await _filterUserProfilesByKeyPackage(selectedUserProfiles);
+      final userProfilesWithKeyPackage = filteredUserProfiles['withKeyPackage']!;
+      final userProfilesWithoutKeyPackage = filteredUserProfiles['withoutKeyPackage']!;
 
       state = state.copyWith(
-        contactsWithKeyPackage: contactsWithKeyPackage,
-        contactsWithoutKeyPackage: contactsWithoutKeyPackage,
-        shouldShowInviteSheet: contactsWithoutKeyPackage.isNotEmpty,
+        userProfilesWithKeyPackage: userProfilesWithKeyPackage,
+        userProfilesWithoutKeyPackage: userProfilesWithoutKeyPackage,
+        shouldShowInviteSheet: userProfilesWithoutKeyPackage.isNotEmpty,
       );
 
-      if (contactsWithKeyPackage.isEmpty) {
+      if (userProfilesWithKeyPackage.isEmpty) {
         state = state.copyWith(isCreatingGroup: false);
         return;
       }
     } catch (e, st) {
-      _logger.severe('filterContactsWithKeyPackage', e, st);
+      _logger.severe('filterUserProfilesWithKeyPackage', e, st);
       state = state.copyWith(
-        error: 'Error filtering contacts: ${e.toString()}',
+        error: 'Error filtering userProfiles: ${e.toString()}',
         isCreatingGroup: false,
       );
     }
@@ -83,12 +83,12 @@ class CreateGroupNotifier extends StateNotifier<CreateGroupState> {
     ValueChanged<Group?>? onGroupCreated,
   }) async {
     if (!state.isGroupNameValid) return;
-    if (state.contactsWithKeyPackage.isEmpty) return;
+    if (state.userProfilesWithKeyPackage.isEmpty) return;
 
     state = state.copyWith(isCreatingGroup: true, error: null);
 
     try {
-      final createdGroup = await _createGroupWithContacts(state.contactsWithKeyPackage);
+      final createdGroup = await _createGroupWithUserProfiles(state.userProfilesWithKeyPackage);
 
       if (createdGroup != null) {
         if (state.selectedImagePath != null && state.selectedImagePath!.isNotEmpty) {
@@ -119,7 +119,7 @@ class CreateGroupNotifier extends StateNotifier<CreateGroupState> {
         state = state.copyWith(
           isCreatingGroup: false,
           shouldShowInviteSheet: false,
-          contactsWithoutKeyPackage: [],
+          userProfilesWithoutKeyPackage: [],
         );
       } else {
         state = state.copyWith(
@@ -136,15 +136,15 @@ class CreateGroupNotifier extends StateNotifier<CreateGroupState> {
     }
   }
 
-  Future<Group?> _createGroupWithContacts(List<ContactModel> contactsWithKeyPackage) async {
+  Future<Group?> _createGroupWithUserProfiles(List<UserProfile> userProfilesWithKeyPackage) async {
     final groupName = state.groupName.trim();
     final groupDescription = state.groupDescription.trim();
     final notifier = ref.read(groupsProvider.notifier);
 
     return await notifier.createNewGroup(
       groupName: groupName,
       groupDescription: groupDescription,
-      memberPublicKeyHexs: contactsWithKeyPackage.map((c) => c.publicKey).toList(),
+      memberPublicKeyHexs: userProfilesWithKeyPackage.map((c) => c.publicKey).toList(),
       adminPublicKeyHexs: [],
     );
   }
@@ -188,29 +188,29 @@ class CreateGroupNotifier extends StateNotifier<CreateGroupState> {
     return null;
   }
 
-  Future<Map<String, List<ContactModel>>> _filterContactsByKeyPackage(
-    List<ContactModel> contacts,
+  Future<Map<String, List<UserProfile>>> _filterUserProfilesByKeyPackage(
+    List<UserProfile> userProfiles,
   ) async {
-    final contactsWithKeyPackage = <ContactModel>[];
-    final contactsWithoutKeyPackage = <ContactModel>[];
+    final userProfilesWithKeyPackage = <UserProfile>[];
+    final userProfilesWithoutKeyPackage = <UserProfile>[];
 
-    for (final contact in contacts) {
+    for (final userProfile in userProfiles) {
       try {
-        final hasKeyPackage = await userHasKeyPackage(pubkey: contact.publicKey);
+        final hasKeyPackage = await userHasKeyPackage(pubkey: userProfile.publicKey);
 
         if (hasKeyPackage) {
-          contactsWithKeyPackage.add(contact);
+          userProfilesWithKeyPackage.add(userProfile);
         } else {
-          contactsWithoutKeyPackage.add(contact);
+          userProfilesWithoutKeyPackage.add(userProfile);
         }
       } catch (e) {
-        contactsWithoutKeyPackage.add(contact);
+        userProfilesWithoutKeyPackage.add(userProfile);
       }
     }
 
     return {
-      'withKeyPackage': contactsWithKeyPackage,
-      'withoutKeyPackage': contactsWithoutKeyPackage,
+      'withKeyPackage': userProfilesWithKeyPackage,
+      'withoutKeyPackage': userProfilesWithoutKeyPackage,
     };
   }
 
@@ -223,7 +223,7 @@ class CreateGroupNotifier extends StateNotifier<CreateGroupState> {
   void dismissInviteSheet() {
     state = state.copyWith(
       shouldShowInviteSheet: false,
-      contactsWithoutKeyPackage: [],
+      userProfilesWithoutKeyPackage: [],
     );
   }
 
@@ -236,8 +236,8 @@ class CreateGroupNotifier extends StateNotifier<CreateGroupState> {
       isUploadingImage: false,
       selectedImagePath: null,
       error: null,
-      contactsWithKeyPackage: [],
-      contactsWithoutKeyPackage: [],
+      userProfilesWithKeyPackage: [],
+      userProfilesWithoutKeyPackage: [],
       shouldShowInviteSheet: false,
     );
   }

lib/config/providers/group_messages_provider.dart

@@ -1,9 +1,9 @@
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:whitenoise/config/providers/active_pubkey_provider.dart';
-import 'package:whitenoise/config/providers/user_profile_data_provider.dart';
-import 'package:whitenoise/domain/models/contact_model.dart';
+import 'package:whitenoise/config/providers/user_profile_provider.dart';
 import 'package:whitenoise/domain/models/message_model.dart';
 import 'package:whitenoise/domain/models/user_model.dart' as domain_user;
+import 'package:whitenoise/domain/models/user_profile.dart';
 import 'package:whitenoise/src/rust/api/groups.dart' as groups_api;
 import 'package:whitenoise/src/rust/api/messages.dart'
     show ChatMessage, fetchAggregatedMessagesForGroup;
@@ -92,73 +92,73 @@ class GroupMessagesNotifier extends FamilyNotifier<GroupMessagesState, String> {
     if (activePubkey == null || activePubkey.isEmpty) {
       return {};
     }
-    final groupContacts = await _fetchGroupUsersProfileData(activePubkey);
-    final domainUsersMap = _mapContactModelsToDomainUsers(
+    final groupUserProfiles = await _fetchGroupUserProfiles(activePubkey);
+    final domainUsersMap = _mapUserProfilesToDomainUsers(
       activePubkey: activePubkey,
-      contacts: groupContacts,
+      userProfiles: groupUserProfiles,
     );
     return domainUsersMap;
   }
 
-  Future<List<MapEntry<String, ContactModel>>> _fetchUsersProfileData(
+  Future<List<MapEntry<String, UserProfile>>> _fetchUserProfiles(
     List<String> pubkeys,
   ) async {
-    final userProfileDataNotifier = ref.read(userProfileDataProvider.notifier);
+    final userProfileNotifier = ref.read(userProfileProvider.notifier);
     final userFutures = pubkeys.map(
-      (pubkey) => userProfileDataNotifier
-          .getUserProfileData(pubkey)
-          .then((contact) => MapEntry(pubkey, contact)),
+      (pubkey) => userProfileNotifier
+          .getUserProfile(pubkey)
+          .then((userProfile) => MapEntry(pubkey, userProfile)),
     );
     final usersProfileData = await Future.wait(userFutures);
     return usersProfileData;
   }
 
-  Future<List<MapEntry<String, ContactModel>>> _fetchGroupUsersProfileData(
+  Future<List<MapEntry<String, UserProfile>>> _fetchGroupUserProfiles(
     String activePubkey,
   ) async {
     final groupMembersPubkeys = await _groupMembers(
       pubkey: activePubkey,
       groupId: state.groupId,
     );
-    final groupMembersUserProfileData = await _fetchUsersProfileData(groupMembersPubkeys);
-    return groupMembersUserProfileData;
+    final groupMembersUserProfile = await _fetchUserProfiles(groupMembersPubkeys);
+    return groupMembersUserProfile;
   }
 
-  Map<String, domain_user.User> _mapContactModelsToDomainUsers({
+  Map<String, domain_user.User> _mapUserProfilesToDomainUsers({
     required String activePubkey,
-    required List<MapEntry<String, ContactModel>> contacts,
+    required List<MapEntry<String, UserProfile>> userProfiles,
   }) {
     return Map<String, domain_user.User>.fromEntries(
-      contacts.map(
+      userProfiles.map(
         (entry) => MapEntry(
           entry.key,
-          _contactModelToDomainUser(activePubkey: activePubkey, contact: entry.value),
+          _userProfileToDomainUser(activePubkey: activePubkey, userProfile: entry.value),
         ),
       ),
     );
   }
 
   String _getDisplayName({
     required String activePubkey,
-    required ContactModel contact,
+    required UserProfile userProfile,
   }) {
-    if (_isMe(myPubkey: activePubkey, otherPubkey: contact.publicKey)) {
+    if (_isMe(myPubkey: activePubkey, otherPubkey: userProfile.publicKey)) {
       return 'You';
     } else {
-      return contact.displayName;
+      return userProfile.displayName;
     }
   }
 
-  domain_user.User _contactModelToDomainUser({
+  domain_user.User _userProfileToDomainUser({
     required String activePubkey,
-    required ContactModel contact,
+    required UserProfile userProfile,
   }) {
     return domain_user.User(
-      id: contact.publicKey,
-      displayName: _getDisplayName(activePubkey: activePubkey, contact: contact),
-      nip05: contact.nip05 ?? '',
-      publicKey: contact.publicKey,
-      imagePath: contact.imagePath,
+      id: userProfile.publicKey,
+      displayName: _getDisplayName(activePubkey: activePubkey, userProfile: userProfile),
+      nip05: userProfile.nip05 ?? '',
+      publicKey: userProfile.publicKey,
+      imagePath: userProfile.imagePath,
     );
   }
 }

lib/config/providers/group_provider.dart

@@ -363,7 +363,7 @@ class GroupsNotifier extends Notifier<GroupsState> {
         try {
           final npub = _pubkeyFormatter(pubkey: memberPubkey).toNpub() ?? '';
 
-          // First try to get from follows (cached contacts)
+          // First try to get from follows
           final followsNotifier = ref.read(followsProvider.notifier);
           final existingFollow = followsNotifier.findFollowByPubkey(memberPubkey);
 

lib/config/providers/user_profile_provider.dart

@@ -0,0 +1,33 @@
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:whitenoise/domain/models/user_profile.dart';
+import 'package:whitenoise/src/rust/api/metadata.dart' show FlutterMetadata;
+import 'package:whitenoise/src/rust/api/users.dart' as wn_users_api;
+import 'package:whitenoise/src/rust/api/users.dart' show User;
+
+class UserProfileNotifier extends Notifier<void> {
+  late final Future<User> Function({required String pubkey}) _wnApiGetUser;
+  late final UserProfile Function({required String pubkey, required FlutterMetadata metadata})
+  _getUserProfileFromMetadata;
+
+  UserProfileNotifier({
+    Future<User> Function({required String pubkey})? wnApiGetUserFn,
+    UserProfile Function({required String pubkey, required FlutterMetadata metadata})?
+    getUserProfileFromMetadataFn,
+  }) {
+    _wnApiGetUser = wnApiGetUserFn ?? wn_users_api.getUser;
+    _getUserProfileFromMetadata = getUserProfileFromMetadataFn ?? UserProfile.fromMetadata;
+  }
+
+  @override
+  void build() {}
+
+  Future<UserProfile> getUserProfile(String pubkey) async {
+    final user = await _wnApiGetUser(pubkey: pubkey);
+    final userProfile = _getUserProfileFromMetadata(pubkey: pubkey, metadata: user.metadata);
+    return userProfile;
+  }
+}
+
+final userProfileProvider = NotifierProvider<UserProfileNotifier, void>(
+  () => UserProfileNotifier(),
+);