π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Correct mobile and server naming typos
Neeraj Guptae57869ebfb32
diff --git a/mobile/apps/locker/lib/ui/components/collection_list_widget.dart b/mobile/apps/locker/lib/ui/components/collection_list_widget.dartindex de0ef24b5e..b7e99a378e 100644--- a/mobile/apps/locker/lib/ui/components/collection_list_widget.dart+++ b/mobile/apps/locker/lib/ui/components/collection_list_widget.dart@@ -1,6 +1,6 @@import "package:ente_components/ente_components.dart";import "package:ente_sharing/models/user.dart";-import "package:ente_sharing/user_avator_widget.dart";+import "package:ente_sharing/user_avatar_widget.dart";import "package:ente_strings/ente_strings.dart";import "package:flutter/material.dart";import "package:hugeicons/hugeicons.dart";diff --git a/mobile/apps/locker/lib/ui/components/file_list_widget.dart b/mobile/apps/locker/lib/ui/components/file_list_widget.dartindex 85d22890fc..e5843bff6c 100644--- a/mobile/apps/locker/lib/ui/components/file_list_widget.dart+++ b/mobile/apps/locker/lib/ui/components/file_list_widget.dart@@ -1,6 +1,6 @@import "package:ente_components/ente_components.dart";import "package:ente_sharing/models/user.dart";-import "package:ente_sharing/user_avator_widget.dart";+import "package:ente_sharing/user_avatar_widget.dart";import "package:flutter/material.dart";import "package:flutter_svg/flutter_svg.dart";import "package:hugeicons/hugeicons.dart";diff --git a/mobile/apps/locker/lib/ui/sharing/add_email_bottom_sheet.dart b/mobile/apps/locker/lib/ui/sharing/add_email_bottom_sheet.dartindex 1bf969f072..31ea73186e 100644--- a/mobile/apps/locker/lib/ui/sharing/add_email_bottom_sheet.dart+++ b/mobile/apps/locker/lib/ui/sharing/add_email_bottom_sheet.dart@@ -4,7 +4,7 @@ import 'package:ente_contacts/contacts.dart';import "package:ente_pure_utils/ente_pure_utils.dart";import "package:ente_sharing/extensions/user_extension.dart";import "package:ente_sharing/models/user.dart";-import "package:ente_sharing/user_avator_widget.dart";+import "package:ente_sharing/user_avatar_widget.dart";import "package:ente_sharing/verify_identity_dialog.dart";import "package:ente_strings/ente_strings.dart";import "package:ente_ui/components/date_time_picker.dart";diff --git a/mobile/apps/locker/lib/ui/sharing/album_share_info_widget.dart b/mobile/apps/locker/lib/ui/sharing/album_share_info_widget.dartindex aa5612281e..db050a5b08 100644--- a/mobile/apps/locker/lib/ui/sharing/album_share_info_widget.dart+++ b/mobile/apps/locker/lib/ui/sharing/album_share_info_widget.dart@@ -1,7 +1,7 @@import "dart:math";import "package:ente_sharing/models/user.dart";-import "package:ente_sharing/user_avator_widget.dart";+import "package:ente_sharing/user_avatar_widget.dart";import "package:flutter/material.dart";import "package:locker/services/configuration.dart";import "package:locker/ui/sharing/more_count_badge.dart";diff --git a/mobile/apps/locker/lib/ui/sharing/share_collection_bottom_sheet.dart b/mobile/apps/locker/lib/ui/sharing/share_collection_bottom_sheet.dartindex a7e1bceaef..0009bf7228 100644--- a/mobile/apps/locker/lib/ui/sharing/share_collection_bottom_sheet.dart+++ b/mobile/apps/locker/lib/ui/sharing/share_collection_bottom_sheet.dart@@ -1,7 +1,7 @@import "package:ente_components/ente_components.dart";import "package:ente_pure_utils/ente_pure_utils.dart";import "package:ente_sharing/models/user.dart";-import "package:ente_sharing/user_avator_widget.dart";+import "package:ente_sharing/user_avatar_widget.dart";import "package:ente_strings/ente_strings.dart";import "package:flutter/material.dart";import "package:hugeicons/hugeicons.dart";diff --git a/mobile/apps/photos/lib/emergency/emergency_page.dart b/mobile/apps/photos/lib/emergency/emergency_page.dartindex ba5874b5d4..f4e874a24b 100644--- a/mobile/apps/photos/lib/emergency/emergency_page.dart+++ b/mobile/apps/photos/lib/emergency/emergency_page.dart@@ -20,7 +20,7 @@ import "package:photos/ui/components/menu_item_widget/menu_item_widget_new.dart"import "package:photos/ui/components/menu_section_title.dart";import "package:photos/ui/components/title_bar_title_widget.dart";import "package:photos/ui/notification/toast.dart";-import "package:photos/ui/sharing/user_avator_widget.dart";+import "package:photos/ui/sharing/user_avatar_widget.dart";class EmergencyPage extends StatefulWidget {const EmergencyPage({super.key});diff --git a/mobile/apps/photos/lib/emergency/select_contact_page.dart b/mobile/apps/photos/lib/emergency/select_contact_page.dartindex 17ab824b0e..0e9bfa8675 100644--- a/mobile/apps/photos/lib/emergency/select_contact_page.dart+++ b/mobile/apps/photos/lib/emergency/select_contact_page.dart@@ -19,7 +19,7 @@ import "package:photos/ui/components/base_bottom_sheet.dart";import "package:photos/ui/components/buttons/button_widget_v2.dart";import "package:photos/ui/components/menu_item_widget/menu_item_widget_new.dart";import "package:photos/ui/components/text_input_widget_v2.dart";-import 'package:photos/ui/sharing/user_avator_widget.dart';+import 'package:photos/ui/sharing/user_avatar_widget.dart';import "package:photos/ui/sharing/verify_identity_dialog.dart";import "package:photos/utils/email_util.dart";diff --git a/mobile/apps/photos/lib/services/location_service.dart b/mobile/apps/photos/lib/services/location_service.dartindex 12f474bf44..007ac6c537 100644--- a/mobile/apps/photos/lib/services/location_service.dart+++ b/mobile/apps/photos/lib/services/location_service.dart@@ -76,13 +76,13 @@ class LocationService {);}- Future<Map<LocationTag, int>> getLocationTagsToOccurance(+ Future<Map<LocationTag, int>> getLocationTagsToOccurrence(List<EnteFile> files,) async {final locationTagEntities = await locationService.getLocationTags();final locationTagToOccurrence = await _computer.compute(- _getLocationTagsToOccurenceForIsolate,+ _getLocationTagsToOccurrenceForIsolate,param: {"files": files, "locationTagEntities": locationTagEntities},);@@ -349,10 +349,10 @@ class LocationService {}}-Map<LocationTag, int> _getLocationTagsToOccurenceForIsolate(Map args) {+Map<LocationTag, int> _getLocationTagsToOccurrenceForIsolate(Map args) {final List<EnteFile> files = args["files"];- final locationTagToOccurence = <LocationTag, int>{};+ final locationTagToOccurrence = <LocationTag, int>{};final locationTagEntities =args["locationTagEntities"] as Iterable<LocalEntity<LocationTag>>;@@ -370,7 +370,7 @@ Map<LocationTag, int> _getLocationTagsToOccurenceForIsolate(Map args) {fileCoordinates,locationTag.radius,)) {- locationTagToOccurence.update(+ locationTagToOccurrence.update(locationTag,(value) => value + 1,ifAbsent: () => 1,@@ -379,7 +379,7 @@ Map<LocationTag, int> _getLocationTagsToOccurenceForIsolate(Map args) {}}- return locationTagToOccurence;+ return locationTagToOccurrence;}bool isFileInsideLocationTag(diff --git a/mobile/apps/photos/lib/services/permission/service.dart b/mobile/apps/photos/lib/services/permission/service.dartindex 2936c58422..3bb5e10805 100644--- a/mobile/apps/photos/lib/services/permission/service.dart+++ b/mobile/apps/photos/lib/services/permission/service.dart@@ -11,7 +11,7 @@ class PermissionService {final SharedPreferences _prefs;PermissionService(this._prefs);- Future<PermissionState> requestPhotoMangerPermissions() {+ Future<PermissionState> requestPhotoManagerPermissions() {return PhotoManager.requestPermissionExtend(requestOption: const PermissionRequestOption(androidPermission: AndroidPermission(diff --git a/mobile/apps/photos/lib/services/sync/local_sync_service.dart b/mobile/apps/photos/lib/services/sync/local_sync_service.dartindex a7d5302302..a63ee6b910 100644--- a/mobile/apps/photos/lib/services/sync/local_sync_service.dart+++ b/mobile/apps/photos/lib/services/sync/local_sync_service.dart@@ -82,7 +82,7 @@ class LocalSyncService {}if (Platform.isAndroid && AppLifecycleService.instance.isForeground) {final permissionState = await permissionService- .requestPhotoMangerPermissions();+ .requestPhotoManagerPermissions();if (permissionState != PermissionState.authorized) {_logger.warning("Skipping local sync because Android gallery permission is "diff --git a/mobile/apps/photos/lib/ui/collections/album/list_item.dart b/mobile/apps/photos/lib/ui/collections/album/list_item.dartindex 101829149d..7f8c0c554d 100644--- a/mobile/apps/photos/lib/ui/collections/album/list_item.dart+++ b/mobile/apps/photos/lib/ui/collections/album/list_item.dart@@ -12,7 +12,7 @@ import "package:photos/services/collections_service.dart";import "package:photos/ui/components/collection_share_badge.dart";import "package:photos/ui/components/thumbnail_list_item.dart";import "package:photos/ui/sharing/album_share_info_widget.dart";-import "package:photos/ui/sharing/user_avator_widget.dart";+import "package:photos/ui/sharing/user_avatar_widget.dart";import "package:photos/ui/viewer/file/no_thumbnail_widget.dart";import "package:photos/ui/viewer/file/thumbnail_widget.dart";diff --git a/mobile/apps/photos/lib/ui/collections/album/row_item.dart b/mobile/apps/photos/lib/ui/collections/album/row_item.dartindex b6a2da1662..7abc9b238d 100644--- a/mobile/apps/photos/lib/ui/collections/album/row_item.dart+++ b/mobile/apps/photos/lib/ui/collections/album/row_item.dart@@ -16,7 +16,7 @@ import "package:photos/services/collections_service.dart";import "package:photos/ui/components/collection_share_badge.dart";import "package:photos/ui/sharing/album_share_info_widget.dart";import "package:photos/ui/sharing/more_count_badge.dart";-import "package:photos/ui/sharing/user_avator_widget.dart";+import "package:photos/ui/sharing/user_avatar_widget.dart";import 'package:photos/ui/viewer/file/no_thumbnail_widget.dart';import 'package:photos/ui/viewer/file/thumbnail_widget.dart';import 'package:photos/ui/viewer/gallery/collection_page.dart';diff --git a/mobile/apps/photos/lib/ui/common/backup_flow_helper.dart b/mobile/apps/photos/lib/ui/common/backup_flow_helper.dartindex 74a9ca87b6..3e784be892 100644--- a/mobile/apps/photos/lib/ui/common/backup_flow_helper.dart+++ b/mobile/apps/photos/lib/ui/common/backup_flow_helper.dart@@ -97,7 +97,7 @@ Future<bool?> _handleFirstImportFlow(BuildContext context) async {Future<PermissionState?> _requestAndStoreGrantedPermissions() async {try {- final state = await permissionService.requestPhotoMangerPermissions();+ final state = await permissionService.requestPhotoManagerPermissions();if (_hasMinimalPermission(state)) {await permissionService.onUpdatePermission(state);}diff --git a/mobile/apps/photos/lib/ui/device_picker/device_media_library.dart b/mobile/apps/photos/lib/ui/device_picker/device_media_library.dartindex af01387ce8..eca0183af8 100644--- a/mobile/apps/photos/lib/ui/device_picker/device_media_library.dart+++ b/mobile/apps/photos/lib/ui/device_picker/device_media_library.dart@@ -20,7 +20,7 @@ abstract interface class DeviceMediaLibrary {class PhotoManagerDeviceLibrary implements DeviceMediaLibrary {@overrideFuture<PermissionState> permission({required bool request}) => request- ? permissionService.requestPhotoMangerPermissions()+ ? permissionService.requestPhotoManagerPermissions(): permissionService.getPermissionState();@overridediff --git a/mobile/apps/photos/lib/ui/home/grant_permissions_widget.dart b/mobile/apps/photos/lib/ui/home/grant_permissions_widget.dartindex a6b054fbf7..e3ed45278c 100644--- a/mobile/apps/photos/lib/ui/home/grant_permissions_widget.dart+++ b/mobile/apps/photos/lib/ui/home/grant_permissions_widget.dart@@ -236,7 +236,7 @@ class _GrantPermissionsWidgetState extends State<GrantPermissionsWidget>Future<void> _onTapOnlyNewPhotos() async {try {- final state = await permissionService.requestPhotoMangerPermissions();+ final state = await permissionService.requestPhotoManagerPermissions();_logger.info("Permission state: $state");if (state == PermissionState.authorized ||state == PermissionState.limited) {@@ -257,7 +257,7 @@ class _GrantPermissionsWidgetState extends State<GrantPermissionsWidget>Future<void> _onTapSelectFolders() async {try {- final state = await permissionService.requestPhotoMangerPermissions();+ final state = await permissionService.requestPhotoManagerPermissions();_logger.info("Permission state: $state");if (state == PermissionState.authorized ||state == PermissionState.limited) {@@ -279,7 +279,7 @@ class _GrantPermissionsWidgetState extends State<GrantPermissionsWidget>await permissionService.getPermissionState() !=PermissionState.notDetermined;await localSettings.setLocalGalleryOnboardingPending(true);- final state = await permissionService.requestPhotoMangerPermissions();+ final state = await permissionService.requestPhotoManagerPermissions();_logger.info("Offline permission state: $state");if (state.hasAccess) {if (WidgetsBinding.instance.lifecycleState ==diff --git a/mobile/apps/photos/lib/ui/map/map_marker.dart b/mobile/apps/photos/lib/ui/map/map_marker.dartindex dc6f992a9f..6cba7dac86 100644--- a/mobile/apps/photos/lib/ui/map/map_marker.dart+++ b/mobile/apps/photos/lib/ui/map/map_marker.dart@@ -23,7 +23,7 @@ Marker mapMarker(children: [MarkerImage(file: imageMarker.imageFile,- seperator:+ separator:(MapView.defaultMarkerSize.height + 10) -(MapView.defaultMarkerSize.height - markerSize.height),),diff --git a/mobile/apps/photos/lib/ui/map/marker_image.dart b/mobile/apps/photos/lib/ui/map/marker_image.dartindex 57b73fe3c4..184cb93861 100644--- a/mobile/apps/photos/lib/ui/map/marker_image.dart+++ b/mobile/apps/photos/lib/ui/map/marker_image.dart@@ -6,9 +6,9 @@ import "package:photos/ui/viewer/file/thumbnail_widget.dart";class MarkerImage extends StatelessWidget {final EnteFile file;- final double seperator;+ final double separator;- const MarkerImage({super.key, required this.file, required this.seperator});+ const MarkerImage({super.key, required this.file, required this.separator});@overrideWidget build(BuildContext context) {@@ -30,7 +30,7 @@ class MarkerImage extends StatelessWidget {Align(alignment: Alignment.bottomCenter,child: Container(- margin: EdgeInsets.only(top: seperator),+ margin: EdgeInsets.only(top: separator),child: CustomPaint(painter: MarkerPointer(bgColor)),),),diff --git a/mobile/apps/photos/lib/ui/settings/backup/backup_settings_screen.dart b/mobile/apps/photos/lib/ui/settings/backup/backup_settings_screen.dartindex 391a20d0f5..49d671cb38 100644--- a/mobile/apps/photos/lib/ui/settings/backup/backup_settings_screen.dart+++ b/mobile/apps/photos/lib/ui/settings/backup/backup_settings_screen.dart@@ -162,7 +162,7 @@ class _BackupOnlyNewPhotosToggle extends StatelessWidget {}Future<bool> _ensurePhotoPermissions(BuildContext context) async {- final state = await permissionService.requestPhotoMangerPermissions();+ final state = await permissionService.requestPhotoManagerPermissions();if (state == PermissionState.authorized ||state == PermissionState.limited) {await permissionService.onUpdatePermission(state);diff --git a/mobile/apps/photos/lib/ui/sharing/add_people_sheet.dart b/mobile/apps/photos/lib/ui/sharing/add_people_sheet.dartindex a3db614bda..200c84ca13 100644--- a/mobile/apps/photos/lib/ui/sharing/add_people_sheet.dart+++ b/mobile/apps/photos/lib/ui/sharing/add_people_sheet.dart@@ -17,7 +17,7 @@ import "package:photos/ui/actions/collection/collection_sharing_actions.dart";import "package:photos/ui/notification/toast.dart";import "package:photos/ui/sharing/choose_access_sheet.dart";import "package:photos/ui/sharing/manage_links_widget.dart";-import "package:photos/ui/sharing/user_avator_widget.dart";+import "package:photos/ui/sharing/user_avatar_widget.dart";import "package:photos/ui/sharing/verify_identity_dialog.dart";import "package:photos/ui/sharing/widgets/selected_person_chip.dart";import "package:photos/ui/sharing/widgets/sharing_progress_sheet.dart";diff --git a/mobile/apps/photos/lib/ui/sharing/album_share_info_widget.dart b/mobile/apps/photos/lib/ui/sharing/album_share_info_widget.dartindex ceba9ec886..ed0b997b0a 100644--- a/mobile/apps/photos/lib/ui/sharing/album_share_info_widget.dart+++ b/mobile/apps/photos/lib/ui/sharing/album_share_info_widget.dart@@ -3,7 +3,7 @@ import "dart:math";import "package:flutter/material.dart";import "package:photos/models/api/collection/user.dart";import "package:photos/ui/sharing/more_count_badge.dart";-import "package:photos/ui/sharing/user_avator_widget.dart";+import "package:photos/ui/sharing/user_avatar_widget.dart";class AlbumSharesIcons extends StatelessWidget {final List<User> sharees;diff --git a/mobile/apps/photos/lib/ui/sharing/user_avator_widget.dart b/mobile/apps/photos/lib/ui/sharing/user_avatar_widget.dartsimilarity index 100%rename from mobile/apps/photos/lib/ui/sharing/user_avator_widget.dartrename to mobile/apps/photos/lib/ui/sharing/user_avatar_widget.dartdiff --git a/mobile/apps/photos/lib/ui/sharing/widgets/participant_row.dart b/mobile/apps/photos/lib/ui/sharing/widgets/participant_row.dartindex 6c04354c70..5197413301 100644--- a/mobile/apps/photos/lib/ui/sharing/widgets/participant_row.dart+++ b/mobile/apps/photos/lib/ui/sharing/widgets/participant_row.dart@@ -7,7 +7,7 @@ import "package:photos/models/api/collection/user.dart";import "package:photos/models/collection/collection.dart";import "package:photos/services/contacts/contact_identity_resolver.dart";import "package:photos/ui/sharing/share_components.dart";-import "package:photos/ui/sharing/user_avator_widget.dart";+import "package:photos/ui/sharing/user_avatar_widget.dart";import "package:photos/ui/sharing/widgets/sharing_role.dart";class ScrollableParticipantRoster extends StatefulWidget {diff --git a/mobile/apps/photos/lib/ui/sharing/widgets/selected_person_chip.dart b/mobile/apps/photos/lib/ui/sharing/widgets/selected_person_chip.dartindex 567f2e31b4..003ce2ede1 100644--- a/mobile/apps/photos/lib/ui/sharing/widgets/selected_person_chip.dart+++ b/mobile/apps/photos/lib/ui/sharing/widgets/selected_person_chip.dart@@ -7,7 +7,7 @@ import "package:hugeicons/hugeicons.dart";import "package:photos/models/api/collection/user.dart";import "package:photos/services/contacts/contact_identity_resolver.dart";import "package:photos/ui/sharing/share_components.dart";-import "package:photos/ui/sharing/user_avator_widget.dart";+import "package:photos/ui/sharing/user_avatar_widget.dart";import "package:photos/ui/sharing/widgets/sharing_role.dart";class SelectedRecipientChips extends StatefulWidget {diff --git a/mobile/apps/photos/lib/ui/social/comment_likes_bottom_sheet.dart b/mobile/apps/photos/lib/ui/social/comment_likes_bottom_sheet.dartindex 8c8c830b57..6892f7bc6b 100644--- a/mobile/apps/photos/lib/ui/social/comment_likes_bottom_sheet.dart+++ b/mobile/apps/photos/lib/ui/social/comment_likes_bottom_sheet.dart@@ -9,7 +9,7 @@ import "package:photos/models/social/social_data_provider.dart";import "package:photos/services/collections_service.dart";import "package:photos/theme/ente_theme.dart";import "package:photos/ui/components/buttons/icon_button_widget.dart";-import "package:photos/ui/sharing/user_avator_widget.dart";+import "package:photos/ui/sharing/user_avatar_widget.dart";import "package:photos/ui/social/social_actor_contact_navigation.dart";import "package:photos/ui/social/widgets/resolved_social_user_name.dart";diff --git a/mobile/apps/photos/lib/ui/social/likes_bottom_sheet.dart b/mobile/apps/photos/lib/ui/social/likes_bottom_sheet.dartindex 00af084fb6..69f8212b5e 100644--- a/mobile/apps/photos/lib/ui/social/likes_bottom_sheet.dart+++ b/mobile/apps/photos/lib/ui/social/likes_bottom_sheet.dart@@ -14,7 +14,7 @@ import "package:photos/services/collections_service.dart";import 'package:photos/services/social_notification_coordinator.dart';import "package:photos/theme/ente_theme.dart";import "package:photos/ui/components/buttons/icon_button_widget.dart";-import "package:photos/ui/sharing/user_avator_widget.dart";+import "package:photos/ui/sharing/user_avatar_widget.dart";import "package:photos/ui/social/social_actor_contact_navigation.dart";import "package:photos/ui/social/widgets/collection_selector_widget.dart";import "package:photos/ui/social/widgets/resolved_social_user_name.dart";diff --git a/mobile/apps/photos/lib/ui/social/widgets/comment_bubble_widget.dart b/mobile/apps/photos/lib/ui/social/widgets/comment_bubble_widget.dartindex a95650e42f..6709dc1af6 100644--- a/mobile/apps/photos/lib/ui/social/widgets/comment_bubble_widget.dart+++ b/mobile/apps/photos/lib/ui/social/widgets/comment_bubble_widget.dart@@ -15,7 +15,7 @@ import "package:photos/models/social/social_data_provider.dart";import "package:photos/theme/colors.dart";import "package:photos/theme/ente_theme.dart";import "package:photos/ui/notification/toast.dart";-import "package:photos/ui/sharing/user_avator_widget.dart";+import "package:photos/ui/sharing/user_avatar_widget.dart";import "package:photos/ui/social/comment_likes_bottom_sheet.dart";import "package:photos/ui/social/widgets/comment_actions_popup.dart";import "package:photos/ui/social/widgets/comment_like_count_capsule.dart";diff --git a/mobile/apps/photos/lib/ui/social/widgets/feed_item_widget.dart b/mobile/apps/photos/lib/ui/social/widgets/feed_item_widget.dartindex 1848c56ba1..993d159222 100644--- a/mobile/apps/photos/lib/ui/social/widgets/feed_item_widget.dart+++ b/mobile/apps/photos/lib/ui/social/widgets/feed_item_widget.dart@@ -10,7 +10,7 @@ import "package:photos/services/collections_service.dart";import "package:photos/theme/colors.dart";import "package:photos/theme/ente_theme.dart";import "package:photos/theme/text_style.dart";-import "package:photos/ui/sharing/user_avator_widget.dart";+import "package:photos/ui/sharing/user_avatar_widget.dart";import "package:photos/ui/social/widgets/resolved_social_user_name.dart";import "package:photos/ui/social/widgets/shared_photos_grid.dart";import "package:photos/ui/viewer/file/thumbnail_widget.dart";diff --git a/mobile/apps/photos/lib/ui/social/widgets/file_social_overlay.dart b/mobile/apps/photos/lib/ui/social/widgets/file_social_overlay.dartindex 06ab56778a..9cbf0177fe 100644--- a/mobile/apps/photos/lib/ui/social/widgets/file_social_overlay.dart+++ b/mobile/apps/photos/lib/ui/social/widgets/file_social_overlay.dart@@ -18,7 +18,7 @@ import "package:photos/models/social/social_data_provider.dart";import "package:photos/service_locator.dart";import "package:photos/services/collections_service.dart";import "package:photos/ui/notification/toast.dart";-import "package:photos/ui/sharing/user_avator_widget.dart";+import "package:photos/ui/sharing/user_avatar_widget.dart";import "package:photos/ui/social/comments_screen.dart";import "package:photos/ui/social/like_collection_selector_sheet.dart";import "package:photos/ui/social/likes_bottom_sheet.dart";diff --git a/mobile/apps/photos/lib/ui/viewer/file/file_icons_widget.dart b/mobile/apps/photos/lib/ui/viewer/file/file_icons_widget.dartindex 2301d07516..02049e58b9 100644--- a/mobile/apps/photos/lib/ui/viewer/file/file_icons_widget.dart+++ b/mobile/apps/photos/lib/ui/viewer/file/file_icons_widget.dart@@ -6,7 +6,7 @@ import 'package:flutter/material.dart';import "package:photos/models/api/collection/user.dart";import "package:photos/models/file/file.dart";import 'package:photos/models/file/trash_file.dart';-import 'package:photos/ui/sharing/user_avator_widget.dart';+import 'package:photos/ui/sharing/user_avatar_widget.dart';import "package:photos/utils/avatar_util.dart";class ThumbnailPlaceHolder extends StatelessWidget {diff --git a/mobile/apps/photos/lib/ui/viewer/file/thumbnail_widget.dart b/mobile/apps/photos/lib/ui/viewer/file/thumbnail_widget.dartindex 88060d368a..32b69d0419 100644--- a/mobile/apps/photos/lib/ui/viewer/file/thumbnail_widget.dart+++ b/mobile/apps/photos/lib/ui/viewer/file/thumbnail_widget.dart@@ -23,7 +23,7 @@ import 'package:photos/module/download/thumbnail.dart';import 'package:photos/service_locator.dart';import 'package:photos/services/collections_service.dart';import 'package:photos/services/favorites_service.dart';-import "package:photos/ui/sharing/user_avator_widget.dart";+import "package:photos/ui/sharing/user_avatar_widget.dart";import 'package:photos/ui/viewer/file/file_icons_widget.dart';import 'package:photos/ui/viewer/gallery/component/group/type.dart';import 'package:photos/ui/viewer/gallery/state/gallery_context_state.dart';diff --git a/mobile/apps/photos/lib/ui/viewer/file_details/added_by_widget.dart b/mobile/apps/photos/lib/ui/viewer/file_details/added_by_widget.dartindex 6690e3dbdb..3c471ab8b3 100644--- a/mobile/apps/photos/lib/ui/viewer/file_details/added_by_widget.dart+++ b/mobile/apps/photos/lib/ui/viewer/file_details/added_by_widget.dart@@ -4,7 +4,7 @@ import "package:flutter/material.dart";import "package:photos/models/file/extensions/file_props.dart";import 'package:photos/models/file/file.dart';import "package:photos/services/collections_service.dart";-import "package:photos/ui/sharing/user_avator_widget.dart";+import "package:photos/ui/sharing/user_avatar_widget.dart";import "package:photos/utils/avatar_util.dart";class AddedByWidget extends StatelessWidget {diff --git a/mobile/apps/photos/lib/ui/viewer/gallery/component/gallery_file_widget.dart b/mobile/apps/photos/lib/ui/viewer/gallery/component/gallery_file_widget.dartindex a2d4e4e8e4..6ba51218aa 100644--- a/mobile/apps/photos/lib/ui/viewer/gallery/component/gallery_file_widget.dart+++ b/mobile/apps/photos/lib/ui/viewer/gallery/component/gallery_file_widget.dart@@ -17,7 +17,7 @@ import "package:photos/module/share/picker_result_uri.dart";import "package:photos/services/app_lifecycle_service.dart";import "package:photos/services/collections_service.dart";import "package:photos/ui/common/touch_cross_detector.dart";-import "package:photos/ui/sharing/user_avator_widget.dart";+import "package:photos/ui/sharing/user_avatar_widget.dart";import "package:photos/ui/viewer/actions/select_all_status_icon.dart";import "package:photos/ui/viewer/file/detail_page.dart";import "package:photos/ui/viewer/file/gallery_photo_page_route.dart";diff --git a/mobile/apps/photos/lib/ui/viewer/gallery/gallery_app_bar_widget.dart b/mobile/apps/photos/lib/ui/viewer/gallery/gallery_app_bar_widget.dartindex cba620eee4..a1f46be066 100644--- a/mobile/apps/photos/lib/ui/viewer/gallery/gallery_app_bar_widget.dart+++ b/mobile/apps/photos/lib/ui/viewer/gallery/gallery_app_bar_widget.dart@@ -55,7 +55,7 @@ import "package:photos/ui/viewer/gallery/hooks/add_photos_sheet.dart";import "package:photos/ui/viewer/gallery/hooks/album_sort_sheet.dart";import "package:photos/ui/viewer/gallery/hooks/edit_album_details_sheet.dart";import "package:photos/ui/viewer/gallery/state/inherited_search_filter_data.dart";-import "package:photos/ui/viewer/hierarchicial_search/app_bar_filter_chips.dart";+import "package:photos/ui/viewer/hierarchical_search/app_bar_filter_chips.dart";import "package:photos/ui/viewer/location/edit_location_sheet.dart";import 'package:photos/utils/dialog_util.dart';import 'package:photos/utils/magic_util.dart';diff --git a/mobile/apps/photos/lib/ui/viewer/hierarchicial_search/app_bar_filter_chips.dart b/mobile/apps/photos/lib/ui/viewer/hierarchical_search/app_bar_filter_chips.dartsimilarity index 97%rename from mobile/apps/photos/lib/ui/viewer/hierarchicial_search/app_bar_filter_chips.dartrename to mobile/apps/photos/lib/ui/viewer/hierarchical_search/app_bar_filter_chips.dartindex bac30a1389..3e35f1d63a 100644--- a/mobile/apps/photos/lib/ui/viewer/hierarchicial_search/app_bar_filter_chips.dart+++ b/mobile/apps/photos/lib/ui/viewer/hierarchical_search/app_bar_filter_chips.dart@@ -5,8 +5,8 @@ import "package:hugeicons/hugeicons.dart";import "package:photos/models/search/hierarchical/hierarchical_search_filter.dart";import "package:photos/ui/viewer/gallery/state/inherited_search_filter_data.dart";import "package:photos/ui/viewer/gallery/state/search_filter_data_provider.dart";-import "package:photos/ui/viewer/hierarchicial_search/chip_widgets/hierarchical_filter_chip.dart";-import "package:photos/ui/viewer/hierarchicial_search/filter_options_bottom_sheet.dart";+import "package:photos/ui/viewer/hierarchical_search/chip_widgets/hierarchical_filter_chip.dart";+import "package:photos/ui/viewer/hierarchical_search/filter_options_bottom_sheet.dart";import "package:photos/utils/hierarchical_search_util.dart";class AppBarFilterChips extends StatefulWidget {diff --git a/mobile/apps/photos/lib/ui/viewer/hierarchicial_search/chip_widgets/face_filter_chip.dart b/mobile/apps/photos/lib/ui/viewer/hierarchical_search/chip_widgets/face_filter_chip.dartsimilarity index 100%rename from mobile/apps/photos/lib/ui/viewer/hierarchicial_search/chip_widgets/face_filter_chip.dartrename to mobile/apps/photos/lib/ui/viewer/hierarchical_search/chip_widgets/face_filter_chip.dartdiff --git a/mobile/apps/photos/lib/ui/viewer/hierarchicial_search/chip_widgets/generic_filter_chip.dart b/mobile/apps/photos/lib/ui/viewer/hierarchical_search/chip_widgets/generic_filter_chip.dartsimilarity index 100%rename from mobile/apps/photos/lib/ui/viewer/hierarchicial_search/chip_widgets/generic_filter_chip.dartrename to mobile/apps/photos/lib/ui/viewer/hierarchical_search/chip_widgets/generic_filter_chip.dartdiff --git a/mobile/apps/photos/lib/ui/viewer/hierarchicial_search/chip_widgets/hierarchical_filter_chip.dart b/mobile/apps/photos/lib/ui/viewer/hierarchical_search/chip_widgets/hierarchical_filter_chip.dartsimilarity index 83%rename from mobile/apps/photos/lib/ui/viewer/hierarchicial_search/chip_widgets/hierarchical_filter_chip.dartrename to mobile/apps/photos/lib/ui/viewer/hierarchical_search/chip_widgets/hierarchical_filter_chip.dartindex d2fe79df02..757861db71 100644--- a/mobile/apps/photos/lib/ui/viewer/hierarchicial_search/chip_widgets/hierarchical_filter_chip.dart+++ b/mobile/apps/photos/lib/ui/viewer/hierarchical_search/chip_widgets/hierarchical_filter_chip.dart@@ -2,9 +2,9 @@ import "package:flutter/material.dart";import "package:photos/models/search/hierarchical/face_filter.dart";import "package:photos/models/search/hierarchical/hierarchical_search_filter.dart";import "package:photos/models/search/hierarchical/only_them_filter.dart";-import "package:photos/ui/viewer/hierarchicial_search/chip_widgets/face_filter_chip.dart";-import "package:photos/ui/viewer/hierarchicial_search/chip_widgets/generic_filter_chip.dart";-import "package:photos/ui/viewer/hierarchicial_search/chip_widgets/only_them_filter_chip.dart";+import "package:photos/ui/viewer/hierarchical_search/chip_widgets/face_filter_chip.dart";+import "package:photos/ui/viewer/hierarchical_search/chip_widgets/generic_filter_chip.dart";+import "package:photos/ui/viewer/hierarchical_search/chip_widgets/only_them_filter_chip.dart";class HierarchicalFilterChip extends StatelessWidget {final HierarchicalSearchFilter filter;diff --git a/mobile/apps/photos/lib/ui/viewer/hierarchicial_search/chip_widgets/only_them_filter_chip.dart b/mobile/apps/photos/lib/ui/viewer/hierarchical_search/chip_widgets/only_them_filter_chip.dartsimilarity index 100%rename from mobile/apps/photos/lib/ui/viewer/hierarchicial_search/chip_widgets/only_them_filter_chip.dartrename to mobile/apps/photos/lib/ui/viewer/hierarchical_search/chip_widgets/only_them_filter_chip.dartdiff --git a/mobile/apps/photos/lib/ui/viewer/hierarchicial_search/filter_options_bottom_sheet.dart b/mobile/apps/photos/lib/ui/viewer/hierarchical_search/filter_options_bottom_sheet.dartsimilarity index 98%rename from mobile/apps/photos/lib/ui/viewer/hierarchicial_search/filter_options_bottom_sheet.dartrename to mobile/apps/photos/lib/ui/viewer/hierarchical_search/filter_options_bottom_sheet.dartindex 694ba3b077..3f0b89af99 100644--- a/mobile/apps/photos/lib/ui/viewer/hierarchicial_search/filter_options_bottom_sheet.dart+++ b/mobile/apps/photos/lib/ui/viewer/hierarchical_search/filter_options_bottom_sheet.dart@@ -4,7 +4,7 @@ import "package:flutter/material.dart";import "package:photos/models/search/hierarchical/hierarchical_search_filter.dart";import "package:photos/theme/ente_theme.dart";import "package:photos/ui/viewer/gallery/state/search_filter_data_provider.dart";-import "package:photos/ui/viewer/hierarchicial_search/chip_widgets/hierarchical_filter_chip.dart";+import "package:photos/ui/viewer/hierarchical_search/chip_widgets/hierarchical_filter_chip.dart";import "package:photos/utils/hierarchical_search_util.dart";class FilterOptionsBottomSheet extends StatefulWidget {diff --git a/mobile/apps/photos/lib/ui/viewer/search/contact_avatar_widget.dart b/mobile/apps/photos/lib/ui/viewer/search/contact_avatar_widget.dartindex 77d37edce9..c3a2104fad 100644--- a/mobile/apps/photos/lib/ui/viewer/search/contact_avatar_widget.dart+++ b/mobile/apps/photos/lib/ui/viewer/search/contact_avatar_widget.dart@@ -6,7 +6,7 @@ import "package:photos/core/event_bus.dart";import "package:photos/events/contacts_changed_event.dart";import "package:photos/models/api/collection/user.dart";import "package:photos/services/photos_contacts_service.dart";-import "package:photos/ui/sharing/user_avator_widget.dart";+import "package:photos/ui/sharing/user_avatar_widget.dart";import "package:photos/ui/viewer/people/face_thumbnail_squircle.dart";import "package:photos/ui/viewer/people/person_face_widget.dart";diff --git a/mobile/apps/photos/lib/ui/viewer/search/result/contact_result_page.dart b/mobile/apps/photos/lib/ui/viewer/search/result/contact_result_page.dartindex 38f3a4b9f8..11e66120f7 100644--- a/mobile/apps/photos/lib/ui/viewer/search/result/contact_result_page.dart+++ b/mobile/apps/photos/lib/ui/viewer/search/result/contact_result_page.dart@@ -37,7 +37,7 @@ import "package:photos/ui/viewer/gallery/state/gallery_files_inherited_widget.daimport "package:photos/ui/viewer/gallery/state/inherited_search_filter_data.dart";import "package:photos/ui/viewer/gallery/state/search_filter_data_provider.dart";import "package:photos/ui/viewer/gallery/state/selection_state.dart";-import "package:photos/ui/viewer/hierarchicial_search/app_bar_filter_chips.dart";+import "package:photos/ui/viewer/hierarchical_search/app_bar_filter_chips.dart";import "package:photos/ui/viewer/search/contact_avatar_widget.dart";import "package:photos/ui/viewer/search/result/edit_contact_page.dart";import "package:photos/utils/person_contact_linking_util.dart";diff --git a/mobile/apps/photos/lib/utils/hierarchical_search_util.dart b/mobile/apps/photos/lib/utils/hierarchical_search_util.dartindex 86b85d80a2..ea447d8d46 100644--- a/mobile/apps/photos/lib/utils/hierarchical_search_util.dart+++ b/mobile/apps/photos/lib/utils/hierarchical_search_util.dart@@ -392,7 +392,7 @@ Future<List<LocationFilter>> _curateLocationFilters() async {final locationFilters = <LocationFilter>[];final locationTagToOccurrence = await locationService- .getLocationTagsToOccurance(files);+ .getLocationTagsToOccurrence(files);for (LocationTag locationTag in locationTagToOccurrence.keys) {locationFilters.add(diff --git a/mobile/apps/photos/test/ui/viewer/gallery/collection_page_cover_test.dart b/mobile/apps/photos/test/ui/viewer/gallery/collection_page_cover_test.dartindex 8f889cf5bb..27147acef7 100644--- a/mobile/apps/photos/test/ui/viewer/gallery/collection_page_cover_test.dart+++ b/mobile/apps/photos/test/ui/viewer/gallery/collection_page_cover_test.dart@@ -69,7 +69,7 @@ import "package:photos/ui/viewer/gallery/state/gallery_boundaries_provider.dart"import "package:photos/ui/viewer/gallery/state/gallery_files_inherited_widget.dart";import "package:photos/ui/viewer/gallery/state/inherited_search_filter_data.dart";import "package:photos/ui/viewer/gallery/state/search_filter_data_provider.dart";-import "package:photos/ui/viewer/hierarchicial_search/app_bar_filter_chips.dart";+import "package:photos/ui/viewer/hierarchical_search/app_bar_filter_chips.dart";import "package:photos/ui/viewer/people/person_face_widget.dart";import "package:photos/ui/viewer/search/result/magic_result_screen.dart";import "package:photos/utils/face/face_thumbnail_cache.dart";diff --git a/mobile/apps/photos/test/ui/viewer/hierarchicial_search/app_bar_filter_chips_test.dart b/mobile/apps/photos/test/ui/viewer/hierarchical_search/app_bar_filter_chips_test.dartsimilarity index 90%rename from mobile/apps/photos/test/ui/viewer/hierarchicial_search/app_bar_filter_chips_test.dartrename to mobile/apps/photos/test/ui/viewer/hierarchical_search/app_bar_filter_chips_test.dartindex 88e2778a76..d70683e48e 100644--- a/mobile/apps/photos/test/ui/viewer/hierarchicial_search/app_bar_filter_chips_test.dart+++ b/mobile/apps/photos/test/ui/viewer/hierarchical_search/app_bar_filter_chips_test.dart@@ -1,6 +1,6 @@import "package:flutter/material.dart";import "package:flutter_test/flutter_test.dart";-import "package:photos/ui/viewer/hierarchicial_search/app_bar_filter_chips.dart";+import "package:photos/ui/viewer/hierarchical_search/app_bar_filter_chips.dart";void main() {testWidgets("AppBarFilterChips expands heights with scaled text", (diff --git a/mobile/packages/legacy/lib/pages/emergency_page.dart b/mobile/packages/legacy/lib/pages/emergency_page.dartindex 6deb627ca7..5876b5215b 100644--- a/mobile/packages/legacy/lib/pages/emergency_page.dart+++ b/mobile/packages/legacy/lib/pages/emergency_page.dart@@ -15,7 +15,7 @@ import "package:ente_legacy/pages/legacy_kit_intro_page.dart";import "package:ente_legacy/pages/other_contact_page.dart";import "package:ente_legacy/pages/select_contact_page.dart";import "package:ente_legacy/pages/share_legacy_kit_page.dart";-import "package:ente_sharing/user_avator_widget.dart";+import "package:ente_sharing/user_avatar_widget.dart";import "package:ente_strings/ente_strings.dart";import "package:ente_ui/components/alert_bottom_sheet.dart";import "package:ente_ui/components/captioned_text_widget_v2.dart";diff --git a/mobile/packages/legacy/lib/pages/select_contact_page.dart b/mobile/packages/legacy/lib/pages/select_contact_page.dartindex 02875bf457..27e5aa95c5 100644--- a/mobile/packages/legacy/lib/pages/select_contact_page.dart+++ b/mobile/packages/legacy/lib/pages/select_contact_page.dart@@ -10,7 +10,7 @@ import "package:ente_pure_utils/ente_pure_utils.dart";import "package:ente_sharing/components/invite_dialog.dart";import "package:ente_sharing/extensions/user_extension.dart";import "package:ente_sharing/models/user.dart";-import "package:ente_sharing/user_avator_widget.dart";+import "package:ente_sharing/user_avatar_widget.dart";import "package:ente_sharing/verify_identity_dialog.dart";import "package:ente_strings/ente_strings.dart";import "package:ente_ui/components/alert_bottom_sheet.dart";diff --git a/mobile/packages/sharing/lib/user_avator_widget.dart b/mobile/packages/sharing/lib/user_avatar_widget.dartsimilarity index 100%rename from mobile/packages/sharing/lib/user_avator_widget.dartrename to mobile/packages/sharing/lib/user_avatar_widget.dartdiff --git a/mobile/packages/sharing/test/user_avator_widget_test.dart b/mobile/packages/sharing/test/user_avatar_widget_test.dartsimilarity index 98%rename from mobile/packages/sharing/test/user_avator_widget_test.dartrename to mobile/packages/sharing/test/user_avatar_widget_test.dartindex 344e853fdb..12830278ef 100644--- a/mobile/packages/sharing/test/user_avator_widget_test.dart+++ b/mobile/packages/sharing/test/user_avatar_widget_test.dart@@ -5,7 +5,7 @@ import 'package:ente_configuration/base_configuration.dart';import 'package:ente_contacts/contacts.dart';import 'package:ente_sharing/models/user.dart';import 'package:ente_sharing/resolved_user_builder.dart';-import 'package:ente_sharing/user_avator_widget.dart';+import 'package:ente_sharing/user_avatar_widget.dart';import 'package:flutter/material.dart';import 'package:flutter_test/flutter_test.dart';diff --git a/server/ente/errors.go b/server/ente/errors.goindex 705efb8bd7..37f37bc998 100644--- a/server/ente/errors.go+++ b/server/ente/errors.go@@ -253,7 +253,7 @@ const (NotFoundError ErrorCode = "NOT_FOUND"- FamiliySizeLimitExceeded ErrorCode = "FAMILY_SIZE_LIMIT_EXCEEDED"+ FamilySizeLimitExceeded ErrorCode = "FAMILY_SIZE_LIMIT_EXCEEDED"UserSignupIncomplete ErrorCode = "USER_SIGNUP_INCOMPLETE"diff --git a/server/ente/public_collection.go b/server/ente/public_collection.goindex 1b977db3f3..e721f025a1 100644--- a/server/ente/public_collection.go+++ b/server/ente/public_collection.go@@ -199,7 +199,7 @@ type AbuseReportDetails struct {}type ReporterAddress struct {- Stress string `json:"street" binding:"required"`+ Street string `json:"street" binding:"required"`City string `json:"city" binding:"required"`State string `json:"state" binding:"required"`Country string `json:"country" binding:"required"`diff --git a/server/pkg/api/admin_listmonk.go b/server/pkg/api/admin_listmonk.goindex 5f8ee6da7d..521282e09c 100644--- a/server/pkg/api/admin_listmonk.go+++ b/server/pkg/api/admin_listmonk.go@@ -25,9 +25,9 @@ const listmonkMissingSubscribersDefaultPageSize = 10000const listmonkMissingSubscribersMaxLoggedEmails = 10const listmonkMissingSubscribersMaxUnsubscribeAttempts = 500-var listminkMissingSubscribersInFlight atomic.Bool+var listmonkMissingSubscribersInFlight atomic.Bool-type listminkMissingSubscribersJobConfig struct {+type listmonkMissingSubscribersJobConfig struct {Endpoint stringUsername stringPassword string@@ -39,7 +39,7 @@ type listminkMissingSubscribersJobConfig struct {TargetListIDSet map[int]struct{}}-type listminkMissingSubscribersJobSummary struct {+type listmonkMissingSubscribersJobSummary struct {StartedAt int64CompletedAt int64MissingCount int@@ -147,7 +147,7 @@ func (h *AdminHandler) GetListmonkMissingSubscribersCount(c *gin.Context) {return}- if !listminkMissingSubscribersInFlight.CompareAndSwap(false, true) {+ if !listmonkMissingSubscribersInFlight.CompareAndSwap(false, true) {logger.Warn("listmonk missing-subscribers job already in progress on this host")c.JSON(http.StatusConflict, gin.H{"error": "listmonk missing-subscribers processing is already in progress on this host",@@ -160,7 +160,7 @@ func (h *AdminHandler) GetListmonkMissingSubscribersCount(c *gin.Context) {targetListSet[listID] = struct{}{}}- jobConfig := listminkMissingSubscribersJobConfig{+ jobConfig := listmonkMissingSubscribersJobConfig{Endpoint: baseURL + "/api/subscribers",Username: username,Password: password,@@ -172,7 +172,7 @@ func (h *AdminHandler) GetListmonkMissingSubscribersCount(c *gin.Context) {TargetListIDSet: targetListSet,}- go h.runListminkMissingSubscribersJobAsync(logger, jobConfig)+ go h.runListmonkMissingSubscribersJobAsync(logger, jobConfig)responsePayload := gin.H{"status": "started",@@ -187,7 +187,7 @@ func (h *AdminHandler) GetListmonkMissingSubscribersCount(c *gin.Context) {c.JSON(http.StatusAccepted, responsePayload)}-func (h *AdminHandler) runListminkMissingSubscribersJobAsync(logger *logrus.Entry, cfg listminkMissingSubscribersJobConfig) {+func (h *AdminHandler) runListmonkMissingSubscribersJobAsync(logger *logrus.Entry, cfg listmonkMissingSubscribersJobConfig) {defer func() {if r := recover(); r != nil {logger.WithField("panic", r).Error("listmonk missing-subscribers async job panicked")@@ -195,11 +195,11 @@ func (h *AdminHandler) runListminkMissingSubscribersJobAsync(logger *logrus.Entrh.DiscordController.Notify(fmt.Sprintf("Listmonk missing-subscribers job panicked on `%s`", h.DiscordController.HostName))}}- listminkMissingSubscribersInFlight.Store(false)+ listmonkMissingSubscribersInFlight.Store(false)}()logger.Info("starting listmonk missing-subscribers async job")- summary, err := h.runListminkMissingSubscribersJob(cfg, logger)+ summary, err := h.runListmonkMissingSubscribersJob(cfg, logger)if err != nil {logger.WithError(err).Error("listmonk missing-subscribers async job failed")if h.DiscordController != nil {@@ -251,8 +251,8 @@ func (h *AdminHandler) runListminkMissingSubscribersJobAsync(logger *logrus.Entr}}-func (h *AdminHandler) runListminkMissingSubscribersJob(cfg listminkMissingSubscribersJobConfig, logger *logrus.Entry) (listminkMissingSubscribersJobSummary, error) {- summary := listminkMissingSubscribersJobSummary{+func (h *AdminHandler) runListmonkMissingSubscribersJob(cfg listmonkMissingSubscribersJobConfig, logger *logrus.Entry) (listmonkMissingSubscribersJobSummary, error) {+ summary := listmonkMissingSubscribersJobSummary{StartedAt: time.Microseconds(),StopReason: "exhausted_pages",UnsubscribeMissing: cfg.UnsubscribeMissing,diff --git a/server/pkg/api/authenticator.go b/server/pkg/api/authenticator.goindex 0bf81a72dd..a0b1ba45be 100644--- a/server/pkg/api/authenticator.go+++ b/server/pkg/api/authenticator.go@@ -6,7 +6,7 @@ import ("github.com/ente/museum/ente"model "github.com/ente/museum/ente/authenticator"- authenticaor "github.com/ente/museum/pkg/controller/authenticator"+ "github.com/ente/museum/pkg/controller/authenticator""github.com/ente/museum/pkg/utils/handler""github.com/ente/stacktrace""github.com/gin-gonic/gin"@@ -14,7 +14,7 @@ import ()type AuthenticatorHandler struct {- Controller *authenticaor.Controller+ Controller *authenticator.Controller}func (h *AuthenticatorHandler) CreateKey(c *gin.Context) {diff --git a/server/pkg/controller/authenticator/controller.go b/server/pkg/controller/authenticator/controller.goindex 5dbed8a831..ecf43cd88a 100644--- a/server/pkg/controller/authenticator/controller.go+++ b/server/pkg/controller/authenticator/controller.go@@ -1,4 +1,4 @@-package authenticaor+package authenticatorimport ("errors"diff --git a/server/pkg/controller/trash_file_metadata.go b/server/pkg/controller/trash_file_metadata.goindex c74c781f2d..a4b2282015 100644--- a/server/pkg/controller/trash_file_metadata.go+++ b/server/pkg/controller/trash_file_metadata.go@@ -34,7 +34,7 @@ func (t *TrashController) DropFileMetadataCron() {logger.WithError(releaseErr).Error("Error while releasing lock")}}()- items, err := t.QueueRepo.GetItemsReadyForDeletion(repo.DropFileEncMedataQueue, 10)+ items, err := t.QueueRepo.GetItemsReadyForDeletion(repo.DropFileEncMetadataQueue, 10)if err != nil {logger.WithError(err).Error("getItemsReadyForDeletion failed")return@@ -42,14 +42,14 @@ func (t *TrashController) DropFileMetadataCron() {if len(items) == 0 {logger.Info("add entry for dropping fileMetadata")// insert entry with 0 as the last epochTime till when metadata is dropped.- err = t.QueueRepo.InsertItem(context.Background(), repo.DropFileEncMedataQueue, "0")+ err = t.QueueRepo.InsertItem(context.Background(), repo.DropFileEncMetadataQueue, "0")if err != nil {logger.WithError(err).Error("failed to insert entry")}return}if len(items) > 1 {- logger.Error(fmt.Sprintf("queue %s should not have more than one entry", repo.DropFileEncMedataQueue))+ logger.Error(fmt.Sprintf("queue %s should not have more than one entry", repo.DropFileEncMetadataQueue))}qItem := items[0]droppedMetadataTill, parseErr := strconv.ParseInt(qItem.Item, 10, 64)@@ -84,7 +84,7 @@ func (t *TrashController) DropFileMetadataCron() {ctxLogger.WithError(err).Error("failed to scrub data")return}- updateErr := t.QueueRepo.UpdateItem(ctx, repo.DropFileEncMedataQueue, qItem.Id, strconv.FormatInt(maxUpdatedAt, 10))+ updateErr := t.QueueRepo.UpdateItem(ctx, repo.DropFileEncMetadataQueue, qItem.Id, strconv.FormatInt(maxUpdatedAt, 10))if updateErr != nil {ctxLogger.WithError(updateErr).Error("failed to update queueItem")returndiff --git a/server/pkg/controller/userentity/controller.go b/server/pkg/controller/userentity/controller.goindex 7d7d7dc470..6557577bbf 100644--- a/server/pkg/controller/userentity/controller.go+++ b/server/pkg/controller/userentity/controller.go@@ -1,4 +1,4 @@-package authenticaor+package userentityimport ("github.com/ente/museum/ente"diff --git a/server/pkg/repo/queue.go b/server/pkg/repo/queue.goindex 7e298a176a..f242a42823 100644--- a/server/pkg/repo/queue.go+++ b/server/pkg/repo/queue.go@@ -18,7 +18,7 @@ type QueueRepository struct {// Negative delays make items immediately eligible.var itemDeletionDelayInMinMap = map[string]int64{- DropFileEncMedataQueue: -1 * 24 * 60,+ DropFileEncMetadataQueue: -1 * 24 * 60,DeleteObjectQueue: 45 * 24 * 60,DeleteEmbeddingsQueue: -1 * 24 * 60,OutdatedObjectsQueue: -1 * 24 * 60,@@ -30,7 +30,7 @@ var itemDeletionDelayInMinMap = map[string]int64{}const (- DropFileEncMedataQueue string = "dropFileEncMetata"+ DropFileEncMetadataQueue string = "dropFileEncMetata"DeleteObjectQueue string = "deleteObject"DeleteEmbeddingsQueue string = "deleteEmbedding"OutdatedObjectsQueue string = "outdatedObject"diff --git a/server/pkg/repo/two_factor_recovery/repository.go b/server/pkg/repo/two_factor_recovery/repository.goindex 500d9d4021..fa481f99c2 100644--- a/server/pkg/repo/two_factor_recovery/repository.go+++ b/server/pkg/repo/two_factor_recovery/repository.go@@ -57,13 +57,13 @@ func (r *Repository) GetPasskeyRecoveryData(ctx context.Context, userID int64) (}func (r *Repository) ValidatePasskeyRecoverySecret(userID int64, secret string) (bool, error) {- var severSecreteData, serverSecretNonce []byte+ var serverSecretData, serverSecretNonce []byterow := r.Db.QueryRow(`SELECT server_passkey_secret_data, server_passkey_secret_nonce FROM two_factor_recovery WHERE user_id = $1`, userID)- err := row.Scan(&severSecreteData, &serverSecretNonce)+ err := row.Scan(&serverSecretData, &serverSecretNonce)if err != nil {return false, stacktrace.Propagate(err, "")}- serverSkipSecretKey, decErr := crypto.Decrypt(severSecreteData, r.SecretEncryptionKey, serverSecretNonce)+ serverSkipSecretKey, decErr := crypto.Decrypt(serverSecretData, r.SecretEncryptionKey, serverSecretNonce)if decErr != nil {return false, stacktrace.Propagate(decErr, "failed to decrypt passkey reset key")}