rename variable

mobile/ios/Podfile.lock

@@ -17,9 +17,6 @@ PODS:
   - fluttertoast (0.0.2):
     - Flutter
     - Toast
-  - FMDB (2.7.5):
-    - FMDB/standard (= 2.7.5)
-  - FMDB/standard (2.7.5)
   - geolocator_apple (1.2.0):
     - Flutter
   - image_picker_ios (0.0.1):
@@ -39,7 +36,7 @@ PODS:
     - FlutterMacOS
   - path_provider_ios (0.0.1):
     - Flutter
-  - permission_handler_apple (9.1.1):
+  - permission_handler_apple (9.3.0):
     - Flutter
   - photo_manager (2.0.0):
     - Flutter
@@ -53,7 +50,7 @@ PODS:
     - FlutterMacOS
   - sqflite (0.0.3):
     - Flutter
-    - FMDB (>= 2.7.5)
+    - FlutterMacOS
   - Toast (4.0.0)
   - url_launcher_ios (0.0.1):
     - Flutter
@@ -84,14 +81,13 @@ DEPENDENCIES:
   - photo_manager (from `.symlinks/plugins/photo_manager/ios`)
   - share_plus (from `.symlinks/plugins/share_plus/ios`)
   - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
-  - sqflite (from `.symlinks/plugins/sqflite/ios`)
+  - sqflite (from `.symlinks/plugins/sqflite/darwin`)
   - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
   - video_player_avfoundation (from `.symlinks/plugins/video_player_avfoundation/darwin`)
   - wakelock_plus (from `.symlinks/plugins/wakelock_plus/ios`)
 
 SPEC REPOS:
   trunk:
-    - FMDB
     - MapLibre
     - ReachabilitySwift
     - SAMKeychain
@@ -139,7 +135,7 @@ EXTERNAL SOURCES:
   shared_preferences_foundation:
     :path: ".symlinks/plugins/shared_preferences_foundation/darwin"
   sqflite:
-    :path: ".symlinks/plugins/sqflite/ios"
+    :path: ".symlinks/plugins/sqflite/darwin"
   url_launcher_ios:
     :path: ".symlinks/plugins/url_launcher_ios/ios"
   video_player_avfoundation:
@@ -155,24 +151,23 @@ SPEC CHECKSUMS:
   flutter_native_splash: 52501b97d1c0a5f898d687f1646226c1f93c56ef
   flutter_udid: a2482c67a61b9c806ef59dd82ed8d007f1b7ac04
   flutter_web_auth: c25208760459cec375a3c39f6a8759165ca0fa4d
-  fluttertoast: 31b00dabfa7fb7bacd9e7dbee580d7a2ff4bf265
-  FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
+  fluttertoast: fafc4fa4d01a6a9e4f772ecd190ffa525e9e2d9c
   geolocator_apple: 9157311f654584b9bb72686c55fc02a97b73f461
-  image_picker_ios: 4a8aadfbb6dc30ad5141a2ce3832af9214a705b5
+  image_picker_ios: 99dfe1854b4fa34d0364e74a78448a0151025425
   integration_test: 13825b8a9334a850581300559b8839134b124670
   isar_flutter_libs: b69f437aeab9c521821c3f376198c4371fa21073
   MapLibre: 620fc933c1d6029b33738c905c1490d024e5d4ef
   maplibre_gl: a2efec727dd340e4c65e26d2b03b584f14881fd9
   package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85
-  path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943
+  path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c
   path_provider_ios: 14f3d2fd28c4fdb42f44e0f751d12861c43cee02
-  permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6
+  permission_handler_apple: 036b856153a2b1f61f21030ff725f3e6fece2b78
   photo_manager: 4f6810b7dfc4feb03b461ac1a70dacf91fba7604
   ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
   SAMKeychain: 483e1c9f32984d50ca961e26818a534283b4cd5c
   share_plus: c3fef564749587fc939ef86ffb283ceac0baf9f5
-  shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126
-  sqflite: 31f7eba61e3074736dff8807a9b41581e4f7f15a
+  shared_preferences_foundation: b4c3b4cddf1c21f02770737f147a3f5da9d39695
+  sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec
   Toast: 91b396c56ee72a5790816f40d3a94dd357abc196
   url_launcher_ios: bbd758c6e7f9fd7b5b1d4cde34d2b95fcce5e812
   video_player_avfoundation: 02011213dab73ae3687df27ce441fbbcc82b5579
@@ -180,4 +175,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 64c9b5291666c0ca3caabdfe9865c141ac40321d
 
-COCOAPODS: 1.15.2
+COCOAPODS: 1.12.1

mobile/lib/modules/home/ui/asset_grid/immich_asset_grid.dart

@@ -42,7 +42,7 @@ class ImmichAssetGrid extends HookConsumerWidget {
     this.assetsPerRow,
     this.showStorageIndicator,
     this.listener,
-    this.margin = 2.0,
+    this.margin = 5.0,
     this.selectionActive = false,
     this.preselectedAssets,
     this.canDeselect = true,

mobile/lib/modules/search/models/curated_content.dart

@@ -1,60 +1,15 @@
-// ignore_for_file: public_member_api_docs, sort_constructors_first
-import 'dart:convert';
-
-/// A wrapper for [CuratedLocationsResponseDto] objects
-/// and [CuratedObjectsResponseDto] to be displayed in
-/// a view
-class CuratedContent {
-  /// The label to show associated with this curated object
-  final String label;
-
-  /// The id to lookup the asset from the server
-  final String id;
-
-  CuratedContent({
-    required this.label,
-    required this.id,
-  });
-
-  CuratedContent copyWith({
-    String? label,
-    String? id,
-  }) {
-    return CuratedContent(
-      label: label ?? this.label,
-      id: id ?? this.id,
-    );
-  }
-
-  Map<String, dynamic> toMap() {
-    return <String, dynamic>{
-      'label': label,
-      'id': id,
-    };
-  }
-
-  factory CuratedContent.fromMap(Map<String, dynamic> map) {
-    return CuratedContent(
-      label: map['label'] as String,
-      id: map['id'] as String,
-    );
-  }
-
-  String toJson() => json.encode(toMap());
-
-  factory CuratedContent.fromJson(String source) =>
-      CuratedContent.fromMap(json.decode(source) as Map<String, dynamic>);
-
-  @override
-  String toString() => 'CuratedContent(label: $label, id: $id)';
-
-  @override
-  bool operator ==(covariant CuratedContent other) {
-    if (identical(this, other)) return true;
-
-    return other.label == label && other.id == id;
-  }
-
-  @override
-  int get hashCode => label.hashCode ^ id.hashCode;
-}
+/// A wrapper for [CuratedLocationsResponseDto] objects
+/// and [CuratedObjectsResponseDto] to be displayed in
+/// a view
+class CuratedContent {
+  /// The label to show associated with this curated object
+  final String label;
+
+  /// The id to lookup the asset from the server
+  final String id;
+
+  CuratedContent({
+    required this.id,
+    required this.label,
+  });
+}

mobile/lib/modules/search/models/search_filter.dart

@@ -1,310 +0,0 @@
-// ignore_for_file: public_member_api_docs, sort_constructors_first
-import 'dart:convert';
-
-import 'package:immich_mobile/shared/models/asset.dart';
-import 'package:openapi/api.dart';
-
-class SearchLocationFilter {
-  String? country;
-  String? state;
-  String? city;
-  SearchLocationFilter({
-    this.country,
-    this.state,
-    this.city,
-  });
-
-  SearchLocationFilter copyWith({
-    String? country,
-    String? state,
-    String? city,
-  }) {
-    return SearchLocationFilter(
-      country: country ?? this.country,
-      state: state ?? this.state,
-      city: city ?? this.city,
-    );
-  }
-
-  Map<String, dynamic> toMap() {
-    return <String, dynamic>{
-      'country': country,
-      'state': state,
-      'city': city,
-    };
-  }
-
-  factory SearchLocationFilter.fromMap(Map<String, dynamic> map) {
-    return SearchLocationFilter(
-      country: map['country'] != null ? map['country'] as String : null,
-      state: map['state'] != null ? map['state'] as String : null,
-      city: map['city'] != null ? map['city'] as String : null,
-    );
-  }
-
-  String toJson() => json.encode(toMap());
-
-  factory SearchLocationFilter.fromJson(String source) =>
-      SearchLocationFilter.fromMap(json.decode(source) as Map<String, dynamic>);
-
-  @override
-  String toString() =>
-      'SearchLocationFilter(country: $country, state: $state, city: $city)';
-
-  @override
-  bool operator ==(covariant SearchLocationFilter other) {
-    if (identical(this, other)) return true;
-
-    return other.country == country &&
-        other.state == state &&
-        other.city == city;
-  }
-
-  @override
-  int get hashCode => country.hashCode ^ state.hashCode ^ city.hashCode;
-}
-
-class SearchCameraFilter {
-  String? make;
-  String? model;
-  SearchCameraFilter({
-    this.make,
-    this.model,
-  });
-
-  SearchCameraFilter copyWith({
-    String? make,
-    String? model,
-  }) {
-    return SearchCameraFilter(
-      make: make ?? this.make,
-      model: model ?? this.model,
-    );
-  }
-
-  Map<String, dynamic> toMap() {
-    return <String, dynamic>{
-      'make': make,
-      'model': model,
-    };
-  }
-
-  factory SearchCameraFilter.fromMap(Map<String, dynamic> map) {
-    return SearchCameraFilter(
-      make: map['make'] != null ? map['make'] as String : null,
-      model: map['model'] != null ? map['model'] as String : null,
-    );
-  }
-
-  String toJson() => json.encode(toMap());
-
-  factory SearchCameraFilter.fromJson(String source) =>
-      SearchCameraFilter.fromMap(json.decode(source) as Map<String, dynamic>);
-
-  @override
-  String toString() => 'SearchCameraFilter(make: $make, model: $model)';
-
-  @override
-  bool operator ==(covariant SearchCameraFilter other) {
-    if (identical(this, other)) return true;
-
-    return other.make == make && other.model == model;
-  }
-
-  @override
-  int get hashCode => make.hashCode ^ model.hashCode;
-}
-
-class SearchDateFilter {
-  DateTime? takenBefore;
-  DateTime? takenAfter;
-  SearchDateFilter({
-    this.takenBefore,
-    this.takenAfter,
-  });
-
-  SearchDateFilter copyWith({
-    DateTime? takenBefore,
-    DateTime? takenAfter,
-  }) {
-    return SearchDateFilter(
-      takenBefore: takenBefore ?? this.takenBefore,
-      takenAfter: takenAfter ?? this.takenAfter,
-    );
-  }
-
-  Map<String, dynamic> toMap() {
-    return <String, dynamic>{
-      'takenBefore': takenBefore?.millisecondsSinceEpoch,
-      'takenAfter': takenAfter?.millisecondsSinceEpoch,
-    };
-  }
-
-  factory SearchDateFilter.fromMap(Map<String, dynamic> map) {
-    return SearchDateFilter(
-      takenBefore: map['takenBefore'] != null
-          ? DateTime.fromMillisecondsSinceEpoch(map['takenBefore'] as int)
-          : null,
-      takenAfter: map['takenAfter'] != null
-          ? DateTime.fromMillisecondsSinceEpoch(map['takenAfter'] as int)
-          : null,
-    );
-  }
-
-  String toJson() => json.encode(toMap());
-
-  factory SearchDateFilter.fromJson(String source) =>
-      SearchDateFilter.fromMap(json.decode(source) as Map<String, dynamic>);
-
-  @override
-  String toString() =>
-      'SearchDateFilter(takenBefore: $takenBefore, takenAfter: $takenAfter)';
-
-  @override
-  bool operator ==(covariant SearchDateFilter other) {
-    if (identical(this, other)) return true;
-
-    return other.takenBefore == takenBefore && other.takenAfter == takenAfter;
-  }
-
-  @override
-  int get hashCode => takenBefore.hashCode ^ takenAfter.hashCode;
-}
-
-class SearchDisplayFilters {
-  bool isNotInAlbum = false;
-  bool isArchive = false;
-  bool isFavorite = false;
-  SearchDisplayFilters({
-    required this.isNotInAlbum,
-    required this.isArchive,
-    required this.isFavorite,
-  });
-
-  SearchDisplayFilters copyWith({
-    bool? isNotInAlbum,
-    bool? isArchive,
-    bool? isFavorite,
-  }) {
-    return SearchDisplayFilters(
-      isNotInAlbum: isNotInAlbum ?? this.isNotInAlbum,
-      isArchive: isArchive ?? this.isArchive,
-      isFavorite: isFavorite ?? this.isFavorite,
-    );
-  }
-
-  Map<String, dynamic> toMap() {
-    return <String, dynamic>{
-      'isNotInAlbum': isNotInAlbum,
-      'isArchive': isArchive,
-      'isFavorite': isFavorite,
-    };
-  }
-
-  factory SearchDisplayFilters.fromMap(Map<String, dynamic> map) {
-    return SearchDisplayFilters(
-      isNotInAlbum: map['isNotInAlbum'] as bool,
-      isArchive: map['isArchive'] as bool,
-      isFavorite: map['isFavorite'] as bool,
-    );
-  }
-
-  String toJson() => json.encode(toMap());
-
-  factory SearchDisplayFilters.fromJson(String source) =>
-      SearchDisplayFilters.fromMap(json.decode(source) as Map<String, dynamic>);
-
-  @override
-  String toString() =>
-      'SearchDisplayFilters(isNotInAlbum: $isNotInAlbum, isArchive: $isArchive, isFavorite: $isFavorite)';
-
-  @override
-  bool operator ==(covariant SearchDisplayFilters other) {
-    if (identical(this, other)) return true;
-
-    return other.isNotInAlbum == isNotInAlbum &&
-        other.isArchive == isArchive &&
-        other.isFavorite == isFavorite;
-  }
-
-  @override
-  int get hashCode =>
-      isNotInAlbum.hashCode ^ isArchive.hashCode ^ isFavorite.hashCode;
-}
-
-class SearchFilter {
-  String? context;
-  String? filename;
-  Set<PersonResponseDto> people;
-  SearchLocationFilter location;
-  SearchCameraFilter camera;
-  SearchDateFilter date;
-  SearchDisplayFilters display;
-
-  // Enum
-  AssetType mediaType;
-
-  SearchFilter({
-    this.context,
-    this.filename,
-    required this.people,
-    required this.location,
-    required this.camera,
-    required this.date,
-    required this.display,
-    required this.mediaType,
-  });
-
-  SearchFilter copyWith({
-    String? context,
-    String? filename,
-    Set<PersonResponseDto>? people,
-    SearchLocationFilter? location,
-    SearchCameraFilter? camera,
-    SearchDateFilter? date,
-    SearchDisplayFilters? display,
-    AssetType? mediaType,
-  }) {
-    return SearchFilter(
-      context: context ?? this.context,
-      filename: filename ?? this.filename,
-      people: people ?? this.people,
-      location: location ?? this.location,
-      camera: camera ?? this.camera,
-      date: date ?? this.date,
-      display: display ?? this.display,
-      mediaType: mediaType ?? this.mediaType,
-    );
-  }
-
-  @override
-  String toString() {
-    return 'SearchFilter(context: $context, filename: $filename, people: $people, location: $location, camera: $camera, date: $date, display: $display, mediaType: $mediaType)';
-  }
-
-  @override
-  bool operator ==(covariant SearchFilter other) {
-    if (identical(this, other)) return true;
-
-    return other.context == context &&
-        other.filename == filename &&
-        other.people == people &&
-        other.location == location &&
-        other.camera == camera &&
-        other.date == date &&
-        other.display == display &&
-        other.mediaType == mediaType;
-  }
-
-  @override
-  int get hashCode {
-    return context.hashCode ^
-        filename.hashCode ^
-        people.hashCode ^
-        location.hashCode ^
-        camera.hashCode ^
-        date.hashCode ^
-        display.hashCode ^
-        mediaType.hashCode;
-  }
-}

mobile/lib/modules/search/providers/paginated_search.provider.dart

@@ -1,62 +0,0 @@
-import 'package:immich_mobile/modules/asset_viewer/providers/render_list.provider.dart';
-import 'package:immich_mobile/modules/home/ui/asset_grid/asset_grid_data_structure.dart';
-import 'package:immich_mobile/modules/search/models/search_filter.dart';
-import 'package:immich_mobile/modules/search/services/search.service.dart';
-import 'package:immich_mobile/shared/models/asset.dart';
-import 'package:riverpod_annotation/riverpod_annotation.dart';
-
-part 'paginated_search.provider.g.dart';
-
-@riverpod
-class PaginatedSearch extends _$PaginatedSearch {
-  Future<List<Asset>?> _search(SearchFilter filter, int page) async {
-    final service = ref.read(searchServiceProvider);
-    final result = await service.search(filter, page);
-
-    return result;
-  }
-
-  @override
-  Future<List<Asset>> build() async {
-    return [];
-  }
-
-  Future<List<Asset>> getNextPage(SearchFilter filter, int nextPage) async {
-    state = const AsyncValue.loading();
-
-    final newState = await AsyncValue.guard(() async {
-      final assets = await _search(filter, nextPage);
-
-      if (assets != null) {
-        return [...?state.value, ...assets];
-      }
-    });
-
-    state = newState.valueOrNull == null
-        ? const AsyncValue.data([])
-        : AsyncValue.data(newState.value!);
-
-    return newState.valueOrNull ?? [];
-  }
-
-  clear() {
-    state = const AsyncValue.data([]);
-  }
-}
-
-@riverpod
-AsyncValue<RenderList> paginatedSearchRenderList(
-  PaginatedSearchRenderListRef ref,
-) {
-  final assets = ref.watch(paginatedSearchProvider).value;
-
-  if (assets != null) {
-    return ref.watch(
-      renderListProviderWithGrouping(
-        (assets, GroupAssetsBy.none),
-      ),
-    );
-  } else {
-    return const AsyncValue.loading();
-  }
-}

mobile/lib/modules/search/providers/paginated_search.provider.g.dart

@@ -1,44 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'paginated_search.provider.dart';
-
-// **************************************************************************
-// RiverpodGenerator
-// **************************************************************************
-
-String _$paginatedSearchRenderListHash() =>
-    r'c2cc2381ee6ea8f8e08d6d4c1289bbf0c6b9647e';
-
-/// See also [paginatedSearchRenderList].
-@ProviderFor(paginatedSearchRenderList)
-final paginatedSearchRenderListProvider =
-    AutoDisposeProvider<AsyncValue<RenderList>>.internal(
-  paginatedSearchRenderList,
-  name: r'paginatedSearchRenderListProvider',
-  debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
-      ? null
-      : _$paginatedSearchRenderListHash,
-  dependencies: null,
-  allTransitiveDependencies: null,
-);
-
-typedef PaginatedSearchRenderListRef
-    = AutoDisposeProviderRef<AsyncValue<RenderList>>;
-String _$paginatedSearchHash() => r'8312f358261368cf2b5572b839fdd8f8fbe9a62e';
-
-/// See also [PaginatedSearch].
-@ProviderFor(PaginatedSearch)
-final paginatedSearchProvider =
-    AutoDisposeAsyncNotifierProvider<PaginatedSearch, List<Asset>>.internal(
-  PaginatedSearch.new,
-  name: r'paginatedSearchProvider',
-  debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
-      ? null
-      : _$paginatedSearchHash,
-  dependencies: null,
-  allTransitiveDependencies: null,
-);
-
-typedef _$PaginatedSearch = AutoDisposeAsyncNotifier<List<Asset>>;
-// ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member

mobile/lib/modules/search/providers/people.provider.dart

@@ -1,49 +1,51 @@
-import 'package:immich_mobile/modules/home/ui/asset_grid/asset_grid_data_structure.dart';
-import 'package:immich_mobile/modules/search/services/person.service.dart';
-import 'package:immich_mobile/modules/settings/providers/app_settings.provider.dart';
-import 'package:immich_mobile/modules/settings/services/app_settings.service.dart';
-import 'package:openapi/api.dart';
-import 'package:riverpod_annotation/riverpod_annotation.dart';
-
-part 'people.provider.g.dart';
-
-@riverpod
-Future<List<PersonResponseDto>> getAllPeople(
-  GetAllPeopleRef ref,
-) async {
-  final PersonService personService = ref.read(personServiceProvider);
-
-  final people = await personService.getAllPeople();
-
-  return people;
-}
-
-@riverpod
-Future<RenderList> personAssets(PersonAssetsRef ref, String personId) async {
-  final PersonService personService = ref.read(personServiceProvider);
-  final assets = await personService.getPersonAssets(personId);
-  if (assets == null) {
-    return RenderList.empty();
-  }
-
-  final settings = ref.read(appSettingsServiceProvider);
-  final groupBy =
-      GroupAssetsBy.values[settings.getSetting(AppSettingsEnum.groupAssetsBy)];
-  return await RenderList.fromAssets(assets, groupBy);
-}
-
-@riverpod
-Future<bool> updatePersonName(
-  UpdatePersonNameRef ref,
-  String personId,
-  String updatedName,
-) async {
-  final PersonService personService = ref.read(personServiceProvider);
-  final person = await personService.updateName(personId, updatedName);
-
-  if (person != null && person.name == updatedName) {
-    ref.invalidate(getAllPeopleProvider);
-    return true;
-  }
-  return false;
-}
+import 'package:immich_mobile/modules/home/ui/asset_grid/asset_grid_data_structure.dart';
+import 'package:immich_mobile/modules/search/models/curated_content.dart';
+import 'package:immich_mobile/modules/search/services/person.service.dart';
+import 'package:immich_mobile/modules/settings/providers/app_settings.provider.dart';
+import 'package:immich_mobile/modules/settings/services/app_settings.service.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
+
+part 'people.provider.g.dart';
+
+@riverpod
+Future<List<CuratedContent>> getCuratedPeople(
+  GetCuratedPeopleRef ref,
+) async {
+  final PersonService personService = ref.read(personServiceProvider);
+
+  final curatedPeople = await personService.getCuratedPeople();
+
+  return curatedPeople
+      .map((p) => CuratedContent(id: p.id, label: p.name))
+      .toList();
+}
+
+@riverpod
+Future<RenderList> personAssets(PersonAssetsRef ref, String personId) async {
+  final PersonService personService = ref.read(personServiceProvider);
+  final assets = await personService.getPersonAssets(personId);
+  if (assets == null) {
+    return RenderList.empty();
+  }
+
+  final settings = ref.read(appSettingsServiceProvider);
+  final groupBy =
+      GroupAssetsBy.values[settings.getSetting(AppSettingsEnum.groupAssetsBy)];
+  return await RenderList.fromAssets(assets, groupBy);
+}
+
+@riverpod
+Future<bool> updatePersonName(
+  UpdatePersonNameRef ref,
+  String personId,
+  String updatedName,
+) async {
+  final PersonService personService = ref.read(personServiceProvider);
+  final person = await personService.updateName(personId, updatedName);
+
+  if (person != null && person.name == updatedName) {
+    ref.invalidate(getCuratedPeopleProvider);
+    return true;
+  }
+  return false;
+}

mobile/lib/modules/search/providers/people.provider.g.dart

@@ -6,21 +6,23 @@ part of 'people.provider.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$getAllPeopleHash() => r'4eff6666be5a74710d1e8587e01d8154310d85bd';
+String _$getCuratedPeopleHash() => r'2a534553812abe69abce2c2e41aa62b8de16e9d0';
 
-/// See also [getAllPeople].
-@ProviderFor(getAllPeople)
-final getAllPeopleProvider =
-    AutoDisposeFutureProvider<List<PersonResponseDto>>.internal(
-  getAllPeople,
-  name: r'getAllPeopleProvider',
-  debugGetCreateSourceHash:
-      const bool.fromEnvironment('dart.vm.product') ? null : _$getAllPeopleHash,
+/// See also [getCuratedPeople].
+@ProviderFor(getCuratedPeople)
+final getCuratedPeopleProvider =
+    AutoDisposeFutureProvider<List<CuratedContent>>.internal(
+  getCuratedPeople,
+  name: r'getCuratedPeopleProvider',
+  debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
+      ? null
+      : _$getCuratedPeopleHash,
   dependencies: null,
   allTransitiveDependencies: null,
 );
 
-typedef GetAllPeopleRef = AutoDisposeFutureProviderRef<List<PersonResponseDto>>;
+typedef GetCuratedPeopleRef
+    = AutoDisposeFutureProviderRef<List<CuratedContent>>;
 String _$personAssetsHash() => r'1d6eff5ca3aa630b58c4dad9516193b21896984d';
 
 /// Copied from Dart SDK
@@ -170,7 +172,7 @@ class _PersonAssetsProviderElement
   String get personId => (origin as PersonAssetsProvider).personId;
 }
 
-String _$updatePersonNameHash() => r'7145aaaf6fc38fdafe3a283ebf3d3f4fd0774cd2';
+String _$updatePersonNameHash() => r'c7179a7cc558669c3b30b03fbca7782a42f2b6fd';
 
 /// See also [updatePersonName].
 @ProviderFor(updatePersonName)

mobile/lib/modules/search/providers/search_filter.provider.dart

@@ -1,27 +0,0 @@
-import 'package:immich_mobile/modules/search/services/search.service.dart';
-import 'package:openapi/api.dart';
-import 'package:riverpod_annotation/riverpod_annotation.dart';
-
-part 'search_filter.provider.g.dart';
-
-@riverpod
-Future<List<String>> getSearchSuggestions(
-  GetSearchSuggestionsRef ref,
-  SearchSuggestionType type, {
-  String? locationCountry,
-  String? locationState,
-  String? make,
-  String? model,
-}) async {
-  final SearchService service = ref.read(searchServiceProvider);
-
-  final suggestions = await service.getSearchSuggestions(
-    type,
-    country: locationCountry,
-    state: locationState,
-    make: make,
-    model: model,
-  );
-
-  return suggestions ?? [];
-}

mobile/lib/modules/search/providers/search_filter.provider.g.dart

@@ -1,229 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'search_filter.provider.dart';
-
-// **************************************************************************
-// RiverpodGenerator
-// **************************************************************************
-
-String _$getSearchSuggestionsHash() =>
-    r'bc1e9a1a060868f14e6eb970d2251dbfe39c6866';
-
-/// Copied from Dart SDK
-class _SystemHash {
-  _SystemHash._();
-
-  static int combine(int hash, int value) {
-    // ignore: parameter_assignments
-    hash = 0x1fffffff & (hash + value);
-    // ignore: parameter_assignments
-    hash = 0x1fffffff & (hash + ((0x0007ffff & hash) << 10));
-    return hash ^ (hash >> 6);
-  }
-
-  static int finish(int hash) {
-    // ignore: parameter_assignments
-    hash = 0x1fffffff & (hash + ((0x03ffffff & hash) << 3));
-    // ignore: parameter_assignments
-    hash = hash ^ (hash >> 11);
-    return 0x1fffffff & (hash + ((0x00003fff & hash) << 15));
-  }
-}
-
-/// See also [getSearchSuggestions].
-@ProviderFor(getSearchSuggestions)
-const getSearchSuggestionsProvider = GetSearchSuggestionsFamily();
-
-/// See also [getSearchSuggestions].
-class GetSearchSuggestionsFamily extends Family<AsyncValue<List<String>>> {
-  /// See also [getSearchSuggestions].
-  const GetSearchSuggestionsFamily();
-
-  /// See also [getSearchSuggestions].
-  GetSearchSuggestionsProvider call(
-    SearchSuggestionType type, {
-    String? locationCountry,
-    String? locationState,
-    String? make,
-    String? model,
-  }) {
-    return GetSearchSuggestionsProvider(
-      type,
-      locationCountry: locationCountry,
-      locationState: locationState,
-      make: make,
-      model: model,
-    );
-  }
-
-  @override
-  GetSearchSuggestionsProvider getProviderOverride(
-    covariant GetSearchSuggestionsProvider provider,
-  ) {
-    return call(
-      provider.type,
-      locationCountry: provider.locationCountry,
-      locationState: provider.locationState,
-      make: provider.make,
-      model: provider.model,
-    );
-  }
-
-  static const Iterable<ProviderOrFamily>? _dependencies = null;
-
-  @override
-  Iterable<ProviderOrFamily>? get dependencies => _dependencies;
-
-  static const Iterable<ProviderOrFamily>? _allTransitiveDependencies = null;
-
-  @override
-  Iterable<ProviderOrFamily>? get allTransitiveDependencies =>
-      _allTransitiveDependencies;
-
-  @override
-  String? get name => r'getSearchSuggestionsProvider';
-}
-
-/// See also [getSearchSuggestions].
-class GetSearchSuggestionsProvider
-    extends AutoDisposeFutureProvider<List<String>> {
-  /// See also [getSearchSuggestions].
-  GetSearchSuggestionsProvider(
-    SearchSuggestionType type, {
-    String? locationCountry,
-    String? locationState,
-    String? make,
-    String? model,
-  }) : this._internal(
-          (ref) => getSearchSuggestions(
-            ref as GetSearchSuggestionsRef,
-            type,
-            locationCountry: locationCountry,
-            locationState: locationState,
-            make: make,
-            model: model,
-          ),
-          from: getSearchSuggestionsProvider,
-          name: r'getSearchSuggestionsProvider',
-          debugGetCreateSourceHash:
-              const bool.fromEnvironment('dart.vm.product')
-                  ? null
-                  : _$getSearchSuggestionsHash,
-          dependencies: GetSearchSuggestionsFamily._dependencies,
-          allTransitiveDependencies:
-              GetSearchSuggestionsFamily._allTransitiveDependencies,
-          type: type,
-          locationCountry: locationCountry,
-          locationState: locationState,
-          make: make,
-          model: model,
-        );
-
-  GetSearchSuggestionsProvider._internal(
-    super._createNotifier, {
-    required super.name,
-    required super.dependencies,
-    required super.allTransitiveDependencies,
-    required super.debugGetCreateSourceHash,
-    required super.from,
-    required this.type,
-    required this.locationCountry,
-    required this.locationState,
-    required this.make,
-    required this.model,
-  }) : super.internal();
-
-  final SearchSuggestionType type;
-  final String? locationCountry;
-  final String? locationState;
-  final String? make;
-  final String? model;
-
-  @override
-  Override overrideWith(
-    FutureOr<List<String>> Function(GetSearchSuggestionsRef provider) create,
-  ) {
-    return ProviderOverride(
-      origin: this,
-      override: GetSearchSuggestionsProvider._internal(
-        (ref) => create(ref as GetSearchSuggestionsRef),
-        from: from,
-        name: null,
-        dependencies: null,
-        allTransitiveDependencies: null,
-        debugGetCreateSourceHash: null,
-        type: type,
-        locationCountry: locationCountry,
-        locationState: locationState,
-        make: make,
-        model: model,
-      ),
-    );
-  }
-
-  @override
-  AutoDisposeFutureProviderElement<List<String>> createElement() {
-    return _GetSearchSuggestionsProviderElement(this);
-  }
-
-  @override
-  bool operator ==(Object other) {
-    return other is GetSearchSuggestionsProvider &&
-        other.type == type &&
-        other.locationCountry == locationCountry &&
-        other.locationState == locationState &&
-        other.make == make &&
-        other.model == model;
-  }
-
-  @override
-  int get hashCode {
-    var hash = _SystemHash.combine(0, runtimeType.hashCode);
-    hash = _SystemHash.combine(hash, type.hashCode);
-    hash = _SystemHash.combine(hash, locationCountry.hashCode);
-    hash = _SystemHash.combine(hash, locationState.hashCode);
-    hash = _SystemHash.combine(hash, make.hashCode);
-    hash = _SystemHash.combine(hash, model.hashCode);
-
-    return _SystemHash.finish(hash);
-  }
-}
-
-mixin GetSearchSuggestionsRef on AutoDisposeFutureProviderRef<List<String>> {
-  /// The parameter `type` of this provider.
-  SearchSuggestionType get type;
-
-  /// The parameter `locationCountry` of this provider.
-  String? get locationCountry;
-
-  /// The parameter `locationState` of this provider.
-  String? get locationState;
-
-  /// The parameter `make` of this provider.
-  String? get make;
-
-  /// The parameter `model` of this provider.
-  String? get model;
-}
-
-class _GetSearchSuggestionsProviderElement
-    extends AutoDisposeFutureProviderElement<List<String>>
-    with GetSearchSuggestionsRef {
-  _GetSearchSuggestionsProviderElement(super.provider);
-
-  @override
-  SearchSuggestionType get type =>
-      (origin as GetSearchSuggestionsProvider).type;
-  @override
-  String? get locationCountry =>
-      (origin as GetSearchSuggestionsProvider).locationCountry;
-  @override
-  String? get locationState =>
-      (origin as GetSearchSuggestionsProvider).locationState;
-  @override
-  String? get make => (origin as GetSearchSuggestionsProvider).make;
-  @override
-  String? get model => (origin as GetSearchSuggestionsProvider).model;
-}
-// ignore_for_file: type=lint
-// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member

mobile/lib/modules/search/providers/search_result_page.provider.dart

@@ -0,0 +1,67 @@
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/modules/asset_viewer/providers/render_list.provider.dart';
+import 'package:immich_mobile/modules/home/ui/asset_grid/asset_grid_data_structure.dart';
+import 'package:immich_mobile/modules/search/models/search_result_page_state.model.dart';
+
+import 'package:immich_mobile/modules/search/services/search.service.dart';
+import 'package:immich_mobile/shared/models/asset.dart';
+
+class SearchResultPageNotifier extends StateNotifier<SearchResultPageState> {
+  SearchResultPageNotifier(this._searchService)
+      : super(
+          SearchResultPageState(
+            searchResult: [],
+            isError: false,
+            isLoading: true,
+            isSuccess: false,
+            isSmart: false,
+          ),
+        );
+
+  final SearchService _searchService;
+
+  Future<void> search(String searchTerm, {bool smartSearch = true}) async {
+    state = state.copyWith(
+      searchResult: [],
+      isError: false,
+      isLoading: true,
+      isSuccess: false,
+    );
+
+    List<Asset>? assets =
+        await _searchService.searchAsset(searchTerm, smartSearch: smartSearch);
+
+    if (assets != null) {
+      state = state.copyWith(
+        searchResult: assets,
+        isError: false,
+        isLoading: false,
+        isSuccess: true,
+        isSmart: smartSearch,
+      );
+    } else {
+      state = state.copyWith(
+        searchResult: [],
+        isError: true,
+        isLoading: false,
+        isSuccess: false,
+        isSmart: smartSearch,
+      );
+    }
+  }
+}
+
+final searchResultPageProvider =
+    StateNotifierProvider<SearchResultPageNotifier, SearchResultPageState>(
+        (ref) {
+  return SearchResultPageNotifier(ref.watch(searchServiceProvider));
+});
+
+final searchRenderListProvider = Provider((ref) {
+  final result = ref.watch(searchResultPageProvider);
+  return ref.watch(
+    renderListProviderWithGrouping(
+      (result.searchResult, result.isSmart ? GroupAssetsBy.none : null),
+    ),
+  );
+});

mobile/lib/modules/search/services/person.service.dart

@@ -20,7 +20,7 @@ class PersonService {
 
   PersonService(this._apiService, this._db);
 
-  Future<List<PersonResponseDto>> getAllPeople() async {
+  Future<List<PersonResponseDto>> getCuratedPeople() async {
     try {
       final peopleResponseDto = await _apiService.personApi.getAllPeople();
       return peopleResponseDto?.people ?? [];

mobile/lib/modules/search/services/search.service.dart

@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/modules/search/models/search_filter.dart';
 import 'package:immich_mobile/shared/models/asset.dart';
 import 'package:immich_mobile/shared/providers/api.provider.dart';
 import 'package:immich_mobile/shared/providers/db.provider.dart';
@@ -30,92 +29,25 @@ class SearchService {
     }
   }
 
-  Future<List<String>?> getSearchSuggestions(
-    SearchSuggestionType type, {
-    String? country,
-    String? state,
-    String? make,
-    String? model,
+  Future<List<Asset>?> searchAsset(
+    String searchTerm, {
+    bool smartSearch = true,
   }) async {
+    // TODO search in local DB: 1. when offline, 2. to find local assets
     try {
-      return await _apiService.searchApi.getSearchSuggestions(
-        type,
-        country: country,
-        state: state,
-        make: make,
-        model: model,
+      final SearchResponseDto? results = await _apiService.searchApi.search(
+        query: searchTerm,
+        smart: smartSearch,
       );
-    } catch (e) {
-      debugPrint("[ERROR] [getSearchSuggestions] ${e.toString()}");
-      return [];
-    }
-  }
-
-  Future<List<Asset>?> search(SearchFilter filter, int page) async {
-    try {
-      SearchResponseDto? response;
-      AssetTypeEnum? type;
-      if (filter.mediaType == AssetType.image) {
-        type = AssetTypeEnum.IMAGE;
-      } else if (filter.mediaType == AssetType.video) {
-        type = AssetTypeEnum.VIDEO;
-      }
-
-      if (filter.context != null && filter.context!.isNotEmpty) {
-        response = await _apiService.searchApi.searchSmart(
-          SmartSearchDto(
-            query: filter.context!,
-            country: filter.location.country,
-            state: filter.location.state,
-            city: filter.location.city,
-            make: filter.camera.make,
-            model: filter.camera.model,
-            takenAfter: filter.date.takenAfter,
-            takenBefore: filter.date.takenBefore,
-            isArchived: filter.display.isArchive,
-            isFavorite: filter.display.isFavorite,
-            isNotInAlbum: filter.display.isNotInAlbum,
-            personIds: filter.people.map((e) => e.id).toList(),
-            type: type,
-            page: page,
-            size: 1000,
-          ),
-        );
-      } else {
-        response = await _apiService.searchApi.searchMetadata(
-          MetadataSearchDto(
-            originalFileName:
-                filter.filename != null && filter.filename!.isNotEmpty
-                    ? filter.filename
-                    : null,
-            country: filter.location.country,
-            state: filter.location.state,
-            city: filter.location.city,
-            make: filter.camera.make,
-            model: filter.camera.model,
-            takenAfter: filter.date.takenAfter,
-            takenBefore: filter.date.takenBefore,
-            isArchived: filter.display.isArchive,
-            isFavorite: filter.display.isFavorite,
-            isNotInAlbum: filter.display.isNotInAlbum,
-            personIds: filter.people.map((e) => e.id).toList(),
-            type: type,
-            page: page,
-            size: 1000,
-          ),
-        );
-      }
-
-      if (response == null) {
+      if (results == null) {
         return null;
       }
-
-      return _db.assets
-          .getAllByRemoteId(response.assets.items.map((e) => e.id));
-    } catch (error) {
-      debugPrint("Error [search] $error");
+      // TODO local DB might be out of date; add assets not yet in DB?
+      return _db.assets.getAllByRemoteId(results.assets.items.map((e) => e.id));
+    } catch (e) {
+      debugPrint("[ERROR] [searchAsset] ${e.toString()}");
+      return null;
     }
-    return null;
   }
 
   Future<List<CuratedLocationsResponseDto>?> getCuratedLocation() async {

mobile/lib/modules/search/ui/explore_grid.dart

@@ -1,10 +1,8 @@
 import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:immich_mobile/modules/search/models/curated_content.dart';
-import 'package:immich_mobile/modules/search/models/search_filter.dart';
 import 'package:immich_mobile/modules/search/ui/thumbnail_with_info.dart';
 import 'package:immich_mobile/routing/router.dart';
-import 'package:immich_mobile/shared/models/asset.dart';
 import 'package:immich_mobile/shared/models/store.dart';
 import 'package:immich_mobile/utils/image_url_builder.dart';
 
@@ -59,22 +57,7 @@ class ExploreGrid extends StatelessWidget {
                     ),
                   )
                 : context.pushRoute(
-                    SearchInputRoute(
-                      prefilter: SearchFilter(
-                        people: {},
-                        location: SearchLocationFilter(
-                          city: content.label,
-                        ),
-                        camera: SearchCameraFilter(),
-                        date: SearchDateFilter(),
-                        display: SearchDisplayFilters(
-                          isNotInAlbum: false,
-                          isArchive: false,
-                          isFavorite: false,
-                        ),
-                        mediaType: AssetType.other,
-                      ),
-                    ),
+                    SearchResultRoute(searchTerm: 'm:${content.label}'),
                   );
           },
         );

mobile/lib/modules/search/ui/immich_search_bar.dart

@@ -0,0 +1,99 @@
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_hooks/flutter_hooks.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/modules/search/providers/search_page_state.provider.dart';
+
+class ImmichSearchBar extends HookConsumerWidget
+    implements PreferredSizeWidget {
+  const ImmichSearchBar({
+    super.key,
+    required this.searchFocusNode,
+    required this.onSubmitted,
+  });
+
+  final FocusNode searchFocusNode;
+  final Function(String) onSubmitted;
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final searchTermController = useTextEditingController(text: "");
+    final isSearchEnabled = ref.watch(searchPageStateProvider).isSearchEnabled;
+
+    focusSearch() {
+      searchTermController.clear();
+      ref.watch(searchPageStateProvider.notifier).getSuggestedSearchTerms();
+      ref.watch(searchPageStateProvider.notifier).enableSearch();
+      ref.watch(searchPageStateProvider.notifier).setSearchTerm("");
+
+      searchFocusNode.requestFocus();
+    }
+
+    useEffect(
+      () {
+        searchFocusNotifier.addListener(focusSearch);
+        return () {
+          searchFocusNotifier.removeListener(focusSearch);
+        };
+      },
+      [],
+    );
+
+    return AppBar(
+      automaticallyImplyLeading: false,
+      leading: isSearchEnabled
+          ? IconButton(
+              onPressed: () {
+                searchFocusNode.unfocus();
+                ref.watch(searchPageStateProvider.notifier).disableSearch();
+                searchTermController.clear();
+              },
+              icon: const Icon(Icons.arrow_back_ios_rounded),
+            )
+          : const Icon(
+              Icons.search_rounded,
+              size: 20,
+            ),
+      title: TextField(
+        controller: searchTermController,
+        focusNode: searchFocusNode,
+        autofocus: false,
+        onTap: focusSearch,
+        onSubmitted: (searchTerm) {
+          onSubmitted(searchTerm);
+          searchTermController.clear();
+          ref.watch(searchPageStateProvider.notifier).setSearchTerm("");
+        },
+        onChanged: (value) {
+          ref.watch(searchPageStateProvider.notifier).setSearchTerm(value);
+        },
+        decoration: InputDecoration(
+          hintText: 'search_bar_hint'.tr(),
+          hintStyle: context.textTheme.bodyLarge?.copyWith(
+            color: context.themeData.colorScheme.onSurface.withOpacity(0.75),
+          ),
+          enabledBorder: const UnderlineInputBorder(
+            borderSide: BorderSide(color: Colors.transparent),
+          ),
+          focusedBorder: const UnderlineInputBorder(
+            borderSide: BorderSide(color: Colors.transparent),
+          ),
+        ),
+      ),
+    );
+  }
+
+  @override
+  Size get preferredSize => const Size.fromHeight(kToolbarHeight);
+}
+
+// Used to focus search from outside this widget.
+// For example when double pressing the search nav icon.
+final searchFocusNotifier = SearchFocusNotifier();
+
+class SearchFocusNotifier with ChangeNotifier {
+  void requestFocus() {
+    notifyListeners();
+  }
+}

mobile/lib/modules/search/ui/search_filter/camera_picker.dart

@@ -1,120 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_hooks/flutter_hooks.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/modules/search/models/search_filter.dart';
-import 'package:immich_mobile/modules/search/providers/search_filter.provider.dart';
-import 'package:openapi/api.dart';
-
-class CameraPicker extends HookConsumerWidget {
-  const CameraPicker({super.key, required this.onSelect, this.filter});
-
-  final Function(Map<String, String?>) onSelect;
-  final SearchCameraFilter? filter;
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final makeTextController = useTextEditingController(text: filter?.make);
-    final modelTextController = useTextEditingController(text: filter?.model);
-    final selectedMake = useState<String?>(filter?.make);
-    final selectedModel = useState<String?>(filter?.model);
-
-    final make = ref.watch(
-      getSearchSuggestionsProvider(
-        SearchSuggestionType.cameraMake,
-      ),
-    );
-
-    final models = ref.watch(
-      getSearchSuggestionsProvider(
-        SearchSuggestionType.cameraModel,
-        make: selectedMake.value,
-      ),
-    );
-
-    final inputDecorationTheme = InputDecorationTheme(
-      border: OutlineInputBorder(
-        borderRadius: BorderRadius.circular(20),
-      ),
-      contentPadding: const EdgeInsets.only(left: 16),
-    );
-
-    final menuStyle = MenuStyle(
-      shape: MaterialStatePropertyAll<OutlinedBorder>(
-        RoundedRectangleBorder(
-          borderRadius: BorderRadius.circular(15),
-        ),
-      ),
-    );
-
-    return Container(
-      padding: const EdgeInsets.only(
-          // bottom: MediaQuery.of(context).viewInsets.bottom,
-          ),
-      child: Row(
-        mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-        children: [
-          DropdownMenu(
-            dropdownMenuEntries: switch (make) {
-              AsyncError() => [],
-              AsyncData(:final value) => value
-                  .map(
-                    (e) => DropdownMenuEntry(
-                      value: e,
-                      label: e,
-                    ),
-                  )
-                  .toList(),
-              _ => [],
-            },
-            width: context.width * 0.45,
-            menuHeight: 400,
-            label: const Text('Make'),
-            inputDecorationTheme: inputDecorationTheme,
-            controller: makeTextController,
-            menuStyle: menuStyle,
-            leadingIcon: const Icon(Icons.photo_camera_rounded),
-            trailingIcon: const Icon(Icons.arrow_drop_down_rounded),
-            selectedTrailingIcon: const Icon(Icons.arrow_drop_up_rounded),
-            onSelected: (value) {
-              selectedMake.value = value.toString();
-              onSelect({
-                'make': selectedMake.value,
-                'model': selectedModel.value,
-              });
-            },
-          ),
-          DropdownMenu(
-            dropdownMenuEntries: switch (models) {
-              AsyncError() => [],
-              AsyncData(:final value) => value
-                  .map(
-                    (e) => DropdownMenuEntry(
-                      value: e,
-                      label: e,
-                    ),
-                  )
-                  .toList(),
-              _ => [],
-            },
-            width: context.width * 0.45,
-            menuHeight: 400,
-            label: const Text('Model'),
-            inputDecorationTheme: inputDecorationTheme,
-            controller: modelTextController,
-            menuStyle: menuStyle,
-            leadingIcon: const Icon(Icons.camera),
-            trailingIcon: const Icon(Icons.arrow_drop_down_rounded),
-            selectedTrailingIcon: const Icon(Icons.arrow_drop_up_rounded),
-            onSelected: (value) {
-              selectedModel.value = value.toString();
-              onSelect({
-                'make': selectedMake.value,
-                'model': selectedModel.value,
-              });
-            },
-          ),
-        ],
-      ),
-    );
-  }
-}

mobile/lib/modules/search/ui/search_filter/display_option_picker.dart

@@ -1,68 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_hooks/flutter_hooks.dart';
-import 'package:immich_mobile/modules/search/models/search_filter.dart';
-
-enum DisplayOption {
-  notInAlbum,
-  favorite,
-  archive,
-}
-
-class DisplayOptionPicker extends HookWidget {
-  const DisplayOptionPicker({
-    super.key,
-    required this.onSelect,
-    this.filter,
-  });
-
-  final Function(Map<DisplayOption, bool>) onSelect;
-  final SearchDisplayFilters? filter;
-
-  @override
-  Widget build(BuildContext context) {
-    final options = useState<Map<DisplayOption, bool>>({
-      DisplayOption.notInAlbum: filter?.isNotInAlbum ?? false,
-      DisplayOption.favorite: filter?.isFavorite ?? false,
-      DisplayOption.archive: filter?.isArchive ?? false,
-    });
-
-    return ListView(
-      shrinkWrap: true,
-      children: [
-        CheckboxListTile(
-          title: const Text('Not in album'),
-          value: options.value[DisplayOption.notInAlbum],
-          onChanged: (bool? value) {
-            options.value = {
-              ...options.value,
-              DisplayOption.notInAlbum: value!,
-            };
-            onSelect(options.value);
-          },
-        ),
-        CheckboxListTile(
-          title: const Text('Favorite'),
-          value: options.value[DisplayOption.favorite],
-          onChanged: (value) {
-            options.value = {
-              ...options.value,
-              DisplayOption.favorite: value!,
-            };
-            onSelect(options.value);
-          },
-        ),
-        CheckboxListTile(
-          title: const Text('Archive'),
-          value: options.value[DisplayOption.archive],
-          onChanged: (value) {
-            options.value = {
-              ...options.value,
-              DisplayOption.archive: value!,
-            };
-            onSelect(options.value);
-          },
-        ),
-      ],
-    );
-  }
-}

mobile/lib/modules/search/ui/search_filter/filter_bottom_sheet_scaffold.dart

@@ -1,68 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:immich_mobile/extensions/build_context_extensions.dart';
-
-class FilterBottomSheetScaffold extends StatelessWidget {
-  const FilterBottomSheetScaffold({
-    super.key,
-    required this.child,
-    required this.onSearch,
-    required this.onClear,
-    required this.title,
-    this.expanded,
-  });
-
-  final bool? expanded;
-  final String title;
-  final Widget child;
-  final Function() onSearch;
-  final Function() onClear;
-
-  @override
-  Widget build(BuildContext context) {
-    buildChildWidget() {
-      if (expanded != null && expanded == true) {
-        return Expanded(child: child);
-      }
-      return child;
-    }
-
-    return SafeArea(
-      child: Column(
-        mainAxisSize: MainAxisSize.min,
-        children: [
-          Padding(
-            padding: const EdgeInsets.all(16.0),
-            child: Text(
-              title,
-              style: context.textTheme.headlineSmall,
-            ),
-          ),
-          buildChildWidget(),
-          Padding(
-            padding: const EdgeInsets.all(8.0),
-            child: Row(
-              mainAxisAlignment: MainAxisAlignment.end,
-              children: [
-                OutlinedButton(
-                  onPressed: () {
-                    onClear();
-                    Navigator.of(context).pop();
-                  },
-                  child: const Text('Clear'),
-                ),
-                const SizedBox(width: 8),
-                ElevatedButton(
-                  onPressed: () {
-                    onSearch();
-                    Navigator.of(context).pop();
-                  },
-                  child: const Text('Apply filter'),
-                ),
-              ],
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-}

mobile/lib/modules/search/ui/search_filter/location_picker.dart

@@ -1,166 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_hooks/flutter_hooks.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/modules/search/models/search_filter.dart';
-import 'package:immich_mobile/modules/search/providers/search_filter.provider.dart';
-import 'package:openapi/api.dart';
-
-class LocationPicker extends HookConsumerWidget {
-  const LocationPicker({super.key, required this.onSelected, this.filter});
-
-  final Function(Map<String, String?>) onSelected;
-  final SearchLocationFilter? filter;
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final countryTextController =
-        useTextEditingController(text: filter?.country);
-    final stateTextController = useTextEditingController(text: filter?.state);
-    final cityTextController = useTextEditingController(text: filter?.city);
-
-    final selectedCountry = useState<String?>(filter?.country);
-    final selectedState = useState<String?>(filter?.state);
-    final selectedCity = useState<String?>(filter?.city);
-
-    final countries = ref.watch(
-      getSearchSuggestionsProvider(
-        SearchSuggestionType.country,
-        locationCountry: selectedCountry.value,
-        locationState: selectedState.value,
-      ),
-    );
-
-    final states = ref.watch(
-      getSearchSuggestionsProvider(
-        SearchSuggestionType.state,
-        locationCountry: selectedCountry.value,
-        locationState: selectedState.value,
-      ),
-    );
-
-    final cities = ref.watch(
-      getSearchSuggestionsProvider(
-        SearchSuggestionType.city,
-        locationCountry: selectedCountry.value,
-        locationState: selectedState.value,
-      ),
-    );
-
-    final inputDecorationTheme = InputDecorationTheme(
-      border: OutlineInputBorder(
-        borderRadius: BorderRadius.circular(20),
-      ),
-      contentPadding: const EdgeInsets.only(left: 16),
-    );
-
-    final menuStyle = MenuStyle(
-      shape: MaterialStatePropertyAll<OutlinedBorder>(
-        RoundedRectangleBorder(
-          borderRadius: BorderRadius.circular(15),
-        ),
-      ),
-    );
-
-    return Column(
-      children: [
-        DropdownMenu(
-          dropdownMenuEntries: switch (countries) {
-            AsyncError() => [],
-            AsyncData(:final value) => value
-                .map(
-                  (e) => DropdownMenuEntry(
-                    value: e,
-                    label: e,
-                  ),
-                )
-                .toList(),
-            _ => [],
-          },
-          menuHeight: 400,
-          width: context.width * 0.9,
-          label: const Text('Country'),
-          inputDecorationTheme: inputDecorationTheme,
-          menuStyle: menuStyle,
-          controller: countryTextController,
-          trailingIcon: const Icon(Icons.arrow_drop_down_rounded),
-          selectedTrailingIcon: const Icon(Icons.arrow_drop_up_rounded),
-          onSelected: (value) {
-            selectedCountry.value = value.toString();
-            onSelected({
-              'country': selectedCountry.value,
-              'state': selectedState.value,
-              'city': selectedCity.value,
-            });
-          },
-        ),
-        const SizedBox(
-          height: 16,
-        ),
-        DropdownMenu(
-          dropdownMenuEntries: switch (states) {
-            AsyncError() => [],
-            AsyncData(:final value) => value
-                .map(
-                  (e) => DropdownMenuEntry(
-                    value: e,
-                    label: e,
-                  ),
-                )
-                .toList(),
-            _ => [],
-          },
-          menuHeight: 400,
-          width: context.width * 0.9,
-          label: const Text('State'),
-          inputDecorationTheme: inputDecorationTheme,
-          menuStyle: menuStyle,
-          controller: stateTextController,
-          trailingIcon: const Icon(Icons.arrow_drop_down_rounded),
-          selectedTrailingIcon: const Icon(Icons.arrow_drop_up_rounded),
-          onSelected: (value) {
-            selectedState.value = value.toString();
-            onSelected({
-              'country': selectedCountry.value,
-              'state': selectedState.value,
-              'city': selectedCity.value,
-            });
-          },
-        ),
-        const SizedBox(
-          height: 16,
-        ),
-        DropdownMenu(
-          dropdownMenuEntries: switch (cities) {
-            AsyncError() => [],
-            AsyncData(:final value) => value
-                .map(
-                  (e) => DropdownMenuEntry(
-                    value: e,
-                    label: e,
-                  ),
-                )
-                .toList(),
-            _ => [],
-          },
-          menuHeight: 400,
-          width: context.width * 0.9,
-          label: const Text('City'),
-          inputDecorationTheme: inputDecorationTheme,
-          menuStyle: menuStyle,
-          controller: cityTextController,
-          trailingIcon: const Icon(Icons.arrow_drop_down_rounded),
-          selectedTrailingIcon: const Icon(Icons.arrow_drop_up_rounded),
-          onSelected: (value) {
-            selectedCity.value = value.toString();
-            onSelected({
-              'country': selectedCountry.value,
-              'state': selectedState.value,
-              'city': selectedCity.value,
-            });
-          },
-        ),
-      ],
-    );
-  }
-}

mobile/lib/modules/search/ui/search_filter/media_type_picker.dart

@@ -1,48 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_hooks/flutter_hooks.dart';
-import 'package:immich_mobile/shared/models/asset.dart';
-
-class MediaTypePicker extends HookWidget {
-  const MediaTypePicker({super.key, required this.onSelect, this.filter});
-
-  final Function(AssetType) onSelect;
-  final AssetType? filter;
-
-  @override
-  Widget build(BuildContext context) {
-    final selectedMediaType = useState(filter ?? AssetType.other);
-
-    return ListView(
-      shrinkWrap: true,
-      children: [
-        RadioListTile(
-          title: const Text("All"),
-          value: AssetType.other,
-          onChanged: (value) {
-            selectedMediaType.value = value!;
-            onSelect(value);
-          },
-          groupValue: selectedMediaType.value,
-        ),
-        RadioListTile(
-          title: const Text("Image"),
-          value: AssetType.image,
-          onChanged: (value) {
-            selectedMediaType.value = value!;
-            onSelect(value);
-          },
-          groupValue: selectedMediaType.value,
-        ),
-        RadioListTile(
-          title: const Text("Video"),
-          value: AssetType.video,
-          onChanged: (value) {
-            selectedMediaType.value = value!;
-            onSelect(value);
-          },
-          groupValue: selectedMediaType.value,
-        ),
-      ],
-    );
-  }
-}

mobile/lib/modules/search/ui/search_filter/people_picker.dart

@@ -1,81 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_hooks/flutter_hooks.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/extensions/asyncvalue_extensions.dart';
-import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/modules/search/providers/people.provider.dart';
-import 'package:immich_mobile/shared/models/store.dart' as local_store;
-import 'package:immich_mobile/utils/image_url_builder.dart';
-import 'package:openapi/api.dart';
-
-class PeoplePicker extends HookConsumerWidget {
-  const PeoplePicker({super.key, required this.onSelect, this.filter});
-
-  final Function(Set<PersonResponseDto>) onSelect;
-  final Set<PersonResponseDto>? filter;
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    var imageSize = 45.0;
-    final people = ref.watch(getAllPeopleProvider);
-    final headers = {
-      "x-immich-user-token":
-          local_store.Store.get(local_store.StoreKey.accessToken),
-    };
-    final selectedPeople = useState<Set<PersonResponseDto>>(filter ?? {});
-
-    return people.widgetWhen(
-      onData: (people) {
-        return ListView.builder(
-          shrinkWrap: true,
-          itemCount: people.length,
-          padding: const EdgeInsets.all(8),
-          itemBuilder: (context, index) {
-            final person = people[index];
-            return Card(
-              elevation: 0,
-              shape: const RoundedRectangleBorder(
-                borderRadius: BorderRadius.all(Radius.circular(15)),
-              ),
-              child: ListTile(
-                title: Text(
-                  person.name,
-                  style: context.textTheme.bodyLarge,
-                ),
-                leading: SizedBox(
-                  height: imageSize,
-                  child: Material(
-                    shape: const CircleBorder(side: BorderSide.none),
-                    elevation: 3,
-                    child: CircleAvatar(
-                      maxRadius: imageSize / 2,
-                      backgroundImage: NetworkImage(
-                        getFaceThumbnailUrl(person.id),
-                        headers: headers,
-                      ),
-                    ),
-                  ),
-                ),
-                onTap: () {
-                  if (selectedPeople.value.contains(person)) {
-                    selectedPeople.value.remove(person);
-                  } else {
-                    selectedPeople.value.add(person);
-                  }
-
-                  selectedPeople.value = {...selectedPeople.value};
-                  onSelect(selectedPeople.value);
-                },
-                selected: selectedPeople.value.contains(person),
-                selectedTileColor: context.primaryColor.withOpacity(0.2),
-                shape: const RoundedRectangleBorder(
-                  borderRadius: BorderRadius.all(Radius.circular(15)),
-                ),
-              ),
-            );
-          },
-        );
-      },
-    );
-  }
-}

mobile/lib/modules/search/ui/search_filter/search_filter_chip.dart

@@ -1,68 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:immich_mobile/extensions/build_context_extensions.dart';
-
-class SearchFilterChip extends StatelessWidget {
-  final String label;
-  final Function() onTap;
-  final Widget? currentFilter;
-  final IconData icon;
-
-  const SearchFilterChip({
-    super.key,
-    required this.label,
-    required this.onTap,
-    required this.icon,
-    this.currentFilter,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    if (currentFilter != null) {
-      return GestureDetector(
-        onTap: onTap,
-        child: Card(
-          elevation: 0,
-          color: context.primaryColor.withAlpha(25),
-          shape: StadiumBorder(
-            side: BorderSide(color: context.primaryColor),
-          ),
-          child: Padding(
-            padding:
-                const EdgeInsets.symmetric(vertical: 2.0, horizontal: 14.0),
-            child: Row(
-              children: [
-                Icon(
-                  icon,
-                  size: 18,
-                ),
-                const SizedBox(width: 4.0),
-                currentFilter!,
-              ],
-            ),
-          ),
-        ),
-      );
-    }
-    return GestureDetector(
-      onTap: onTap,
-      child: Card(
-        elevation: 0,
-        shape:
-            StadiumBorder(side: BorderSide(color: Colors.grey.withAlpha(100))),
-        child: Padding(
-          padding: const EdgeInsets.symmetric(vertical: 2.0, horizontal: 14.0),
-          child: Row(
-            children: [
-              Icon(
-                icon,
-                size: 18,
-              ),
-              const SizedBox(width: 4.0),
-              Text(label),
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-}

mobile/lib/modules/search/ui/search_filter/search_filter_utils.dart

@@ -1,19 +0,0 @@
-import 'package:flutter/material.dart';
-
-Future<T> showFilterBottomSheet<T>({
-  required BuildContext context,
-  required Widget child,
-  bool isScrollControlled = false,
-  bool isDismissible = true,
-}) async {
-  return await showModalBottomSheet(
-    context: context,
-    isScrollControlled: isScrollControlled,
-    useSafeArea: false,
-    isDismissible: isDismissible,
-    showDragHandle: isDismissible,
-    builder: (BuildContext context) {
-      return child;
-    },
-  );
-}

mobile/lib/modules/search/ui/search_suggestion_list.dart

@@ -0,0 +1,66 @@
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/modules/search/providers/search_page_state.provider.dart';
+
+class SearchSuggestionList extends ConsumerWidget {
+  const SearchSuggestionList({super.key, required this.onSubmitted});
+
+  final Function(String) onSubmitted;
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final searchTerm = ref.watch(searchPageStateProvider).searchTerm;
+    final searchSuggestion =
+        ref.watch(searchPageStateProvider).searchSuggestion;
+
+    return Container(
+      color: searchTerm.isEmpty
+          ? Colors.black.withOpacity(0.5)
+          : context.scaffoldBackgroundColor,
+      child: CustomScrollView(
+        slivers: [
+          SliverToBoxAdapter(
+            child: Container(
+              color: context.isDarkTheme ? Colors.grey[800] : Colors.grey[100],
+              child: Padding(
+                padding: const EdgeInsets.all(16.0),
+                child: RichText(
+                  text: TextSpan(
+                    children: [
+                      TextSpan(
+                        text: 'search_suggestion_list_smart_search_hint_1'.tr(),
+                        style: context.textTheme.bodyMedium,
+                      ),
+                      TextSpan(
+                        text: 'search_suggestion_list_smart_search_hint_2'.tr(),
+                        style: context.textTheme.bodyMedium?.copyWith(
+                          color: context.primaryColor,
+                          fontWeight: FontWeight.bold,
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
+              ),
+            ),
+          ),
+          SliverFillRemaining(
+            hasScrollBody: true,
+            child: ListView.builder(
+              itemBuilder: ((context, index) {
+                return ListTile(
+                  onTap: () {
+                    onSubmitted("m:${searchSuggestion[index]}");
+                  },
+                  title: Text(searchSuggestion[index]),
+                );
+              }),
+              itemCount: searchSuggestion.length,
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}

mobile/lib/modules/search/views/all_people_page.dart

@@ -1,38 +1,35 @@
-import 'package:auto_route/auto_route.dart';
-import 'package:easy_localization/easy_localization.dart';
-import 'package:flutter/material.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/extensions/asyncvalue_extensions.dart';
-import 'package:immich_mobile/modules/search/models/curated_content.dart';
-import 'package:immich_mobile/modules/search/providers/people.provider.dart';
-import 'package:immich_mobile/modules/search/ui/explore_grid.dart';
-
-@RoutePage()
-class AllPeoplePage extends HookConsumerWidget {
-  const AllPeoplePage({super.key});
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final curatedPeople = ref.watch(getAllPeopleProvider);
-
-    return Scaffold(
-      appBar: AppBar(
-        title: const Text(
-          'all_people_page_title',
-        ).tr(),
-        leading: IconButton(
-          onPressed: () => context.popRoute(),
-          icon: const Icon(Icons.arrow_back_ios_rounded),
-        ),
-      ),
-      body: curatedPeople.widgetWhen(
-        onData: (people) => ExploreGrid(
-          isPeople: true,
-          curatedContent: people
-              .map((e) => CuratedContent(label: e.name, id: e.id))
-              .toList(),
-        ),
-      ),
-    );
-  }
-}
+import 'package:auto_route/auto_route.dart';
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/asyncvalue_extensions.dart';
+import 'package:immich_mobile/modules/search/providers/people.provider.dart';
+import 'package:immich_mobile/modules/search/ui/explore_grid.dart';
+
+@RoutePage()
+class AllPeoplePage extends HookConsumerWidget {
+  const AllPeoplePage({super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final curatedPeople = ref.watch(getCuratedPeopleProvider);
+
+    return Scaffold(
+      appBar: AppBar(
+        title: const Text(
+          'all_people_page_title',
+        ).tr(),
+        leading: IconButton(
+          onPressed: () => context.popRoute(),
+          icon: const Icon(Icons.arrow_back_ios_rounded),
+        ),
+      ),
+      body: curatedPeople.widgetWhen(
+        onData: (people) => ExploreGrid(
+          isPeople: true,
+          curatedContent: people,
+        ),
+      ),
+    );
+  }
+}

mobile/lib/modules/search/views/search_input_page.dart

@@ -1,563 +0,0 @@
-import 'dart:async';
-
-import 'package:auto_route/auto_route.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_hooks/flutter_hooks.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/modules/search/models/search_filter.dart';
-import 'package:immich_mobile/modules/search/providers/paginated_search.provider.dart';
-import 'package:immich_mobile/modules/search/ui/search_filter/camera_picker.dart';
-import 'package:immich_mobile/modules/search/ui/search_filter/display_option_picker.dart';
-import 'package:immich_mobile/modules/search/ui/search_filter/filter_bottom_sheet_scaffold.dart';
-import 'package:immich_mobile/modules/search/ui/search_filter/location_picker.dart';
-import 'package:immich_mobile/modules/search/ui/search_filter/media_type_picker.dart';
-import 'package:immich_mobile/modules/search/ui/search_filter/people_picker.dart';
-import 'package:immich_mobile/modules/search/ui/search_filter/search_filter_chip.dart';
-import 'package:immich_mobile/modules/search/ui/search_filter/search_filter_utils.dart';
-import 'package:immich_mobile/shared/models/asset.dart';
-import 'package:immich_mobile/shared/ui/asset_grid/multiselect_grid.dart';
-import 'package:openapi/api.dart';
-
-@RoutePage()
-class SearchInputPage extends HookConsumerWidget {
-  const SearchInputPage({super.key, this.prefilter});
-
-  final SearchFilter? prefilter;
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final isContextualSearch = useState(true);
-    final textSearchController = useTextEditingController();
-    final filter = useState<SearchFilter>(
-      SearchFilter(
-        people: prefilter?.people ?? {},
-        location: prefilter?.location ?? SearchLocationFilter(),
-        camera: prefilter?.camera ?? SearchCameraFilter(),
-        date: prefilter?.date ?? SearchDateFilter(),
-        display: prefilter?.display ??
-            SearchDisplayFilters(
-              isNotInAlbum: false,
-              isArchive: false,
-              isFavorite: false,
-            ),
-        mediaType: prefilter?.mediaType ?? AssetType.other,
-      ),
-    );
-
-    final previousFilter = useState(filter.value);
-
-    final peopleCurrentFilterWidget = useState<Widget?>(null);
-    final dateRangeCurrentFilterWidget = useState<Widget?>(null);
-    final cameraCurrentFilterWidget = useState<Widget?>(null);
-    final locationCurrentFilterWidget = useState<Widget?>(null);
-    final mediaTypeCurrentFilterWidget = useState<Widget?>(null);
-    final displayOptionCurrentFilterWidget = useState<Widget?>(null);
-
-    final currentPage = useState(1);
-    final searchProvider = ref.watch(paginatedSearchProvider);
-    final searchResultCount = useState(0);
-
-    search() async {
-      if (prefilter == null && filter.value == previousFilter.value) return;
-
-      ref.watch(paginatedSearchProvider.notifier).clear();
-
-      currentPage.value = 1;
-
-      final searchResult = await ref
-          .watch(paginatedSearchProvider.notifier)
-          .getNextPage(filter.value, currentPage.value);
-      previousFilter.value = filter.value;
-
-      searchResultCount.value = searchResult.length;
-    }
-
-    searchPrefilter() {
-      if (prefilter != null) {
-        Future.delayed(
-          Duration.zero,
-          () {
-            search();
-
-            if (prefilter!.location.city != null) {
-              locationCurrentFilterWidget.value = Text(
-                prefilter!.location.city!,
-                style: context.textTheme.labelLarge,
-              );
-            }
-          },
-        );
-      }
-    }
-
-    useEffect(
-      () {
-        searchPrefilter();
-        return null;
-      },
-      [],
-    );
-
-    loadMoreSearchResult() async {
-      currentPage.value += 1;
-      final searchResult = await ref
-          .watch(paginatedSearchProvider.notifier)
-          .getNextPage(filter.value, currentPage.value);
-      searchResultCount.value = searchResult.length;
-    }
-
-    showPeoplePicker() {
-      handleOnSelect(Set<PersonResponseDto> value) {
-        filter.value = filter.value.copyWith(
-          people: value,
-        );
-
-        peopleCurrentFilterWidget.value = Text(
-          value.map((e) => e.name != '' ? e.name : "No name").join(', '),
-          style: context.textTheme.labelLarge,
-        );
-      }
-
-      handleClear() {
-        filter.value = filter.value.copyWith(
-          people: {},
-        );
-
-        peopleCurrentFilterWidget.value = null;
-        search();
-      }
-
-      showFilterBottomSheet(
-        context: context,
-        isScrollControlled: true,
-        child: FractionallySizedBox(
-          heightFactor: 0.8,
-          child: FilterBottomSheetScaffold(
-            title: 'Select people',
-            expanded: true,
-            onSearch: search,
-            onClear: handleClear,
-            child: PeoplePicker(
-              onSelect: handleOnSelect,
-              filter: filter.value.people,
-            ),
-          ),
-        ),
-      );
-    }
-
-    showLocationPicker() {
-      handleOnSelect(Map<String, String?> value) {
-        filter.value = filter.value.copyWith(
-          location: SearchLocationFilter(
-            country: value['country'],
-            city: value['city'],
-            state: value['state'],
-          ),
-        );
-
-        final locationText = <String>[];
-        if (value['country'] != null) {
-          locationText.add(value['country']!);
-        }
-
-        if (value['state'] != null) {
-          locationText.add(value['state']!);
-        }
-
-        if (value['city'] != null) {
-          locationText.add(value['city']!);
-        }
-
-        locationCurrentFilterWidget.value = Text(
-          locationText.join(', '),
-          style: context.textTheme.labelLarge,
-        );
-      }
-
-      handleClear() {
-        filter.value = filter.value.copyWith(
-          location: SearchLocationFilter(),
-        );
-
-        locationCurrentFilterWidget.value = null;
-        search();
-      }
-
-      showFilterBottomSheet(
-        context: context,
-        isScrollControlled: true,
-        isDismissible: false,
-        child: FilterBottomSheetScaffold(
-          title: 'Select location',
-          onSearch: search,
-          onClear: handleClear,
-          child: Padding(
-            padding: const EdgeInsets.symmetric(vertical: 16.0),
-            child: Container(
-              padding: EdgeInsets.only(
-                bottom: MediaQuery.of(context).viewInsets.bottom,
-              ),
-              child: LocationPicker(
-                onSelected: handleOnSelect,
-                filter: filter.value.location,
-              ),
-            ),
-          ),
-        ),
-      );
-    }
-
-    showCameraPicker() {
-      handleOnSelect(Map<String, String?> value) {
-        filter.value = filter.value.copyWith(
-          camera: SearchCameraFilter(
-            make: value['make'],
-            model: value['model'],
-          ),
-        );
-
-        cameraCurrentFilterWidget.value = Text(
-          '${value['make'] ?? ''} ${value['model'] ?? ''}',
-          style: context.textTheme.labelLarge,
-        );
-      }
-
-      handleClear() {
-        filter.value = filter.value.copyWith(
-          camera: SearchCameraFilter(),
-        );
-
-        cameraCurrentFilterWidget.value = null;
-        search();
-      }
-
-      showFilterBottomSheet(
-        context: context,
-        isScrollControlled: true,
-        isDismissible: false,
-        child: FilterBottomSheetScaffold(
-          title: 'Select camera type',
-          onSearch: search,
-          onClear: handleClear,
-          child: Padding(
-            padding: const EdgeInsets.symmetric(vertical: 16.0),
-            child: CameraPicker(
-              onSelect: handleOnSelect,
-              filter: filter.value.camera,
-            ),
-          ),
-        ),
-      );
-    }
-
-    showDatePicker() async {
-      final firstDate = DateTime(1900);
-      final lastDate = DateTime.now();
-
-      final date = await showDateRangePicker(
-        context: context,
-        firstDate: firstDate,
-        lastDate: lastDate,
-        currentDate: DateTime.now(),
-        initialDateRange: DateTimeRange(
-          start: filter.value.date.takenAfter ?? lastDate,
-          end: filter.value.date.takenBefore ?? lastDate,
-        ),
-        helpText: 'Select a date range',
-        cancelText: 'Cancel',
-        confirmText: 'Select',
-        saveText: 'Save',
-        errorFormatText: 'Invalid date format',
-        errorInvalidText: 'Invalid date',
-        fieldStartHintText: 'Start date',
-        fieldEndHintText: 'End date',
-        initialEntryMode: DatePickerEntryMode.input,
-      );
-
-      if (date == null) {
-        filter.value = filter.value.copyWith(
-          date: SearchDateFilter(),
-        );
-
-        dateRangeCurrentFilterWidget.value = null;
-        search();
-        return;
-      }
-
-      filter.value = filter.value.copyWith(
-        date: SearchDateFilter(
-          takenAfter: date.start,
-          takenBefore: date.end.add(
-            const Duration(
-              hours: 23,
-              minutes: 59,
-              seconds: 59,
-            ),
-          ),
-        ),
-      );
-
-      // If date range is less than 24 hours, set the end date to the end of the day
-      if (date.end.difference(date.start).inHours < 24) {
-        dateRangeCurrentFilterWidget.value = Text(
-          date.start.toLocal().toIso8601String().split('T').first,
-          style: context.textTheme.labelLarge,
-        );
-      } else {
-        dateRangeCurrentFilterWidget.value = Text(
-          '${date.start.toLocal().toIso8601String().split('T').first} to ${date.end.toLocal().toIso8601String().split('T').first}',
-          style: context.textTheme.labelLarge,
-        );
-      }
-
-      search();
-    }
-
-    // MEDIA PICKER
-    showMediaTypePicker() {
-      handleOnSelected(AssetType assetType) {
-        filter.value = filter.value.copyWith(
-          mediaType: assetType,
-        );
-
-        mediaTypeCurrentFilterWidget.value = Text(
-          assetType == AssetType.image ? 'Image' : 'Video',
-          style: context.textTheme.labelLarge,
-        );
-      }
-
-      handleClear() {
-        filter.value = filter.value.copyWith(
-          mediaType: AssetType.other,
-        );
-
-        mediaTypeCurrentFilterWidget.value = null;
-        search();
-      }
-
-      showFilterBottomSheet(
-        context: context,
-        child: FilterBottomSheetScaffold(
-          title: 'Select media type',
-          onSearch: search,
-          onClear: handleClear,
-          child: MediaTypePicker(
-            onSelect: handleOnSelected,
-            filter: filter.value.mediaType,
-          ),
-        ),
-      );
-    }
-
-    // DISPLAY OPTION
-    showDisplayOptionPicker() {
-      handleOnSelect(Map<DisplayOption, bool> value) {
-        final filterText = <String>[];
-
-        value.forEach((key, value) {
-          switch (key) {
-            case DisplayOption.notInAlbum:
-              filter.value = filter.value.copyWith(
-                display: filter.value.display.copyWith(
-                  isNotInAlbum: value,
-                ),
-              );
-              if (value) filterText.add('Not in album');
-              break;
-            case DisplayOption.archive:
-              filter.value = filter.value.copyWith(
-                display: filter.value.display.copyWith(
-                  isArchive: value,
-                ),
-              );
-              if (value) filterText.add('Archive');
-              break;
-            case DisplayOption.favorite:
-              filter.value = filter.value.copyWith(
-                display: filter.value.display.copyWith(
-                  isFavorite: value,
-                ),
-              );
-              if (value) filterText.add('Favorite');
-              break;
-          }
-        });
-
-        displayOptionCurrentFilterWidget.value = Text(
-          filterText.join(', '),
-          style: context.textTheme.labelLarge,
-        );
-      }
-
-      handleClear() {
-        filter.value = filter.value.copyWith(
-          display: SearchDisplayFilters(
-            isNotInAlbum: false,
-            isArchive: false,
-            isFavorite: false,
-          ),
-        );
-
-        displayOptionCurrentFilterWidget.value = null;
-        search();
-      }
-
-      showFilterBottomSheet(
-        context: context,
-        child: FilterBottomSheetScaffold(
-          title: 'Display options',
-          onSearch: search,
-          onClear: handleClear,
-          child: DisplayOptionPicker(
-            onSelect: handleOnSelect,
-            filter: filter.value.display,
-          ),
-        ),
-      );
-    }
-
-    handleTextSubmitted(String value) {
-      if (isContextualSearch.value) {
-        filter.value = filter.value.copyWith(
-          context: value,
-          filename: null,
-        );
-      } else {
-        filter.value = filter.value.copyWith(filename: value, context: null);
-      }
-
-      search();
-    }
-
-    buildSearchResult() {
-      return switch (searchProvider) {
-        AsyncData() => Expanded(
-            child: Padding(
-              padding: const EdgeInsets.only(top: 8.0),
-              child: NotificationListener<ScrollEndNotification>(
-                onNotification: (notification) {
-                  final metrics = notification.metrics;
-                  final shouldLoadMore = searchResultCount.value > 75;
-                  if (metrics.pixels >= metrics.maxScrollExtent &&
-                      shouldLoadMore) {
-                    loadMoreSearchResult();
-                  }
-                  return true;
-                },
-                child: MultiselectGrid(
-                  renderListProvider: paginatedSearchRenderListProvider,
-                  archiveEnabled: true,
-                  deleteEnabled: true,
-                  editEnabled: true,
-                  favoriteEnabled: true,
-                  stackEnabled: false,
-                  emptyIndicator: const SizedBox(),
-                ),
-              ),
-            ),
-          ),
-        AsyncError(:final error) => Text('Error: $error'),
-        _ => const Expanded(child: Center(child: CircularProgressIndicator())),
-      };
-    }
-
-    return Scaffold(
-      resizeToAvoidBottomInset: true,
-      appBar: AppBar(
-        automaticallyImplyLeading: true,
-        actions: [
-          IconButton(
-            icon: isContextualSearch.value
-                ? const Icon(Icons.abc_rounded)
-                : const Icon(Icons.image_search_rounded),
-            onPressed: () {
-              isContextualSearch.value = !isContextualSearch.value;
-              textSearchController.clear();
-            },
-          ),
-        ],
-        leading: IconButton(
-          icon: const Icon(Icons.arrow_back_ios_new_rounded),
-          onPressed: () {
-            context.router.pop();
-          },
-        ),
-        title: TextField(
-          controller: textSearchController,
-          decoration: InputDecoration(
-            hintText: isContextualSearch.value
-                ? 'Sunrise on the beach'
-                : 'File name or extension',
-            hintStyle: context.textTheme.bodyLarge?.copyWith(
-              color: context.themeData.colorScheme.onSurface.withOpacity(0.75),
-              fontWeight: FontWeight.w500,
-            ),
-            enabledBorder: const UnderlineInputBorder(
-              borderSide: BorderSide(color: Colors.transparent),
-            ),
-            focusedBorder: const UnderlineInputBorder(
-              borderSide: BorderSide(color: Colors.transparent),
-            ),
-          ),
-          onSubmitted: handleTextSubmitted,
-        ),
-      ),
-      body: Column(
-        children: [
-          Padding(
-            padding: const EdgeInsets.only(top: 12.0),
-            child: SizedBox(
-              height: 50,
-              child: ListView(
-                shrinkWrap: true,
-                scrollDirection: Axis.horizontal,
-                padding: const EdgeInsets.symmetric(horizontal: 16),
-                children: [
-                  SearchFilterChip(
-                    icon: Icons.people_alt_rounded,
-                    onTap: showPeoplePicker,
-                    label: 'People',
-                    currentFilter: peopleCurrentFilterWidget.value,
-                  ),
-                  SearchFilterChip(
-                    icon: Icons.location_pin,
-                    onTap: showLocationPicker,
-                    label: 'Location',
-                    currentFilter: locationCurrentFilterWidget.value,
-                  ),
-                  SearchFilterChip(
-                    icon: Icons.camera_alt_rounded,
-                    onTap: showCameraPicker,
-                    label: 'Camera',
-                    currentFilter: cameraCurrentFilterWidget.value,
-                  ),
-                  SearchFilterChip(
-                    icon: Icons.date_range_rounded,
-                    onTap: showDatePicker,
-                    label: 'Date',
-                    currentFilter: dateRangeCurrentFilterWidget.value,
-                  ),
-                  SearchFilterChip(
-                    icon: Icons.video_collection_outlined,
-                    onTap: showMediaTypePicker,
-                    label: 'Media Type',
-                    currentFilter: mediaTypeCurrentFilterWidget.value,
-                  ),
-                  SearchFilterChip(
-                    icon: Icons.display_settings_outlined,
-                    onTap: showDisplayOptionPicker,
-                    label: 'Display Options',
-                    currentFilter: displayOptionCurrentFilterWidget.value,
-                  ),
-                ],
-              ),
-            ),
-          ),
-          buildSearchResult(),
-        ],
-      ),
-    );
-  }
-}

mobile/lib/modules/search/views/search_page.dart

@@ -1,274 +1,279 @@
-import 'dart:math' as math;
-
-import 'package:auto_route/auto_route.dart';
-import 'package:easy_localization/easy_localization.dart';
-import 'package:flutter/material.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/extensions/asyncvalue_extensions.dart';
-import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/modules/search/models/curated_content.dart';
-import 'package:immich_mobile/modules/search/models/search_filter.dart';
-import 'package:immich_mobile/modules/search/providers/people.provider.dart';
-import 'package:immich_mobile/modules/search/providers/search_page_state.provider.dart';
-import 'package:immich_mobile/modules/search/ui/curated_people_row.dart';
-import 'package:immich_mobile/modules/search/ui/curated_places_row.dart';
-import 'package:immich_mobile/modules/search/ui/person_name_edit_form.dart';
-import 'package:immich_mobile/modules/search/ui/search_row_title.dart';
-import 'package:immich_mobile/routing/router.dart';
-import 'package:immich_mobile/shared/models/asset.dart';
-import 'package:immich_mobile/shared/providers/server_info.provider.dart';
-import 'package:immich_mobile/shared/ui/immich_app_bar.dart';
-import 'package:immich_mobile/shared/ui/scaffold_error_body.dart';
-
-@RoutePage()
-// ignore: must_be_immutable
-class SearchPage extends HookConsumerWidget {
-  const SearchPage({super.key});
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final curatedLocation = ref.watch(getCuratedLocationProvider);
-    final curatedPeople = ref.watch(getAllPeopleProvider);
-    final isMapEnabled =
-        ref.watch(serverInfoProvider.select((v) => v.serverFeatures.map));
-    double imageSize = math.min(context.width / 3, 150);
-
-    TextStyle categoryTitleStyle = const TextStyle(
-      fontWeight: FontWeight.w500,
-      fontSize: 15.0,
-    );
-
-    Color categoryIconColor = context.isDarkTheme ? Colors.white : Colors.black;
-
-    showNameEditModel(
-      String personId,
-      String personName,
-    ) {
-      return showDialog(
-        context: context,
-        builder: (BuildContext context) {
-          return PersonNameEditForm(personId: personId, personName: personName);
-        },
-      );
-    }
-
-    buildPeople() {
-      return SizedBox(
-        height: imageSize,
-        child: curatedPeople.widgetWhen(
-          onError: (error, stack) => const ScaffoldErrorBody(withIcon: false),
-          onData: (people) => Padding(
-            padding: const EdgeInsets.only(
-              left: 16,
-              top: 8,
-            ),
-            child: CuratedPeopleRow(
-              content: people
-                  .map((e) => CuratedContent(label: e.name, id: e.id))
-                  .take(12)
-                  .toList(),
-              onTap: (content, index) {
-                context.pushRoute(
-                  PersonResultRoute(
-                    personId: content.id,
-                    personName: content.label,
-                  ),
-                );
-              },
-              onNameTap: (person, index) => {
-                showNameEditModel(person.id, person.label),
-              },
-            ),
-          ),
-        ),
-      );
-    }
-
-    buildPlaces() {
-      return SizedBox(
-        height: imageSize,
-        child: curatedLocation.widgetWhen(
-          onError: (error, stack) => const ScaffoldErrorBody(withIcon: false),
-          onData: (locations) => CuratedPlacesRow(
-            isMapEnabled: isMapEnabled,
-            content: locations
-                .map(
-                  (o) => CuratedContent(
-                    id: o.id,
-                    label: o.city,
-                  ),
-                )
-                .toList(),
-            imageSize: imageSize,
-            onTap: (content, index) {
-              context.pushRoute(
-                SearchInputRoute(
-                  prefilter: SearchFilter(
-                    people: {},
-                    location: SearchLocationFilter(
-                      city: content.label,
-                    ),
-                    camera: SearchCameraFilter(),
-                    date: SearchDateFilter(),
-                    display: SearchDisplayFilters(
-                      isNotInAlbum: false,
-                      isArchive: false,
-                      isFavorite: false,
-                    ),
-                    mediaType: AssetType.other,
-                  ),
-                ),
-              );
-            },
-          ),
-        ),
-      );
-    }
-
-    buildSearchButton() {
-      return GestureDetector(
-        onTap: () {
-          context.pushRoute(SearchInputRoute());
-        },
-        child: Card(
-          elevation: 0,
-          shape: RoundedRectangleBorder(
-            borderRadius: BorderRadius.circular(20),
-            side: BorderSide(
-              color: context.isDarkTheme
-                  ? Colors.grey[800]!
-                  : const Color.fromARGB(255, 225, 225, 225),
-            ),
-          ),
-          margin: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
-          child: Padding(
-            padding: const EdgeInsets.symmetric(
-              horizontal: 16.0,
-              vertical: 12.0,
-            ),
-            child: Row(
-              children: [
-                Icon(Icons.search, color: context.primaryColor),
-                const SizedBox(width: 16.0),
-                Text(
-                  "Search your photos",
-                  style: context.textTheme.bodyLarge?.copyWith(
-                    color:
-                        context.isDarkTheme ? Colors.white70 : Colors.black54,
-                    fontWeight: FontWeight.w400,
-                  ),
-                ),
-              ],
-            ),
-          ),
-        ),
-      );
-    }
-
-    return Scaffold(
-      appBar: const ImmichAppBar(),
-      body: Stack(
-        children: [
-          ListView(
-            children: [
-              buildSearchButton(),
-              SearchRowTitle(
-                title: "search_page_people".tr(),
-                onViewAllPressed: () =>
-                    context.pushRoute(const AllPeopleRoute()),
-              ),
-              buildPeople(),
-              SearchRowTitle(
-                title: "search_page_places".tr(),
-                onViewAllPressed: () =>
-                    context.pushRoute(const CuratedLocationRoute()),
-                top: 0,
-              ),
-              const SizedBox(height: 10.0),
-              buildPlaces(),
-              const SizedBox(height: 24.0),
-              Padding(
-                padding: const EdgeInsets.symmetric(horizontal: 16),
-                child: Text(
-                  'search_page_your_activity',
-                  style: context.textTheme.bodyLarge?.copyWith(
-                    fontWeight: FontWeight.w500,
-                  ),
-                ).tr(),
-              ),
-              ListTile(
-                leading: Icon(
-                  Icons.favorite_border_rounded,
-                  color: categoryIconColor,
-                ),
-                title: Text('search_page_favorites', style: categoryTitleStyle)
-                    .tr(),
-                onTap: () => context.pushRoute(const FavoritesRoute()),
-              ),
-              const CategoryDivider(),
-              ListTile(
-                leading: Icon(
-                  Icons.schedule_outlined,
-                  color: categoryIconColor,
-                ),
-                title: Text(
-                  'search_page_recently_added',
-                  style: categoryTitleStyle,
-                ).tr(),
-                onTap: () => context.pushRoute(const RecentlyAddedRoute()),
-              ),
-              const SizedBox(height: 24.0),
-              Padding(
-                padding: const EdgeInsets.symmetric(horizontal: 16.0),
-                child: Text(
-                  'search_page_categories',
-                  style: context.textTheme.bodyLarge?.copyWith(
-                    fontWeight: FontWeight.w500,
-                  ),
-                ).tr(),
-              ),
-              ListTile(
-                title:
-                    Text('search_page_videos', style: categoryTitleStyle).tr(),
-                leading: Icon(
-                  Icons.play_circle_outline,
-                  color: categoryIconColor,
-                ),
-                onTap: () => context.pushRoute(const AllVideosRoute()),
-              ),
-              const CategoryDivider(),
-              ListTile(
-                title: Text(
-                  'search_page_motion_photos',
-                  style: categoryTitleStyle,
-                ).tr(),
-                leading: Icon(
-                  Icons.motion_photos_on_outlined,
-                  color: categoryIconColor,
-                ),
-                onTap: () => context.pushRoute(const AllMotionPhotosRoute()),
-              ),
-            ],
-          ),
-        ],
-      ),
-    );
-  }
-}
-
-class CategoryDivider extends StatelessWidget {
-  const CategoryDivider({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return const Padding(
-      padding: EdgeInsets.only(
-        left: 56,
-        right: 16,
-      ),
-      child: Divider(
-        height: 0,
-      ),
-    );
-  }
-}
+import 'dart:math' as math;
+import 'package:auto_route/auto_route.dart';
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_hooks/flutter_hooks.dart' hide Store;
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/asyncvalue_extensions.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/modules/search/models/curated_content.dart';
+import 'package:immich_mobile/modules/search/providers/people.provider.dart';
+import 'package:immich_mobile/modules/search/providers/search_page_state.provider.dart';
+import 'package:immich_mobile/modules/search/ui/curated_people_row.dart';
+import 'package:immich_mobile/modules/search/ui/curated_places_row.dart';
+import 'package:immich_mobile/modules/search/ui/immich_search_bar.dart';
+import 'package:immich_mobile/modules/search/ui/person_name_edit_form.dart';
+import 'package:immich_mobile/modules/search/ui/search_row_title.dart';
+import 'package:immich_mobile/modules/search/ui/search_suggestion_list.dart';
+import 'package:immich_mobile/routing/router.dart';
+import 'package:immich_mobile/shared/providers/server_info.provider.dart';
+import 'package:immich_mobile/shared/ui/scaffold_error_body.dart';
+
+@RoutePage()
+// ignore: must_be_immutable
+class SearchPage extends HookConsumerWidget {
+  SearchPage({super.key});
+
+  FocusNode searchFocusNode = FocusNode();
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final isSearchEnabled = ref.watch(searchPageStateProvider).isSearchEnabled;
+    final curatedLocation = ref.watch(getCuratedLocationProvider);
+    final curatedPeople = ref.watch(getCuratedPeopleProvider);
+    final isMapEnabled =
+        ref.watch(serverInfoProvider.select((v) => v.serverFeatures.map));
+    double imageSize = math.min(context.width / 3, 150);
+
+    TextStyle categoryTitleStyle = const TextStyle(
+      fontWeight: FontWeight.w500,
+      fontSize: 15.0,
+    );
+
+    Color categoryIconColor = context.isDarkTheme ? Colors.white : Colors.black;
+
+    useEffect(
+      () {
+        searchFocusNode = FocusNode();
+        return () => searchFocusNode.dispose();
+      },
+      [],
+    );
+
+    onSearchSubmitted(String searchTerm) async {
+      searchFocusNode.unfocus();
+      ref.watch(searchPageStateProvider.notifier).disableSearch();
+
+      context.pushRoute(
+        SearchResultRoute(
+          searchTerm: searchTerm,
+        ),
+      );
+    }
+
+    showNameEditModel(
+      String personId,
+      String personName,
+    ) {
+      return showDialog(
+        context: context,
+        builder: (BuildContext context) {
+          return PersonNameEditForm(personId: personId, personName: personName);
+        },
+      );
+    }
+
+    buildPeople() {
+      return SizedBox(
+        height: imageSize,
+        child: curatedPeople.widgetWhen(
+          onError: (error, stack) => const ScaffoldErrorBody(withIcon: false),
+          onData: (people) => Padding(
+            padding: const EdgeInsets.only(
+              left: 16,
+              top: 8,
+            ),
+            child: CuratedPeopleRow(
+              content: people.take(12).toList(),
+              onTap: (content, index) {
+                context.pushRoute(
+                  PersonResultRoute(
+                    personId: content.id,
+                    personName: content.label,
+                  ),
+                );
+              },
+              onNameTap: (person, index) => {
+                showNameEditModel(person.id, person.label),
+              },
+            ),
+          ),
+        ),
+      );
+    }
+
+    buildPlaces() {
+      return SizedBox(
+        height: imageSize,
+        child: curatedLocation.widgetWhen(
+          onError: (error, stack) => const ScaffoldErrorBody(withIcon: false),
+          onData: (locations) => CuratedPlacesRow(
+            isMapEnabled: isMapEnabled,
+            content: locations
+                .map(
+                  (o) => CuratedContent(
+                    id: o.id,
+                    label: o.city,
+                  ),
+                )
+                .toList(),
+            imageSize: imageSize,
+            onTap: (content, index) {
+              context.pushRoute(
+                SearchResultRoute(
+                  searchTerm: 'm:${content.label}',
+                ),
+              );
+            },
+          ),
+        ),
+      );
+    }
+
+    return Scaffold(
+      appBar: ImmichSearchBar(
+        searchFocusNode: searchFocusNode,
+        onSubmitted: onSearchSubmitted,
+      ),
+      body: GestureDetector(
+        onTap: () {
+          searchFocusNode.unfocus();
+          ref.watch(searchPageStateProvider.notifier).disableSearch();
+        },
+        child: Stack(
+          children: [
+            ListView(
+              children: [
+                SearchRowTitle(
+                  title: "search_page_people".tr(),
+                  onViewAllPressed: () =>
+                      context.pushRoute(const AllPeopleRoute()),
+                ),
+                buildPeople(),
+                SearchRowTitle(
+                  title: "search_page_places".tr(),
+                  onViewAllPressed: () =>
+                      context.pushRoute(const CuratedLocationRoute()),
+                  top: 0,
+                ),
+                const SizedBox(height: 10.0),
+                buildPlaces(),
+                const SizedBox(height: 24.0),
+                Padding(
+                  padding: const EdgeInsets.symmetric(horizontal: 16),
+                  child: Text(
+                    'search_page_your_activity',
+                    style: context.textTheme.bodyLarge?.copyWith(
+                      fontWeight: FontWeight.w500,
+                    ),
+                  ).tr(),
+                ),
+                ListTile(
+                  leading: Icon(
+                    Icons.favorite_border_rounded,
+                    color: categoryIconColor,
+                  ),
+                  title:
+                      Text('search_page_favorites', style: categoryTitleStyle)
+                          .tr(),
+                  onTap: () => context.pushRoute(const FavoritesRoute()),
+                ),
+                const CategoryDivider(),
+                ListTile(
+                  leading: Icon(
+                    Icons.schedule_outlined,
+                    color: categoryIconColor,
+                  ),
+                  title: Text(
+                    'search_page_recently_added',
+                    style: categoryTitleStyle,
+                  ).tr(),
+                  onTap: () => context.pushRoute(const RecentlyAddedRoute()),
+                ),
+                const SizedBox(height: 24.0),
+                Padding(
+                  padding: const EdgeInsets.symmetric(horizontal: 16.0),
+                  child: Text(
+                    'search_page_categories',
+                    style: context.textTheme.bodyLarge?.copyWith(
+                      fontWeight: FontWeight.w500,
+                    ),
+                  ).tr(),
+                ),
+                ListTile(
+                  title:
+                      Text('search_page_screenshots', style: categoryTitleStyle)
+                          .tr(),
+                  leading: Icon(
+                    Icons.screenshot,
+                    color: categoryIconColor,
+                  ),
+                  onTap: () => context.pushRoute(
+                    SearchResultRoute(
+                      searchTerm: 'screenshots',
+                    ),
+                  ),
+                ),
+                const CategoryDivider(),
+                ListTile(
+                  title: Text('search_page_selfies', style: categoryTitleStyle)
+                      .tr(),
+                  leading: Icon(
+                    Icons.photo_camera_front_outlined,
+                    color: categoryIconColor,
+                  ),
+                  onTap: () => context.pushRoute(
+                    SearchResultRoute(
+                      searchTerm: 'selfies',
+                    ),
+                  ),
+                ),
+                const CategoryDivider(),
+                ListTile(
+                  title: Text('search_page_videos', style: categoryTitleStyle)
+                      .tr(),
+                  leading: Icon(
+                    Icons.play_circle_outline,
+                    color: categoryIconColor,
+                  ),
+                  onTap: () => context.pushRoute(const AllVideosRoute()),
+                ),
+                const CategoryDivider(),
+                ListTile(
+                  title: Text(
+                    'search_page_motion_photos',
+                    style: categoryTitleStyle,
+                  ).tr(),
+                  leading: Icon(
+                    Icons.motion_photos_on_outlined,
+                    color: categoryIconColor,
+                  ),
+                  onTap: () => context.pushRoute(const AllMotionPhotosRoute()),
+                ),
+              ],
+            ),
+            if (isSearchEnabled)
+              SearchSuggestionList(onSubmitted: onSearchSubmitted),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+class CategoryDivider extends StatelessWidget {
+  const CategoryDivider({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return const Padding(
+      padding: EdgeInsets.only(
+        left: 56,
+        right: 16,
+      ),
+      child: Divider(
+        height: 0,
+      ),
+    );
+  }
+}

mobile/lib/modules/search/views/search_result_page.dart

@@ -0,0 +1,213 @@
+import 'package:auto_route/auto_route.dart';
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_hooks/flutter_hooks.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/modules/search/providers/search_page_state.provider.dart';
+import 'package:immich_mobile/modules/search/providers/search_result_page.provider.dart';
+import 'package:immich_mobile/modules/search/ui/search_suggestion_list.dart';
+import 'package:immich_mobile/shared/ui/asset_grid/multiselect_grid.dart';
+import 'package:immich_mobile/shared/ui/immich_loading_indicator.dart';
+
+class SearchType {
+  SearchType({required this.isSmart, required this.searchTerm});
+
+  final bool isSmart;
+  final String searchTerm;
+}
+
+SearchType _getSearchType(String searchTerm) {
+  if (searchTerm.startsWith('m:')) {
+    return SearchType(isSmart: false, searchTerm: searchTerm.substring(2));
+  } else {
+    return SearchType(isSmart: true, searchTerm: searchTerm);
+  }
+}
+
+@RoutePage()
+class SearchResultPage extends HookConsumerWidget {
+  const SearchResultPage({
+    super.key,
+    required this.searchTerm,
+  });
+
+  final String searchTerm;
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final searchTermController = useTextEditingController(text: "");
+    final isNewSearch = useState(false);
+    final currentSearchTerm = useState(searchTerm);
+
+    FocusNode? searchFocusNode;
+
+    useEffect(
+      () {
+        searchFocusNode = FocusNode();
+
+        var searchType = _getSearchType(searchTerm);
+
+        Future.delayed(
+          Duration.zero,
+          () => ref
+              .read(searchResultPageProvider.notifier)
+              .search(searchType.searchTerm, smartSearch: searchType.isSmart),
+        );
+        return () => searchFocusNode?.dispose();
+      },
+      [],
+    );
+
+    Future<void> onSearchSubmitted(String newSearchTerm) {
+      debugPrint("Re-Search with $newSearchTerm");
+      searchFocusNode?.unfocus();
+      isNewSearch.value = false;
+      currentSearchTerm.value = newSearchTerm;
+      var searchType = _getSearchType(newSearchTerm);
+      return ref
+          .watch(searchResultPageProvider.notifier)
+          .search(searchType.searchTerm, smartSearch: searchType.isSmart);
+    }
+
+    buildTextField() {
+      return TextField(
+        controller: searchTermController,
+        focusNode: searchFocusNode,
+        autofocus: false,
+        onTap: () {
+          searchTermController.clear();
+          ref.watch(searchPageStateProvider.notifier).setSearchTerm("");
+          searchFocusNode?.requestFocus();
+        },
+        textInputAction: TextInputAction.search,
+        onSubmitted: (searchTerm) {
+          if (searchTerm.isNotEmpty) {
+            searchTermController.clear();
+            onSearchSubmitted(searchTerm);
+          } else {
+            isNewSearch.value = false;
+          }
+        },
+        onChanged: (value) {
+          ref.watch(searchPageStateProvider.notifier).setSearchTerm(value);
+        },
+        decoration: InputDecoration(
+          hintText: 'search_result_page_new_search_hint'.tr(),
+          enabledBorder: const UnderlineInputBorder(
+            borderSide: BorderSide(color: Colors.transparent),
+          ),
+          focusedBorder: const UnderlineInputBorder(
+            borderSide: BorderSide(color: Colors.transparent),
+          ),
+          hintStyle: TextStyle(
+            fontWeight: FontWeight.bold,
+            fontSize: 16.0,
+            color: context.isDarkTheme
+                ? Colors.grey[500]
+                : Colors.black.withOpacity(0.5),
+          ),
+        ),
+      );
+    }
+
+    buildChip() {
+      return Chip(
+        label: Wrap(
+          spacing: 5,
+          runAlignment: WrapAlignment.center,
+          crossAxisAlignment: WrapCrossAlignment.center,
+          alignment: WrapAlignment.center,
+          children: [
+            Text(
+              currentSearchTerm.value,
+              style: TextStyle(
+                color: context.primaryColor,
+                fontSize: 13,
+                fontWeight: FontWeight.bold,
+              ),
+              maxLines: 1,
+            ),
+            Icon(
+              Icons.close_rounded,
+              color: context.primaryColor,
+              size: 20,
+            ),
+          ],
+        ),
+        backgroundColor: context.primaryColor.withAlpha(50),
+      );
+    }
+
+    Future<void> refresh() async => onSearchSubmitted(currentSearchTerm.value);
+
+    buildSearchResult() {
+      final searchResultPageState = ref.watch(searchResultPageProvider);
+
+      if (searchResultPageState.isError) {
+        return Padding(
+          padding: const EdgeInsets.all(12),
+          child: const Text("common_server_error").tr(),
+        );
+      }
+
+      if (searchResultPageState.isLoading) {
+        return const Center(child: ImmichLoadingIndicator());
+      }
+
+      if (searchResultPageState.isSuccess) {
+        return MultiselectGrid(
+          renderListProvider: searchRenderListProvider,
+          archiveEnabled: true,
+          deleteEnabled: true,
+          editEnabled: true,
+          favoriteEnabled: true,
+          stackEnabled: false,
+          onRefresh: refresh,
+        );
+      }
+
+      return const SizedBox();
+    }
+
+    return Scaffold(
+      appBar: AppBar(
+        leading: IconButton(
+          splashRadius: 20,
+          onPressed: () {
+            if (isNewSearch.value) {
+              isNewSearch.value = false;
+            } else {
+              context.popRoute(true);
+            }
+          },
+          icon: const Icon(Icons.arrow_back_ios_rounded),
+        ),
+        title: GestureDetector(
+          onTap: () {
+            isNewSearch.value = true;
+            searchFocusNode?.requestFocus();
+          },
+          child: isNewSearch.value ? buildTextField() : buildChip(),
+        ),
+        centerTitle: false,
+      ),
+      body: GestureDetector(
+        onTap: () {
+          if (searchFocusNode != null) {
+            searchFocusNode?.unfocus();
+          }
+
+          ref.watch(searchPageStateProvider.notifier).disableSearch();
+        },
+        child: Stack(
+          children: [
+            buildSearchResult(),
+            if (isNewSearch.value)
+              SearchSuggestionList(onSubmitted: onSearchSubmitted),
+          ],
+        ),
+      ),
+    );
+  }
+}

mobile/lib/routing/router.dart

@@ -31,9 +31,7 @@ import 'package:immich_mobile/modules/login/views/change_password_page.dart';
 import 'package:immich_mobile/modules/login/views/login_page.dart';
 import 'package:immich_mobile/modules/onboarding/providers/gallery_permission.provider.dart';
 import 'package:immich_mobile/modules/onboarding/views/permission_onboarding_page.dart';
-import 'package:immich_mobile/modules/search/models/search_filter.dart';
 import 'package:immich_mobile/modules/settings/views/settings_sub_page.dart';
-import 'package:immich_mobile/modules/search/views/search_input_page.dart';
 import 'package:immich_mobile/modules/shared_link/models/shared_link.dart';
 import 'package:immich_mobile/modules/shared_link/views/shared_link_edit_page.dart';
 import 'package:immich_mobile/modules/shared_link/views/shared_link_page.dart';
@@ -45,6 +43,7 @@ import 'package:immich_mobile/modules/search/views/curated_location_page.dart';
 import 'package:immich_mobile/modules/search/views/person_result_page.dart';
 import 'package:immich_mobile/modules/search/views/recently_added_page.dart';
 import 'package:immich_mobile/modules/search/views/search_page.dart';
+import 'package:immich_mobile/modules/search/views/search_result_page.dart';
 import 'package:immich_mobile/modules/settings/views/settings_page.dart';
 import 'package:immich_mobile/routing/auth_guard.dart';
 import 'package:immich_mobile/routing/custom_transition_builders.dart';
@@ -126,6 +125,10 @@ class AppRouter extends _$AppRouter {
       page: BackupControllerRoute.page,
       guards: [_authGuard, _duplicateGuard, _backupPermissionGuard],
     ),
+    AutoRoute(
+      page: SearchResultRoute.page,
+      guards: [_authGuard, _duplicateGuard],
+    ),
     AutoRoute(
       page: CuratedLocationRoute.page,
       guards: [_authGuard, _duplicateGuard],
@@ -220,11 +223,6 @@ class AppRouter extends _$AppRouter {
       page: BackupOptionsRoute.page,
       guards: [_authGuard, _duplicateGuard],
     ),
-    CustomRoute(
-      page: SearchInputRoute.page,
-      guards: [_authGuard, _duplicateGuard],
-      transitionsBuilder: TransitionsBuilders.noTransition,
-    ),
   ];
 }
 

mobile/lib/routing/router.gr.dart

@@ -255,21 +255,22 @@ abstract class _$AppRouter extends RootStackRouter {
         child: const RecentlyAddedPage(),
       );
     },
-    SearchInputRoute.name: (routeData) {
-      final args = routeData.argsAs<SearchInputRouteArgs>(
-          orElse: () => const SearchInputRouteArgs());
+    SearchRoute.name: (routeData) {
+      final args = routeData.argsAs<SearchRouteArgs>(
+          orElse: () => const SearchRouteArgs());
       return AutoRoutePage<dynamic>(
         routeData: routeData,
-        child: SearchInputPage(
-          key: args.key,
-          prefilter: args.prefilter,
-        ),
+        child: SearchPage(key: args.key),
       );
     },
-    SearchRoute.name: (routeData) {
+    SearchResultRoute.name: (routeData) {
+      final args = routeData.argsAs<SearchResultRouteArgs>();
       return AutoRoutePage<dynamic>(
         routeData: routeData,
-        child: const SearchPage(),
+        child: SearchResultPage(
+          key: args.key,
+          searchTerm: args.searchTerm,
+        ),
       );
     },
     SelectAdditionalUserForSharingRoute.name: (routeData) {
@@ -1112,55 +1113,69 @@ class RecentlyAddedRoute extends PageRouteInfo<void> {
 }
 
 /// generated route for
-/// [SearchInputPage]
-class SearchInputRoute extends PageRouteInfo<SearchInputRouteArgs> {
-  SearchInputRoute({
+/// [SearchPage]
+class SearchRoute extends PageRouteInfo<SearchRouteArgs> {
+  SearchRoute({
     Key? key,
-    SearchFilter? prefilter,
     List<PageRouteInfo>? children,
   }) : super(
-          SearchInputRoute.name,
-          args: SearchInputRouteArgs(
-            key: key,
-            prefilter: prefilter,
-          ),
-          initialChildren: children,
-        );
-
-  static const String name = 'SearchInputRoute';
-
-  static const PageInfo<SearchInputRouteArgs> page =
-      PageInfo<SearchInputRouteArgs>(name);
-}
-
-class SearchInputRouteArgs {
-  const SearchInputRouteArgs({
-    this.key,
-    this.prefilter,
-  });
-
-  final Key? key;
-
-  final SearchFilter? prefilter;
-
-  @override
-  String toString() {
-    return 'SearchInputRouteArgs{key: $key, prefilter: $prefilter}';
-  }
-}
-
-/// generated route for
-/// [SearchPage]
-class SearchRoute extends PageRouteInfo<void> {
-  const SearchRoute({List<PageRouteInfo>? children})
-      : super(
           SearchRoute.name,
+          args: SearchRouteArgs(key: key),
           initialChildren: children,
         );
 
   static const String name = 'SearchRoute';
 
-  static const PageInfo<void> page = PageInfo<void>(name);
+  static const PageInfo<SearchRouteArgs> page = PageInfo<SearchRouteArgs>(name);
+}
+
+class SearchRouteArgs {
+  const SearchRouteArgs({this.key});
+
+  final Key? key;
+
+  @override
+  String toString() {
+    return 'SearchRouteArgs{key: $key}';
+  }
+}
+
+/// generated route for
+/// [SearchResultPage]
+class SearchResultRoute extends PageRouteInfo<SearchResultRouteArgs> {
+  SearchResultRoute({
+    Key? key,
+    required String searchTerm,
+    List<PageRouteInfo>? children,
+  }) : super(
+          SearchResultRoute.name,
+          args: SearchResultRouteArgs(
+            key: key,
+            searchTerm: searchTerm,
+          ),
+          initialChildren: children,
+        );
+
+  static const String name = 'SearchResultRoute';
+
+  static const PageInfo<SearchResultRouteArgs> page =
+      PageInfo<SearchResultRouteArgs>(name);
+}
+
+class SearchResultRouteArgs {
+  const SearchResultRouteArgs({
+    this.key,
+    required this.searchTerm,
+  });
+
+  final Key? key;
+
+  final String searchTerm;
+
+  @override
+  String toString() {
+    return 'SearchResultRouteArgs{key: $key, searchTerm: $searchTerm}';
+  }
 }
 
 /// generated route for

mobile/lib/routing/tab_navigation_observer.dart

@@ -38,7 +38,7 @@ class TabNavigationObserver extends AutoRouterObserver {
     if (route.name == 'SearchRoute') {
       // Refresh Location State
       ref.invalidate(getCuratedLocationProvider);
-      ref.invalidate(getAllPeopleProvider);
+      ref.invalidate(getCuratedPeopleProvider);
     }
 
     if (route.name == 'SharingRoute') {

mobile/lib/shared/ui/asset_grid/multiselect_grid.dart

@@ -43,7 +43,6 @@ class MultiselectGrid extends HookConsumerWidget {
     this.editEnabled = false,
     this.unarchive = false,
     this.unfavorite = false,
-    this.emptyIndicator,
   });
 
   final ProviderListenable<AsyncValue<RenderList>> renderListProvider;
@@ -58,12 +57,12 @@ class MultiselectGrid extends HookConsumerWidget {
   final bool favoriteEnabled;
   final bool unfavorite;
   final bool editEnabled;
-  final Widget? emptyIndicator;
+
   Widget buildDefaultLoadingIndicator() =>
       const Center(child: ImmichLoadingIndicator());
 
   Widget buildEmptyIndicator() =>
-      emptyIndicator ?? const Center(child: Text("No assets to show"));
+      const Center(child: Text("No assets to show"));
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {

mobile/lib/shared/views/tab_controller_page.dart

@@ -6,6 +6,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/modules/asset_viewer/providers/scroll_notifier.provider.dart';
 import 'package:immich_mobile/modules/home/providers/multiselect.provider.dart';
+import 'package:immich_mobile/modules/search/ui/immich_search_bar.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/shared/providers/asset.provider.dart';
 import 'package:immich_mobile/shared/providers/tab.provider.dart';
@@ -52,6 +53,10 @@ class TabControllerPage extends HookConsumerWidget {
             // Scroll to top
             scrollToTopNotifierProvider.scrollToTop();
           }
+          if (tabsRouter.activeIndex == 1 && index == 1) {
+            // Focus search
+            searchFocusNotifier.requestFocus();
+          }
 
           HapticFeedback.selectionClick();
           tabsRouter.setActiveIndex(index);
@@ -106,7 +111,10 @@ class TabControllerPage extends HookConsumerWidget {
             // Scroll to top
             scrollToTopNotifierProvider.scrollToTop();
           }
-
+          if (tabsRouter.activeIndex == 1 && index == 1) {
+            // Focus search
+            searchFocusNotifier.requestFocus();
+          }
           HapticFeedback.selectionClick();
           tabsRouter.setActiveIndex(index);
           ref.read(tabProvider.notifier).state = TabEnum.values[index];
@@ -162,11 +170,11 @@ class TabControllerPage extends HookConsumerWidget {
 
     final multiselectEnabled = ref.watch(multiselectProvider);
     return AutoTabsRouter(
-      routes: const [
-        HomeRoute(),
+      routes: [
+        const HomeRoute(),
         SearchRoute(),
-        SharingRoute(),
-        LibraryRoute(),
+        const SharingRoute(),
+        const LibraryRoute(),
       ],
       duration: const Duration(milliseconds: 600),
       transitionBuilder: (context, child, animation) => FadeTransition(

mobile/lib/utils/immich_app_theme.dart

@@ -33,9 +33,6 @@ final ThemeData base = ThemeData(
 final ThemeData immichLightTheme = ThemeData(
   useMaterial3: true,
   brightness: Brightness.light,
-  colorScheme: ColorScheme.fromSeed(
-    seedColor: Colors.indigo,
-  ),
   primarySwatch: Colors.indigo,
   primaryColor: Colors.indigo,
   hintColor: Colors.indigo,
@@ -161,10 +158,6 @@ final ThemeData immichDarkTheme = ThemeData(
   brightness: Brightness.dark,
   primarySwatch: Colors.indigo,
   primaryColor: immichDarkThemePrimaryColor,
-  colorScheme: ColorScheme.fromSeed(
-    seedColor: immichDarkThemePrimaryColor,
-    brightness: Brightness.dark,
-  ),
   scaffoldBackgroundColor: immichDarkBackgroundColor,
   hintColor: Colors.grey[600],
   fontFamily: 'Overpass',

mobile/openapi/README.md

@@ -96,6 +96,7 @@ Class | Method | HTTP request | Description
 *AssetApi* | [**deleteAssets**](doc//AssetApi.md#deleteassets) | **DELETE** /asset | 
 *AssetApi* | [**getAllAssets**](doc//AssetApi.md#getallassets) | **GET** /asset | 
 *AssetApi* | [**getAllUserAssetsByDeviceId**](doc//AssetApi.md#getalluserassetsbydeviceid) | **GET** /asset/device/{deviceId} | 
+*AssetApi* | [**getAssetDuplicates**](doc//AssetApi.md#getassetduplicates) | **GET** /asset/duplicates | 
 *AssetApi* | [**getAssetInfo**](doc//AssetApi.md#getassetinfo) | **GET** /asset/{id} | 
 *AssetApi* | [**getAssetSearchTerms**](doc//AssetApi.md#getassetsearchterms) | **GET** /asset/search-terms | 
 *AssetApi* | [**getAssetStatistics**](doc//AssetApi.md#getassetstatistics) | **GET** /asset/statistics | 

mobile/openapi/doc/AllJobStatusResponseDto.md

@@ -9,6 +9,7 @@ import 'package:openapi/api.dart';
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **backgroundTask** | [**JobStatusDto**](JobStatusDto.md) |  | 
+**duplicateDetection** | [**JobStatusDto**](JobStatusDto.md) |  | 
 **faceDetection** | [**JobStatusDto**](JobStatusDto.md) |  | 
 **facialRecognition** | [**JobStatusDto**](JobStatusDto.md) |  | 
 **library_** | [**JobStatusDto**](JobStatusDto.md) |  | 

mobile/openapi/doc/AssetApi.md

@@ -14,6 +14,7 @@ Method | HTTP request | Description
 [**deleteAssets**](AssetApi.md#deleteassets) | **DELETE** /asset | 
 [**getAllAssets**](AssetApi.md#getallassets) | **GET** /asset | 
 [**getAllUserAssetsByDeviceId**](AssetApi.md#getalluserassetsbydeviceid) | **GET** /asset/device/{deviceId} | 
+[**getAssetDuplicates**](AssetApi.md#getassetduplicates) | **GET** /asset/duplicates | 
 [**getAssetInfo**](AssetApi.md#getassetinfo) | **GET** /asset/{id} | 
 [**getAssetSearchTerms**](AssetApi.md#getassetsearchterms) | **GET** /asset/search-terms | 
 [**getAssetStatistics**](AssetApi.md#getassetstatistics) | **GET** /asset/statistics | 
@@ -328,6 +329,57 @@ Name | Type | Description  | Notes
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+# **getAssetDuplicates**
+> List<AssetResponseDto> getAssetDuplicates()
+
+
+
+### Example
+```dart
+import 'package:openapi/api.dart';
+// TODO Configure API key authorization: cookie
+//defaultApiClient.getAuthentication<ApiKeyAuth>('cookie').apiKey = 'YOUR_API_KEY';
+// uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+//defaultApiClient.getAuthentication<ApiKeyAuth>('cookie').apiKeyPrefix = 'Bearer';
+// TODO Configure API key authorization: api_key
+//defaultApiClient.getAuthentication<ApiKeyAuth>('api_key').apiKey = 'YOUR_API_KEY';
+// uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+//defaultApiClient.getAuthentication<ApiKeyAuth>('api_key').apiKeyPrefix = 'Bearer';
+// TODO Configure HTTP Bearer authorization: bearer
+// Case 1. Use String Token
+//defaultApiClient.getAuthentication<HttpBearerAuth>('bearer').setAccessToken('YOUR_ACCESS_TOKEN');
+// Case 2. Use Function which generate token.
+// String yourTokenGeneratorFunction() { ... }
+//defaultApiClient.getAuthentication<HttpBearerAuth>('bearer').setAccessToken(yourTokenGeneratorFunction);
+
+final api_instance = AssetApi();
+
+try {
+    final result = api_instance.getAssetDuplicates();
+    print(result);
+} catch (e) {
+    print('Exception when calling AssetApi->getAssetDuplicates: $e\n');
+}
+```
+
+### Parameters
+This endpoint does not need any parameter.
+
+### Return type
+
+[**List<AssetResponseDto>**](AssetResponseDto.md)
+
+### Authorization
+
+[cookie](../README.md#cookie), [api_key](../README.md#api_key), [bearer](../README.md#bearer)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **getAssetInfo**
 > AssetResponseDto getAssetInfo(id, key)
 

mobile/openapi/doc/CLIPConfig.md

@@ -8,6 +8,7 @@ import 'package:openapi/api.dart';
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
+**duplicateThreshold** | **double** |  | 
 **enabled** | **bool** |  | 
 **mode** | [**CLIPMode**](CLIPMode.md) |  | [optional] 
 **modelName** | **String** |  | 

mobile/openapi/lib/api/asset_api.dart

@@ -326,6 +326,50 @@ class AssetApi {
     return null;
   }
 
+  /// Performs an HTTP 'GET /asset/duplicates' operation and returns the [Response].
+  Future<Response> getAssetDuplicatesWithHttpInfo() async {
+    // ignore: prefer_const_declarations
+    final path = r'/asset/duplicates';
+
+    // ignore: prefer_final_locals
+    Object? postBody;
+
+    final queryParams = <QueryParam>[];
+    final headerParams = <String, String>{};
+    final formParams = <String, String>{};
+
+    const contentTypes = <String>[];
+
+
+    return apiClient.invokeAPI(
+      path,
+      'GET',
+      queryParams,
+      postBody,
+      headerParams,
+      formParams,
+      contentTypes.isEmpty ? null : contentTypes.first,
+    );
+  }
+
+  Future<List<AssetResponseDto>?> getAssetDuplicates() async {
+    final response = await getAssetDuplicatesWithHttpInfo();
+    if (response.statusCode >= HttpStatus.badRequest) {
+      throw ApiException(response.statusCode, await _decodeBodyBytes(response));
+    }
+    // When a remote server returns no body with a status of 204, we shall not decode it.
+    // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
+    // FormatException when trying to decode an empty string.
+    if (response.body.isNotEmpty && response.statusCode != HttpStatus.noContent) {
+      final responseBody = await _decodeBodyBytes(response);
+      return (await apiClient.deserializeAsync(responseBody, 'List<AssetResponseDto>') as List)
+        .cast<AssetResponseDto>()
+        .toList(growable: false);
+
+    }
+    return null;
+  }
+
   /// Performs an HTTP 'GET /asset/{id}' operation and returns the [Response].
   /// Parameters:
   ///

mobile/openapi/lib/model/all_job_status_response_dto.dart

@@ -14,6 +14,7 @@ class AllJobStatusResponseDto {
   /// Returns a new [AllJobStatusResponseDto] instance.
   AllJobStatusResponseDto({
     required this.backgroundTask,
+    required this.duplicateDetection,
     required this.faceDetection,
     required this.facialRecognition,
     required this.library_,
@@ -29,6 +30,8 @@ class AllJobStatusResponseDto {
 
   JobStatusDto backgroundTask;
 
+  JobStatusDto duplicateDetection;
+
   JobStatusDto faceDetection;
 
   JobStatusDto facialRecognition;
@@ -54,6 +57,7 @@ class AllJobStatusResponseDto {
   @override
   bool operator ==(Object other) => identical(this, other) || other is AllJobStatusResponseDto &&
     other.backgroundTask == backgroundTask &&
+    other.duplicateDetection == duplicateDetection &&
     other.faceDetection == faceDetection &&
     other.facialRecognition == facialRecognition &&
     other.library_ == library_ &&
@@ -70,6 +74,7 @@ class AllJobStatusResponseDto {
   int get hashCode =>
     // ignore: unnecessary_parenthesis
     (backgroundTask.hashCode) +
+    (duplicateDetection.hashCode) +
     (faceDetection.hashCode) +
     (facialRecognition.hashCode) +
     (library_.hashCode) +
@@ -83,11 +88,12 @@ class AllJobStatusResponseDto {
     (videoConversion.hashCode);
 
   @override
-  String toString() => 'AllJobStatusResponseDto[backgroundTask=$backgroundTask, faceDetection=$faceDetection, facialRecognition=$facialRecognition, library_=$library_, metadataExtraction=$metadataExtraction, migration=$migration, search=$search, sidecar=$sidecar, smartSearch=$smartSearch, storageTemplateMigration=$storageTemplateMigration, thumbnailGeneration=$thumbnailGeneration, videoConversion=$videoConversion]';
+  String toString() => 'AllJobStatusResponseDto[backgroundTask=$backgroundTask, duplicateDetection=$duplicateDetection, faceDetection=$faceDetection, facialRecognition=$facialRecognition, library_=$library_, metadataExtraction=$metadataExtraction, migration=$migration, search=$search, sidecar=$sidecar, smartSearch=$smartSearch, storageTemplateMigration=$storageTemplateMigration, thumbnailGeneration=$thumbnailGeneration, videoConversion=$videoConversion]';
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
       json[r'backgroundTask'] = this.backgroundTask;
+      json[r'duplicateDetection'] = this.duplicateDetection;
       json[r'faceDetection'] = this.faceDetection;
       json[r'facialRecognition'] = this.facialRecognition;
       json[r'library'] = this.library_;
@@ -111,6 +117,7 @@ class AllJobStatusResponseDto {
 
       return AllJobStatusResponseDto(
         backgroundTask: JobStatusDto.fromJson(json[r'backgroundTask'])!,
+        duplicateDetection: JobStatusDto.fromJson(json[r'duplicateDetection'])!,
         faceDetection: JobStatusDto.fromJson(json[r'faceDetection'])!,
         facialRecognition: JobStatusDto.fromJson(json[r'facialRecognition'])!,
         library_: JobStatusDto.fromJson(json[r'library'])!,
@@ -170,6 +177,7 @@ class AllJobStatusResponseDto {
   /// The list of required keys that must be present in a JSON.
   static const requiredKeys = <String>{
     'backgroundTask',
+    'duplicateDetection',
     'faceDetection',
     'facialRecognition',
     'library',

mobile/openapi/lib/model/clip_config.dart

@@ -13,12 +13,15 @@ part of openapi.api;
 class CLIPConfig {
   /// Returns a new [CLIPConfig] instance.
   CLIPConfig({
+    required this.duplicateThreshold,
     required this.enabled,
     this.mode,
     required this.modelName,
     this.modelType,
   });
 
+  double duplicateThreshold;
+
   bool enabled;
 
   ///
@@ -41,6 +44,7 @@ class CLIPConfig {
 
   @override
   bool operator ==(Object other) => identical(this, other) || other is CLIPConfig &&
+    other.duplicateThreshold == duplicateThreshold &&
     other.enabled == enabled &&
     other.mode == mode &&
     other.modelName == modelName &&
@@ -49,16 +53,18 @@ class CLIPConfig {
   @override
   int get hashCode =>
     // ignore: unnecessary_parenthesis
+    (duplicateThreshold.hashCode) +
     (enabled.hashCode) +
     (mode == null ? 0 : mode!.hashCode) +
     (modelName.hashCode) +
     (modelType == null ? 0 : modelType!.hashCode);
 
   @override
-  String toString() => 'CLIPConfig[enabled=$enabled, mode=$mode, modelName=$modelName, modelType=$modelType]';
+  String toString() => 'CLIPConfig[duplicateThreshold=$duplicateThreshold, enabled=$enabled, mode=$mode, modelName=$modelName, modelType=$modelType]';
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
+      json[r'duplicateThreshold'] = this.duplicateThreshold;
       json[r'enabled'] = this.enabled;
     if (this.mode != null) {
       json[r'mode'] = this.mode;
@@ -82,6 +88,7 @@ class CLIPConfig {
       final json = value.cast<String, dynamic>();
 
       return CLIPConfig(
+        duplicateThreshold: mapValueOfType<double>(json, r'duplicateThreshold')!,
         enabled: mapValueOfType<bool>(json, r'enabled')!,
         mode: CLIPMode.fromJson(json[r'mode']),
         modelName: mapValueOfType<String>(json, r'modelName')!,
@@ -133,6 +140,7 @@ class CLIPConfig {
 
   /// The list of required keys that must be present in a JSON.
   static const requiredKeys = <String>{
+    'duplicateThreshold',
     'enabled',
     'modelName',
   };

mobile/openapi/lib/model/job_name.dart

@@ -29,6 +29,7 @@ class JobName {
   static const faceDetection = JobName._(r'faceDetection');
   static const facialRecognition = JobName._(r'facialRecognition');
   static const smartSearch = JobName._(r'smartSearch');
+  static const duplicateDetection = JobName._(r'duplicateDetection');
   static const backgroundTask = JobName._(r'backgroundTask');
   static const storageTemplateMigration = JobName._(r'storageTemplateMigration');
   static const migration = JobName._(r'migration');
@@ -44,6 +45,7 @@ class JobName {
     faceDetection,
     facialRecognition,
     smartSearch,
+    duplicateDetection,
     backgroundTask,
     storageTemplateMigration,
     migration,
@@ -94,6 +96,7 @@ class JobNameTypeTransformer {
         case r'faceDetection': return JobName.faceDetection;
         case r'facialRecognition': return JobName.facialRecognition;
         case r'smartSearch': return JobName.smartSearch;
+        case r'duplicateDetection': return JobName.duplicateDetection;
         case r'backgroundTask': return JobName.backgroundTask;
         case r'storageTemplateMigration': return JobName.storageTemplateMigration;
         case r'migration': return JobName.migration;

mobile/openapi/test/all_job_status_response_dto_test.dart

@@ -21,6 +21,11 @@ void main() {
       // TODO
     });
 
+    // JobStatusDto duplicateDetection
+    test('to test the property `duplicateDetection`', () async {
+      // TODO
+    });
+
     // JobStatusDto faceDetection
     test('to test the property `faceDetection`', () async {
       // TODO

mobile/openapi/test/asset_api_test.dart

@@ -50,6 +50,11 @@ void main() {
       // TODO
     });
 
+    //Future<List<AssetResponseDto>> getAssetDuplicates() async
+    test('test getAssetDuplicates', () async {
+      // TODO
+    });
+
     //Future<AssetResponseDto> getAssetInfo(String id, { String key }) async
     test('test getAssetInfo', () async {
       // TODO

mobile/openapi/test/clip_config_test.dart

@@ -16,6 +16,11 @@ void main() {
   // final instance = CLIPConfig();
 
   group('test CLIPConfig', () {
+    // double duplicateThreshold
+    test('to test the property `duplicateThreshold`', () async {
+      // TODO
+    });
+
     // bool enabled
     test('to test the property `enabled`', () async {
       // TODO

mobile/pubspec.yaml

@@ -54,7 +54,7 @@ dependencies:
   device_info_plus: ^9.1.1
   connectivity_plus: ^5.0.2
   wakelock_plus: ^1.1.4
-  flutter_local_notifications: ^17.0.0
+  flutter_local_notifications: ^16.3.2
   timezone: ^0.9.2
   octo_image: ^2.0.0
   thumbhash: 0.1.0+1

open-api/immich-openapi-specs.json

@@ -1213,6 +1213,41 @@
         ]
       }
     },
+    "/asset/duplicates": {
+      "get": {
+        "operationId": "getAssetDuplicates",
+        "parameters": [],
+        "responses": {
+          "200": {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "items": {
+                    "$ref": "#/components/schemas/AssetResponseDto"
+                  },
+                  "type": "array"
+                }
+              }
+            },
+            "description": ""
+          }
+        },
+        "security": [
+          {
+            "bearer": []
+          },
+          {
+            "cookie": []
+          },
+          {
+            "api_key": []
+          }
+        ],
+        "tags": [
+          "Asset"
+        ]
+      }
+    },
     "/asset/exist": {
       "post": {
         "description": "Checks if multiple assets exist on the server and returns all existing - used by background backup",
@@ -6831,6 +6866,9 @@
           "backgroundTask": {
             "$ref": "#/components/schemas/JobStatusDto"
           },
+          "duplicateDetection": {
+            "$ref": "#/components/schemas/JobStatusDto"
+          },
           "faceDetection": {
             "$ref": "#/components/schemas/JobStatusDto"
           },
@@ -6867,6 +6905,7 @@
         },
         "required": [
           "backgroundTask",
+          "duplicateDetection",
           "faceDetection",
           "facialRecognition",
           "library",
@@ -7479,6 +7518,10 @@
       },
       "CLIPConfig": {
         "properties": {
+          "duplicateThreshold": {
+            "format": "float",
+            "type": "number"
+          },
           "enabled": {
             "type": "boolean"
           },
@@ -7493,6 +7536,7 @@
           }
         },
         "required": [
+          "duplicateThreshold",
           "enabled",
           "modelName"
         ],
@@ -8178,6 +8222,7 @@
           "faceDetection",
           "facialRecognition",
           "smartSearch",
+          "duplicateDetection",
           "backgroundTask",
           "storageTemplateMigration",
           "migration",

open-api/typescript-sdk/src/fetch-client.ts

@@ -429,6 +429,7 @@ export type JobStatusDto = {
 };
 export type AllJobStatusResponseDto = {
     backgroundTask: JobStatusDto;
+    duplicateDetection: JobStatusDto;
     faceDetection: JobStatusDto;
     facialRecognition: JobStatusDto;
     library: JobStatusDto;
@@ -858,6 +859,7 @@ export type SystemConfigLoggingDto = {
     level: LogLevel;
 };
 export type ClipConfig = {
+    duplicateThreshold: number;
     enabled: boolean;
     mode?: CLIPMode;
     modelName: string;
@@ -1321,6 +1323,14 @@ export function getAllUserAssetsByDeviceId({ deviceId }: {
         ...opts
     }));
 }
+export function getAssetDuplicates(opts?: Oazapfts.RequestOpts) {
+    return oazapfts.ok(oazapfts.fetchJson<{
+        status: 200;
+        data: AssetResponseDto[];
+    }>("/asset/duplicates", {
+        ...opts
+    }));
+}
 /**
  * Checks if multiple assets exist on the server and returns all existing - used by background backup
  */
@@ -2816,6 +2826,7 @@ export enum JobName {
     FaceDetection = "faceDetection",
     FacialRecognition = "facialRecognition",
     SmartSearch = "smartSearch",
+    DuplicateDetection = "duplicateDetection",
     BackgroundTask = "backgroundTask",
     StorageTemplateMigration = "storageTemplateMigration",
     Migration = "migration",

server/src/controllers/asset.controller.ts

@@ -70,6 +70,11 @@ export class AssetController {
     return this.service.getStatistics(auth, dto);
   }
 
+  @Get('duplicates')
+  getAssetDuplicates(@Auth() auth: AuthDto): Promise<AssetResponseDto[]> {
+    return this.service.getDuplicates(auth);
+  }
+
   @Post('jobs')
   @HttpCode(HttpStatus.NO_CONTENT)
   runAssetJobs(@Auth() auth: AuthDto, @Body() dto: AssetJobsDto): Promise<void> {

server/src/cores/system-config.core.ts

@@ -71,6 +71,7 @@ export const defaults = Object.freeze<SystemConfig>({
     clip: {
       enabled: true,
       modelName: 'ViT-B-32__openai',
+      duplicateThreshold: 0.03,
     },
     facialRecognition: {
       enabled: true,

server/src/dtos/job.dto.ts

@@ -73,6 +73,9 @@ export class AllJobStatusResponseDto implements Record<QueueName, JobStatusDto>
   @ApiProperty({ type: JobStatusDto })
   [QueueName.SEARCH]!: JobStatusDto;
 
+  @ApiProperty({ type: JobStatusDto })
+  [QueueName.DUPLICATE_DETECTION]!: JobStatusDto;
+
   @ApiProperty({ type: JobStatusDto })
   [QueueName.FACE_DETECTION]!: JobStatusDto;
 

server/src/dtos/model-config.dto.ts

@@ -23,6 +23,13 @@ export class CLIPConfig extends ModelConfig {
   @Optional()
   @ApiProperty({ enumName: 'CLIPMode', enum: CLIPMode })
   mode?: CLIPMode;
+
+  @IsNumber()
+  @Min(0.01)
+  @Max(0.1)
+  @Type(() => Number)
+  @ApiProperty({ type: 'number', format: 'float' })
+  duplicateThreshold!: number;
 }
 
 export class RecognitionConfig extends ModelConfig {

server/src/entities/asset-duplicate.entity.ts

@@ -0,0 +1,16 @@
+import { AssetEntity } from 'src/entities/asset.entity';
+import { Entity, Index, JoinColumn, OneToMany, PrimaryColumn } from 'typeorm';
+
+@Entity('asset_duplicates')
+@Index('asset_duplicates_assetId_uindex', ['assetId'], { unique: true })
+export class AssetDuplicateEntity {
+  @OneToMany(() => AssetEntity, (asset) => asset.duplicates, { onDelete: 'CASCADE', onUpdate: 'CASCADE' })
+  @JoinColumn({ name: 'assetId', referencedColumnName: 'id' })
+  assets!: AssetEntity;
+
+  @PrimaryColumn()
+  id!: string;
+
+  @PrimaryColumn()
+  assetId!: string;
+}

server/src/entities/asset-job-status.entity.ts

@@ -15,4 +15,7 @@ export class AssetJobStatusEntity {
 
   @Column({ type: 'timestamptz', nullable: true })
   metadataExtractedAt!: Date | null;
+
+  @Column({ type: 'timestamptz', nullable: true })
+  duplicatesDetectedAt!: Date | null;
 }

server/src/entities/asset.entity.ts

@@ -1,4 +1,5 @@
 import { AlbumEntity } from 'src/entities/album.entity';
+import { AssetDuplicateEntity } from 'src/entities/asset-duplicate.entity';
 import { AssetFaceEntity } from 'src/entities/asset-face.entity';
 import { AssetJobStatusEntity } from 'src/entities/asset-job-status.entity';
 import { AssetStackEntity } from 'src/entities/asset-stack.entity';
@@ -168,6 +169,13 @@ export class AssetEntity {
 
   @OneToOne(() => AssetJobStatusEntity, (jobStatus) => jobStatus.asset, { nullable: true })
   jobStatus?: AssetJobStatusEntity;
+
+  @Column({ nullable: true })
+  duplicateId?: string | null;
+
+  @ManyToOne(() => AssetDuplicateEntity, { nullable: true })
+  @JoinColumn({ name: 'duplicateId' })
+  duplicates?: AssetDuplicateEntity | null;
 }
 
 export enum AssetType {

server/src/entities/index.ts

@@ -20,12 +20,14 @@ import { SystemMetadataEntity } from 'src/entities/system-metadata.entity';
 import { TagEntity } from 'src/entities/tag.entity';
 import { UserTokenEntity } from 'src/entities/user-token.entity';
 import { UserEntity } from 'src/entities/user.entity';
+import { AssetDuplicateEntity } from 'src/entities/asset-duplicate.entity';
 
 export const entities = [
   ActivityEntity,
   AlbumEntity,
   APIKeyEntity,
   AssetEntity,
+  AssetDuplicateEntity,
   AssetStackEntity,
   AssetFaceEntity,
   AssetJobStatusEntity,

server/src/entities/smart-search.entity.ts

@@ -11,10 +11,6 @@ export class SmartSearchEntity {
   assetId!: string;
 
   @Index('clip_index', { synchronize: false })
-  @Column({
-    type: 'float4',
-    array: true,
-    select: false,
-  })
+  @Column({ type: 'float4', array: true, transformer: { from: (v) => JSON.parse(v), to: (v) => v } })
   embedding!: number[];
 }

server/src/entities/system-config.entity.ts

@@ -39,7 +39,7 @@ export enum SystemConfigKey {
   JOB_METADATA_EXTRACTION_CONCURRENCY = 'job.metadataExtraction.concurrency',
   JOB_VIDEO_CONVERSION_CONCURRENCY = 'job.videoConversion.concurrency',
   JOB_FACE_DETECTION_CONCURRENCY = 'job.faceDetection.concurrency',
-  JOB_CLIP_ENCODING_CONCURRENCY = 'job.smartSearch.concurrency',
+  JOB_SMART_SEARCH_CONCURRENCY = 'job.smartSearch.concurrency',
   JOB_BACKGROUND_TASK_CONCURRENCY = 'job.backgroundTask.concurrency',
   JOB_STORAGE_TEMPLATE_MIGRATION_CONCURRENCY = 'job.storageTemplateMigration.concurrency',
   JOB_SEARCH_CONCURRENCY = 'job.search.concurrency',
@@ -208,6 +208,7 @@ export interface SystemConfig {
     clip: {
       enabled: boolean;
       modelName: string;
+      duplicateThreshold: number;
     };
     facialRecognition: {
       enabled: boolean;

server/src/interfaces/asset-duplicate.interface.ts

@@ -0,0 +1,9 @@
+import { AssetDuplicateEntity } from 'src/entities/asset-duplicate.entity';
+
+export const IAssetDuplicateRepository = 'IAssetDuplicateRepository';
+
+export interface IAssetDuplicateRepository {
+  upsert(id: string, assetIds: string[], oldDuplicateIds?: string[]): Promise<void>;
+  delete(id: string): Promise<void>;
+  getById(id: string): Promise<AssetDuplicateEntity | null>;
+}

server/src/interfaces/asset.interface.ts

@@ -40,6 +40,7 @@ export enum WithoutProperty {
   ENCODED_VIDEO = 'encoded-video',
   EXIF = 'exif',
   SMART_SEARCH = 'smart-search',
+  DUPLICATE = 'duplicate',
   OBJECT_TAGS = 'object-tags',
   FACES = 'faces',
   PERSON = 'person',
@@ -60,6 +61,7 @@ export interface AssetBuilderOptions {
   isArchived?: boolean;
   isFavorite?: boolean;
   isTrashed?: boolean;
+  isDuplicate?: boolean;
   albumId?: string;
   personId?: string;
   userIds?: string[];
@@ -171,8 +173,9 @@ export interface IAssetRepository {
   getTimeBuckets(options: TimeBucketOptions): Promise<TimeBucketItem[]>;
   getTimeBucket(timeBucket: string, options: TimeBucketOptions): Promise<AssetEntity[]>;
   upsertExif(exif: Partial<ExifEntity>): Promise<void>;
-  upsertJobStatus(jobStatus: Partial<AssetJobStatusEntity>): Promise<void>;
+  upsertJobStatus(jobStatus: Partial<AssetJobStatusEntity> | Partial<AssetJobStatusEntity>[]): Promise<void>;
   getAssetIdByCity(userId: string, options: AssetExploreFieldOptions): Promise<SearchExploreItem<string>>;
   getAssetIdByTag(userId: string, options: AssetExploreFieldOptions): Promise<SearchExploreItem<string>>;
+  getDuplicates(options: AssetBuilderOptions): Promise<AssetEntity[]>;
   searchMetadata(query: string, userIds: string[], options: MetadataSearchOptions): Promise<AssetEntity[]>;
 }

server/src/interfaces/job.interface.ts

@@ -5,6 +5,7 @@ export enum QueueName {
   FACE_DETECTION = 'faceDetection',
   FACIAL_RECOGNITION = 'facialRecognition',
   SMART_SEARCH = 'smartSearch',
+  DUPLICATE_DETECTION = 'duplicateDetection',
   BACKGROUND_TASK = 'backgroundTask',
   STORAGE_TEMPLATE_MIGRATION = 'storageTemplateMigration',
   MIGRATION = 'migration',
@@ -15,7 +16,7 @@ export enum QueueName {
 
 export type ConcurrentQueueName = Exclude<
   QueueName,
-  QueueName.STORAGE_TEMPLATE_MIGRATION | QueueName.FACIAL_RECOGNITION
+  QueueName.STORAGE_TEMPLATE_MIGRATION | QueueName.FACIAL_RECOGNITION | QueueName.DUPLICATE_DETECTION
 >;
 
 export enum JobCommand {
@@ -84,6 +85,10 @@ export enum JobName {
   QUEUE_SMART_SEARCH = 'queue-smart-search',
   SMART_SEARCH = 'smart-search',
 
+  // duplicate detection
+  QUEUE_DUPLICATE_DETECTION = 'queue-duplicate-detection',
+  DUPLICATE_DETECTION = 'duplicate-detection',
+
   // XMP sidecars
   QUEUE_SIDECAR = 'queue-sidecar',
   SIDECAR_DISCOVERY = 'sidecar-discovery',
@@ -199,6 +204,10 @@ export type JobItem =
   | { name: JobName.QUEUE_SMART_SEARCH; data: IBaseJob }
   | { name: JobName.SMART_SEARCH; data: IEntityJob }
 
+  // Duplicate Detection
+  | { name: JobName.QUEUE_DUPLICATE_DETECTION; data: IBaseJob }
+  | { name: JobName.DUPLICATE_DETECTION; data: IEntityJob }
+
   // Filesystem
   | { name: JobName.DELETE_FILES; data: IDeleteFilesJob }
 

server/src/interfaces/search.interface.ts

@@ -177,15 +177,29 @@ export interface FaceEmbeddingSearch extends SearchEmbeddingOptions {
   maxDistance?: number;
 }
 
+export interface AssetDuplicateSearch {
+  assetId: string;
+  embedding: Embedding;
+  userIds: string[];
+  maxDistance?: number;
+}
+
 export interface FaceSearchResult {
   distance: number;
   face: AssetFaceEntity;
 }
 
+export interface AssetDuplicateResult {
+  assetId: string;
+  duplicateId: string;
+  distance: number;
+}
+
 export interface ISearchRepository {
   init(modelName: string): Promise<void>;
   searchMetadata(pagination: SearchPaginationOptions, options: AssetSearchOptions): Paginated<AssetEntity>;
   searchSmart(pagination: SearchPaginationOptions, options: SmartSearchOptions): Paginated<AssetEntity>;
+  searchDuplicates(options: AssetDuplicateSearch): Promise<AssetDuplicateResult[]>;
   searchFaces(search: FaceEmbeddingSearch): Promise<FaceSearchResult[]>;
   upsert(assetId: string, embedding: number[]): Promise<void>;
   searchPlaces(placeName: string): Promise<GeodataPlacesEntity[]>;

server/src/migrations/1711989989911-CreateAssetDuplicateTable.ts

@@ -0,0 +1,36 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class CreateAssetDuplicateTable1711989989911 implements MigrationInterface {
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
+        CREATE TABLE asset_duplicates (
+            id uuid,
+            "assetId" uuid REFERENCES assets ON UPDATE CASCADE ON DELETE CASCADE,
+            PRIMARY KEY (id, "assetId")
+        );
+    `);
+
+    await queryRunner.query(`ALTER TABLE assets ADD COLUMN "duplicateId" uuid`);
+
+    await queryRunner.query(`ALTER TABLE asset_job_status ADD COLUMN "duplicatesDetectedAt" timestamptz`);
+
+    await queryRunner.query(`
+        ALTER TABLE assets
+          ADD CONSTRAINT asset_duplicates_id
+            FOREIGN KEY ("duplicateId", id)
+            REFERENCES asset_duplicates DEFERRABLE INITIALLY DEFERRED
+    `);
+
+    await queryRunner.query(`
+        CREATE UNIQUE INDEX "asset_duplicates_assetId_uindex"
+        ON asset_duplicates ("assetId")
+    `);
+
+    await queryRunner.query(`CREATE INDEX "IDX_assets_duplicateId" ON assets ("duplicateId")`);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`ALTER TABLE assets DROP COLUMN "duplicateId"`);
+    await queryRunner.query(`DROP TABLE asset_duplicates`);
+  }
+}

server/src/queries/asset.repository.sql

@@ -31,6 +31,7 @@ SELECT
   "entity"."originalFileName" AS "entity_originalFileName",
   "entity"."sidecarPath" AS "entity_sidecarPath",
   "entity"."stackId" AS "entity_stackId",
+  "entity"."duplicateId" AS "entity_duplicateId",
   "exifInfo"."assetId" AS "exifInfo_assetId",
   "exifInfo"."description" AS "exifInfo_description",
   "exifInfo"."exifImageWidth" AS "exifInfo_exifImageWidth",
@@ -113,7 +114,8 @@ SELECT
   "AssetEntity"."livePhotoVideoId" AS "AssetEntity_livePhotoVideoId",
   "AssetEntity"."originalFileName" AS "AssetEntity_originalFileName",
   "AssetEntity"."sidecarPath" AS "AssetEntity_sidecarPath",
-  "AssetEntity"."stackId" AS "AssetEntity_stackId"
+  "AssetEntity"."stackId" AS "AssetEntity_stackId",
+  "AssetEntity"."duplicateId" AS "AssetEntity_duplicateId"
 FROM
   "assets" "AssetEntity"
 WHERE
@@ -150,6 +152,7 @@ SELECT
   "AssetEntity"."originalFileName" AS "AssetEntity_originalFileName",
   "AssetEntity"."sidecarPath" AS "AssetEntity_sidecarPath",
   "AssetEntity"."stackId" AS "AssetEntity_stackId",
+  "AssetEntity"."duplicateId" AS "AssetEntity_duplicateId",
   "AssetEntity__AssetEntity_exifInfo"."assetId" AS "AssetEntity__AssetEntity_exifInfo_assetId",
   "AssetEntity__AssetEntity_exifInfo"."description" AS "AssetEntity__AssetEntity_exifInfo_description",
   "AssetEntity__AssetEntity_exifInfo"."exifImageWidth" AS "AssetEntity__AssetEntity_exifInfo_exifImageWidth",
@@ -234,7 +237,8 @@ SELECT
   "bd93d5747511a4dad4923546c51365bf1a803774"."livePhotoVideoId" AS "bd93d5747511a4dad4923546c51365bf1a803774_livePhotoVideoId",
   "bd93d5747511a4dad4923546c51365bf1a803774"."originalFileName" AS "bd93d5747511a4dad4923546c51365bf1a803774_originalFileName",
   "bd93d5747511a4dad4923546c51365bf1a803774"."sidecarPath" AS "bd93d5747511a4dad4923546c51365bf1a803774_sidecarPath",
-  "bd93d5747511a4dad4923546c51365bf1a803774"."stackId" AS "bd93d5747511a4dad4923546c51365bf1a803774_stackId"
+  "bd93d5747511a4dad4923546c51365bf1a803774"."stackId" AS "bd93d5747511a4dad4923546c51365bf1a803774_stackId",
+  "bd93d5747511a4dad4923546c51365bf1a803774"."duplicateId" AS "bd93d5747511a4dad4923546c51365bf1a803774_duplicateId"
 FROM
   "assets" "AssetEntity"
   LEFT JOIN "exif" "AssetEntity__AssetEntity_exifInfo" ON "AssetEntity__AssetEntity_exifInfo"."assetId" = "AssetEntity"."id"
@@ -315,7 +319,8 @@ FROM
       "AssetEntity"."livePhotoVideoId" AS "AssetEntity_livePhotoVideoId",
       "AssetEntity"."originalFileName" AS "AssetEntity_originalFileName",
       "AssetEntity"."sidecarPath" AS "AssetEntity_sidecarPath",
-      "AssetEntity"."stackId" AS "AssetEntity_stackId"
+      "AssetEntity"."stackId" AS "AssetEntity_stackId",
+      "AssetEntity"."duplicateId" AS "AssetEntity_duplicateId"
     FROM
       "assets" "AssetEntity"
       LEFT JOIN "libraries" "AssetEntity__AssetEntity_library" ON "AssetEntity__AssetEntity_library"."id" = "AssetEntity"."libraryId"
@@ -412,7 +417,8 @@ SELECT
   "AssetEntity"."livePhotoVideoId" AS "AssetEntity_livePhotoVideoId",
   "AssetEntity"."originalFileName" AS "AssetEntity_originalFileName",
   "AssetEntity"."sidecarPath" AS "AssetEntity_sidecarPath",
-  "AssetEntity"."stackId" AS "AssetEntity_stackId"
+  "AssetEntity"."stackId" AS "AssetEntity_stackId",
+  "AssetEntity"."duplicateId" AS "AssetEntity_duplicateId"
 FROM
   "assets" "AssetEntity"
 WHERE
@@ -458,7 +464,8 @@ SELECT
   "AssetEntity"."livePhotoVideoId" AS "AssetEntity_livePhotoVideoId",
   "AssetEntity"."originalFileName" AS "AssetEntity_originalFileName",
   "AssetEntity"."sidecarPath" AS "AssetEntity_sidecarPath",
-  "AssetEntity"."stackId" AS "AssetEntity_stackId"
+  "AssetEntity"."stackId" AS "AssetEntity_stackId",
+  "AssetEntity"."duplicateId" AS "AssetEntity_duplicateId"
 FROM
   "assets" "AssetEntity"
 WHERE
@@ -502,7 +509,8 @@ SELECT
   "AssetEntity"."livePhotoVideoId" AS "AssetEntity_livePhotoVideoId",
   "AssetEntity"."originalFileName" AS "AssetEntity_originalFileName",
   "AssetEntity"."sidecarPath" AS "AssetEntity_sidecarPath",
-  "AssetEntity"."stackId" AS "AssetEntity_stackId"
+  "AssetEntity"."stackId" AS "AssetEntity_stackId",
+  "AssetEntity"."duplicateId" AS "AssetEntity_duplicateId"
 FROM
   "assets" "AssetEntity"
 WHERE
@@ -592,6 +600,7 @@ SELECT
   "asset"."originalFileName" AS "asset_originalFileName",
   "asset"."sidecarPath" AS "asset_sidecarPath",
   "asset"."stackId" AS "asset_stackId",
+  "asset"."duplicateId" AS "asset_duplicateId",
   "exifInfo"."assetId" AS "exifInfo_assetId",
   "exifInfo"."description" AS "exifInfo_description",
   "exifInfo"."exifImageWidth" AS "exifInfo_exifImageWidth",
@@ -650,7 +659,8 @@ SELECT
   "stackedAssets"."livePhotoVideoId" AS "stackedAssets_livePhotoVideoId",
   "stackedAssets"."originalFileName" AS "stackedAssets_originalFileName",
   "stackedAssets"."sidecarPath" AS "stackedAssets_sidecarPath",
-  "stackedAssets"."stackId" AS "stackedAssets_stackId"
+  "stackedAssets"."stackId" AS "stackedAssets_stackId",
+  "stackedAssets"."duplicateId" AS "stackedAssets_duplicateId"
 FROM
   "assets" "asset"
   LEFT JOIN "exif" "exifInfo" ON "exifInfo"."assetId" = "asset"."id"
@@ -677,6 +687,114 @@ ORDER BY
   )::timestamptz DESC,
   "asset"."fileCreatedAt" DESC
 
+-- AssetRepository.getDuplicates
+SELECT
+  "asset"."id" AS "asset_id",
+  "asset"."deviceAssetId" AS "asset_deviceAssetId",
+  "asset"."ownerId" AS "asset_ownerId",
+  "asset"."libraryId" AS "asset_libraryId",
+  "asset"."deviceId" AS "asset_deviceId",
+  "asset"."type" AS "asset_type",
+  "asset"."originalPath" AS "asset_originalPath",
+  "asset"."resizePath" AS "asset_resizePath",
+  "asset"."webpPath" AS "asset_webpPath",
+  "asset"."thumbhash" AS "asset_thumbhash",
+  "asset"."encodedVideoPath" AS "asset_encodedVideoPath",
+  "asset"."createdAt" AS "asset_createdAt",
+  "asset"."updatedAt" AS "asset_updatedAt",
+  "asset"."deletedAt" AS "asset_deletedAt",
+  "asset"."fileCreatedAt" AS "asset_fileCreatedAt",
+  "asset"."localDateTime" AS "asset_localDateTime",
+  "asset"."fileModifiedAt" AS "asset_fileModifiedAt",
+  "asset"."isFavorite" AS "asset_isFavorite",
+  "asset"."isArchived" AS "asset_isArchived",
+  "asset"."isExternal" AS "asset_isExternal",
+  "asset"."isReadOnly" AS "asset_isReadOnly",
+  "asset"."isOffline" AS "asset_isOffline",
+  "asset"."checksum" AS "asset_checksum",
+  "asset"."duration" AS "asset_duration",
+  "asset"."isVisible" AS "asset_isVisible",
+  "asset"."livePhotoVideoId" AS "asset_livePhotoVideoId",
+  "asset"."originalFileName" AS "asset_originalFileName",
+  "asset"."sidecarPath" AS "asset_sidecarPath",
+  "asset"."stackId" AS "asset_stackId",
+  "asset"."duplicateId" AS "asset_duplicateId",
+  "exifInfo"."assetId" AS "exifInfo_assetId",
+  "exifInfo"."description" AS "exifInfo_description",
+  "exifInfo"."exifImageWidth" AS "exifInfo_exifImageWidth",
+  "exifInfo"."exifImageHeight" AS "exifInfo_exifImageHeight",
+  "exifInfo"."fileSizeInByte" AS "exifInfo_fileSizeInByte",
+  "exifInfo"."orientation" AS "exifInfo_orientation",
+  "exifInfo"."dateTimeOriginal" AS "exifInfo_dateTimeOriginal",
+  "exifInfo"."modifyDate" AS "exifInfo_modifyDate",
+  "exifInfo"."timeZone" AS "exifInfo_timeZone",
+  "exifInfo"."latitude" AS "exifInfo_latitude",
+  "exifInfo"."longitude" AS "exifInfo_longitude",
+  "exifInfo"."projectionType" AS "exifInfo_projectionType",
+  "exifInfo"."city" AS "exifInfo_city",
+  "exifInfo"."livePhotoCID" AS "exifInfo_livePhotoCID",
+  "exifInfo"."autoStackId" AS "exifInfo_autoStackId",
+  "exifInfo"."state" AS "exifInfo_state",
+  "exifInfo"."country" AS "exifInfo_country",
+  "exifInfo"."make" AS "exifInfo_make",
+  "exifInfo"."model" AS "exifInfo_model",
+  "exifInfo"."lensModel" AS "exifInfo_lensModel",
+  "exifInfo"."fNumber" AS "exifInfo_fNumber",
+  "exifInfo"."focalLength" AS "exifInfo_focalLength",
+  "exifInfo"."iso" AS "exifInfo_iso",
+  "exifInfo"."exposureTime" AS "exifInfo_exposureTime",
+  "exifInfo"."profileDescription" AS "exifInfo_profileDescription",
+  "exifInfo"."colorspace" AS "exifInfo_colorspace",
+  "exifInfo"."bitsPerSample" AS "exifInfo_bitsPerSample",
+  "exifInfo"."fps" AS "exifInfo_fps",
+  "stack"."id" AS "stack_id",
+  "stack"."primaryAssetId" AS "stack_primaryAssetId",
+  "stackedAssets"."id" AS "stackedAssets_id",
+  "stackedAssets"."deviceAssetId" AS "stackedAssets_deviceAssetId",
+  "stackedAssets"."ownerId" AS "stackedAssets_ownerId",
+  "stackedAssets"."libraryId" AS "stackedAssets_libraryId",
+  "stackedAssets"."deviceId" AS "stackedAssets_deviceId",
+  "stackedAssets"."type" AS "stackedAssets_type",
+  "stackedAssets"."originalPath" AS "stackedAssets_originalPath",
+  "stackedAssets"."resizePath" AS "stackedAssets_resizePath",
+  "stackedAssets"."webpPath" AS "stackedAssets_webpPath",
+  "stackedAssets"."thumbhash" AS "stackedAssets_thumbhash",
+  "stackedAssets"."encodedVideoPath" AS "stackedAssets_encodedVideoPath",
+  "stackedAssets"."createdAt" AS "stackedAssets_createdAt",
+  "stackedAssets"."updatedAt" AS "stackedAssets_updatedAt",
+  "stackedAssets"."deletedAt" AS "stackedAssets_deletedAt",
+  "stackedAssets"."fileCreatedAt" AS "stackedAssets_fileCreatedAt",
+  "stackedAssets"."localDateTime" AS "stackedAssets_localDateTime",
+  "stackedAssets"."fileModifiedAt" AS "stackedAssets_fileModifiedAt",
+  "stackedAssets"."isFavorite" AS "stackedAssets_isFavorite",
+  "stackedAssets"."isArchived" AS "stackedAssets_isArchived",
+  "stackedAssets"."isExternal" AS "stackedAssets_isExternal",
+  "stackedAssets"."isReadOnly" AS "stackedAssets_isReadOnly",
+  "stackedAssets"."isOffline" AS "stackedAssets_isOffline",
+  "stackedAssets"."checksum" AS "stackedAssets_checksum",
+  "stackedAssets"."duration" AS "stackedAssets_duration",
+  "stackedAssets"."isVisible" AS "stackedAssets_isVisible",
+  "stackedAssets"."livePhotoVideoId" AS "stackedAssets_livePhotoVideoId",
+  "stackedAssets"."originalFileName" AS "stackedAssets_originalFileName",
+  "stackedAssets"."sidecarPath" AS "stackedAssets_sidecarPath",
+  "stackedAssets"."stackId" AS "stackedAssets_stackId",
+  "stackedAssets"."duplicateId" AS "stackedAssets_duplicateId"
+FROM
+  "assets" "asset"
+  LEFT JOIN "exif" "exifInfo" ON "exifInfo"."assetId" = "asset"."id"
+  LEFT JOIN "asset_stack" "stack" ON "stack"."id" = "asset"."stackId"
+  LEFT JOIN "assets" "stackedAssets" ON "stackedAssets"."stackId" = "stack"."id"
+  AND ("stackedAssets"."deletedAt" IS NULL)
+WHERE
+  (
+    "asset"."isVisible" = true
+    AND "asset"."ownerId" IN ($1, $2)
+    AND "asset"."duplicateId" IS NOT NULL
+  )
+  AND ("asset"."deletedAt" IS NULL)
+ORDER BY
+  "asset"."duplicateId" ASC
+
 -- AssetRepository.getAssetIdByCity
 WITH
   "cities" AS (

server/src/queries/person.repository.sql

@@ -173,7 +173,8 @@ FROM
       "AssetFaceEntity__AssetFaceEntity_asset"."livePhotoVideoId" AS "AssetFaceEntity__AssetFaceEntity_asset_livePhotoVideoId",
       "AssetFaceEntity__AssetFaceEntity_asset"."originalFileName" AS "AssetFaceEntity__AssetFaceEntity_asset_originalFileName",
       "AssetFaceEntity__AssetFaceEntity_asset"."sidecarPath" AS "AssetFaceEntity__AssetFaceEntity_asset_sidecarPath",
-      "AssetFaceEntity__AssetFaceEntity_asset"."stackId" AS "AssetFaceEntity__AssetFaceEntity_asset_stackId"
+      "AssetFaceEntity__AssetFaceEntity_asset"."stackId" AS "AssetFaceEntity__AssetFaceEntity_asset_stackId",
+      "AssetFaceEntity__AssetFaceEntity_asset"."duplicateId" AS "AssetFaceEntity__AssetFaceEntity_asset_duplicateId"
     FROM
       "asset_faces" "AssetFaceEntity"
       LEFT JOIN "person" "AssetFaceEntity__AssetFaceEntity_person" ON "AssetFaceEntity__AssetFaceEntity_person"."id" = "AssetFaceEntity"."personId"
@@ -272,6 +273,7 @@ FROM
       "AssetEntity"."originalFileName" AS "AssetEntity_originalFileName",
       "AssetEntity"."sidecarPath" AS "AssetEntity_sidecarPath",
       "AssetEntity"."stackId" AS "AssetEntity_stackId",
+      "AssetEntity"."duplicateId" AS "AssetEntity_duplicateId",
       "AssetEntity__AssetEntity_faces"."id" AS "AssetEntity__AssetEntity_faces_id",
       "AssetEntity__AssetEntity_faces"."assetId" AS "AssetEntity__AssetEntity_faces_assetId",
       "AssetEntity__AssetEntity_faces"."personId" AS "AssetEntity__AssetEntity_faces_personId",
@@ -401,7 +403,8 @@ SELECT
   "AssetFaceEntity__AssetFaceEntity_asset"."livePhotoVideoId" AS "AssetFaceEntity__AssetFaceEntity_asset_livePhotoVideoId",
   "AssetFaceEntity__AssetFaceEntity_asset"."originalFileName" AS "AssetFaceEntity__AssetFaceEntity_asset_originalFileName",
   "AssetFaceEntity__AssetFaceEntity_asset"."sidecarPath" AS "AssetFaceEntity__AssetFaceEntity_asset_sidecarPath",
-  "AssetFaceEntity__AssetFaceEntity_asset"."stackId" AS "AssetFaceEntity__AssetFaceEntity_asset_stackId"
+  "AssetFaceEntity__AssetFaceEntity_asset"."stackId" AS "AssetFaceEntity__AssetFaceEntity_asset_stackId",
+  "AssetFaceEntity__AssetFaceEntity_asset"."duplicateId" AS "AssetFaceEntity__AssetFaceEntity_asset_duplicateId"
 FROM
   "asset_faces" "AssetFaceEntity"
   LEFT JOIN "assets" "AssetFaceEntity__AssetFaceEntity_asset" ON "AssetFaceEntity__AssetFaceEntity_asset"."id" = "AssetFaceEntity"."assetId"

server/src/queries/search.repository.sql

@@ -36,6 +36,7 @@ FROM
       "asset"."originalFileName" AS "asset_originalFileName",
       "asset"."sidecarPath" AS "asset_sidecarPath",
       "asset"."stackId" AS "asset_stackId",
+      "asset"."duplicateId" AS "asset_duplicateId",
       "stack"."id" AS "stack_id",
       "stack"."primaryAssetId" AS "stack_primaryAssetId",
       "stackedAssets"."id" AS "stackedAssets_id",
@@ -66,7 +67,8 @@ FROM
       "stackedAssets"."livePhotoVideoId" AS "stackedAssets_livePhotoVideoId",
       "stackedAssets"."originalFileName" AS "stackedAssets_originalFileName",
       "stackedAssets"."sidecarPath" AS "stackedAssets_sidecarPath",
-      "stackedAssets"."stackId" AS "stackedAssets_stackId"
+      "stackedAssets"."stackId" AS "stackedAssets_stackId",
+      "stackedAssets"."duplicateId" AS "stackedAssets_duplicateId"
     FROM
       "assets" "asset"
       LEFT JOIN "exif" "exifInfo" ON "exifInfo"."assetId" = "asset"."id"
@@ -132,6 +134,7 @@ SELECT
   "asset"."originalFileName" AS "asset_originalFileName",
   "asset"."sidecarPath" AS "asset_sidecarPath",
   "asset"."stackId" AS "asset_stackId",
+  "asset"."duplicateId" AS "asset_duplicateId",
   "stack"."id" AS "stack_id",
   "stack"."primaryAssetId" AS "stack_primaryAssetId",
   "stackedAssets"."id" AS "stackedAssets_id",
@@ -162,7 +165,8 @@ SELECT
   "stackedAssets"."livePhotoVideoId" AS "stackedAssets_livePhotoVideoId",
   "stackedAssets"."originalFileName" AS "stackedAssets_originalFileName",
   "stackedAssets"."sidecarPath" AS "stackedAssets_sidecarPath",
-  "stackedAssets"."stackId" AS "stackedAssets_stackId"
+  "stackedAssets"."stackId" AS "stackedAssets_stackId",
+  "stackedAssets"."duplicateId" AS "stackedAssets_duplicateId"
 FROM
   "assets" "asset"
   LEFT JOIN "exif" "exifInfo" ON "exifInfo"."assetId" = "asset"."id"
@@ -189,6 +193,49 @@ LIMIT
   101
 COMMIT
 
+-- SearchRepository.searchDuplicates
+WITH
+  "cte" AS (
+    SELECT
+      "asset"."duplicateId" AS "duplicateId",
+      "search"."assetId" AS "assetId",
+      (
+        SELECT
+          embedding
+        FROM
+          smart_search
+        WHERE
+          "assetId" = $1
+      ) <= > "search"."embedding" AS "distance"
+    FROM
+      "assets" "asset"
+      INNER JOIN "smart_search" "search" ON "search"."assetId" = "asset"."id"
+    WHERE
+      (
+        "asset"."ownerId" IN ($2)
+        AND "asset"."id" != $1
+        AND "asset"."isVisible" = $3
+      )
+      AND ("asset"."deletedAt" IS NULL)
+    ORDER BY
+      "search"."embedding" <= > (
+        SELECT
+          embedding
+        FROM
+          smart_search
+        WHERE
+          "assetId" = $1
+      ) ASC
+    LIMIT
+      64
+  )
+SELECT
+  res.*
+FROM
+  "cte" "res"
+WHERE
+  res.distance <= $4
+
 -- SearchRepository.searchFaces
 START TRANSACTION
 SET
@@ -342,6 +389,7 @@ SELECT
   "asset"."originalFileName" AS "asset_originalFileName",
   "asset"."sidecarPath" AS "asset_sidecarPath",
   "asset"."stackId" AS "asset_stackId",
+  "asset"."duplicateId" AS "asset_duplicateId",
   "exif"."assetId" AS "exif_assetId",
   "exif"."description" AS "exif_description",
   "exif"."exifImageWidth" AS "exif_exifImageWidth",

server/src/queries/shared.link.repository.sql

@@ -50,6 +50,7 @@ FROM
       "SharedLinkEntity__SharedLinkEntity_assets"."originalFileName" AS "SharedLinkEntity__SharedLinkEntity_assets_originalFileName",
       "SharedLinkEntity__SharedLinkEntity_assets"."sidecarPath" AS "SharedLinkEntity__SharedLinkEntity_assets_sidecarPath",
       "SharedLinkEntity__SharedLinkEntity_assets"."stackId" AS "SharedLinkEntity__SharedLinkEntity_assets_stackId",
+      "SharedLinkEntity__SharedLinkEntity_assets"."duplicateId" AS "SharedLinkEntity__SharedLinkEntity_assets_duplicateId",
       "9b1d35b344d838023994a3233afd6ffe098be6d8"."assetId" AS "9b1d35b344d838023994a3233afd6ffe098be6d8_assetId",
       "9b1d35b344d838023994a3233afd6ffe098be6d8"."description" AS "9b1d35b344d838023994a3233afd6ffe098be6d8_description",
       "9b1d35b344d838023994a3233afd6ffe098be6d8"."exifImageWidth" AS "9b1d35b344d838023994a3233afd6ffe098be6d8_exifImageWidth",
@@ -117,6 +118,7 @@ FROM
       "4a35f463ae8c5544ede95c4b6d9ce8c686b6bfe6"."originalFileName" AS "4a35f463ae8c5544ede95c4b6d9ce8c686b6bfe6_originalFileName",
       "4a35f463ae8c5544ede95c4b6d9ce8c686b6bfe6"."sidecarPath" AS "4a35f463ae8c5544ede95c4b6d9ce8c686b6bfe6_sidecarPath",
       "4a35f463ae8c5544ede95c4b6d9ce8c686b6bfe6"."stackId" AS "4a35f463ae8c5544ede95c4b6d9ce8c686b6bfe6_stackId",
+      "4a35f463ae8c5544ede95c4b6d9ce8c686b6bfe6"."duplicateId" AS "4a35f463ae8c5544ede95c4b6d9ce8c686b6bfe6_duplicateId",
       "d9f2f4dd8920bad1d6907cdb1d699732daff3c2f"."assetId" AS "d9f2f4dd8920bad1d6907cdb1d699732daff3c2f_assetId",
       "d9f2f4dd8920bad1d6907cdb1d699732daff3c2f"."description" AS "d9f2f4dd8920bad1d6907cdb1d699732daff3c2f_description",
       "d9f2f4dd8920bad1d6907cdb1d699732daff3c2f"."exifImageWidth" AS "d9f2f4dd8920bad1d6907cdb1d699732daff3c2f_exifImageWidth",
@@ -240,6 +242,7 @@ SELECT
   "SharedLinkEntity__SharedLinkEntity_assets"."originalFileName" AS "SharedLinkEntity__SharedLinkEntity_assets_originalFileName",
   "SharedLinkEntity__SharedLinkEntity_assets"."sidecarPath" AS "SharedLinkEntity__SharedLinkEntity_assets_sidecarPath",
   "SharedLinkEntity__SharedLinkEntity_assets"."stackId" AS "SharedLinkEntity__SharedLinkEntity_assets_stackId",
+  "SharedLinkEntity__SharedLinkEntity_assets"."duplicateId" AS "SharedLinkEntity__SharedLinkEntity_assets_duplicateId",
   "SharedLinkEntity__SharedLinkEntity_album"."id" AS "SharedLinkEntity__SharedLinkEntity_album_id",
   "SharedLinkEntity__SharedLinkEntity_album"."ownerId" AS "SharedLinkEntity__SharedLinkEntity_album_ownerId",
   "SharedLinkEntity__SharedLinkEntity_album"."albumName" AS "SharedLinkEntity__SharedLinkEntity_album_albumName",

server/src/repositories/asset-duplicate.repository.ts

@@ -0,0 +1,43 @@
+import { Injectable } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+import { AssetDuplicateEntity } from 'src/entities/asset-duplicate.entity';
+import { AssetEntity } from 'src/entities/asset.entity';
+import { IAssetDuplicateRepository } from 'src/interfaces/asset-duplicate.interface';
+import { Instrumentation } from 'src/utils/instrumentation';
+import { In, Repository } from 'typeorm';
+
+@Instrumentation()
+@Injectable()
+export class AssetDuplicateRepository implements IAssetDuplicateRepository {
+  constructor(@InjectRepository(AssetDuplicateEntity) private repository: Repository<AssetDuplicateEntity>) {}
+
+  async upsert(id: string, assetIds: string[], oldDuplicateIds: string[] = []): Promise<void> {
+    await this.repository.manager.transaction(async (manager) => {
+      await manager.upsert(
+        AssetDuplicateEntity,
+        assetIds.map((assetId) => ({ id, assetId })),
+        ['assetId'],
+      );
+      if (oldDuplicateIds.length > 0) {
+        await manager.update(AssetDuplicateEntity, { id: In(oldDuplicateIds) }, { id });
+      }
+      await manager.update(AssetEntity, { id: In(assetIds) }, { duplicateId: id });
+      await manager.update(AssetEntity, { duplicateId: In(oldDuplicateIds) }, { duplicateId: id });
+    });
+  }
+
+  async delete(id: string): Promise<void> {
+    await this.repository.delete(id);
+  }
+
+  async getById(id: string): Promise<AssetDuplicateEntity | null> {
+    return this.repository.findOne({
+      where: {
+        id,
+      },
+      relations: {
+        assets: true,
+      },
+    });
+  }
+}

server/src/repositories/asset.repository.ts

@@ -67,7 +67,7 @@ export class AssetRepository implements IAssetRepository {
     await this.exifRepository.upsert(exif, { conflictPaths: ['assetId'] });
   }
 
-  async upsertJobStatus(jobStatus: Partial<AssetJobStatusEntity>): Promise<void> {
+  async upsertJobStatus(jobStatus: Partial<AssetJobStatusEntity> | Partial<AssetJobStatusEntity>[]): Promise<void> {
     await this.jobStatusRepository.upsert(jobStatus, { conflictPaths: ['assetId'] });
   }
 
@@ -201,6 +201,7 @@ export class AssetRepository implements IAssetRepository {
     let builder = this.repository.createQueryBuilder('asset');
     builder = searchAssetBuilder(builder, options);
     builder.orderBy('asset.createdAt', options.orderDirection ?? 'ASC');
+    builder.innerJoin('asset.smartSearch', 'smartSearch');
     return paginatedBuilder<AssetEntity>(builder, {
       mode: PaginationMode.SKIP_TAKE,
       skip: pagination.skip,
@@ -347,6 +348,18 @@ export class AssetRepository implements IAssetRepository {
         break;
       }
 
+      case WithoutProperty.DUPLICATE: {
+        where = {
+          resizePath: Not(IsNull()),
+          isVisible: true,
+          smartSearch: true,
+          jobStatus: {
+            duplicatesDetectedAt: IsNull(),
+          },
+        };
+        break;
+      }
+
       case WithoutProperty.OBJECT_TAGS: {
         relations = {
           smartInfo: true,
@@ -579,6 +592,13 @@ export class AssetRepository implements IAssetRepository {
     );
   }
 
+  @GenerateSql({ params: [{ userIds: [DummyValue.UUID, DummyValue.UUID] }] })
+  getDuplicates(options: AssetBuilderOptions): Promise<AssetEntity[]> {
+    return this.getBuilder({ ...options, isDuplicate: true })
+      .orderBy('asset.duplicateId')
+      .getMany();
+  }
+
   @GenerateSql({ params: [DummyValue.UUID, { minAssetsPerField: 5, maxFields: 12 }] })
   async getAssetIdByCity(
     ownerId: string,
@@ -638,16 +658,14 @@ export class AssetRepository implements IAssetRepository {
   }
 
   private getBuilder(options: AssetBuilderOptions) {
-    const { isArchived, isFavorite, isTrashed, albumId, personId, userIds, withStacked, exifInfo, assetType } = options;
-
     let builder = this.repository.createQueryBuilder('asset').where('asset.isVisible = true');
-    if (assetType !== undefined) {
-      builder = builder.andWhere('asset.type = :assetType', { assetType });
+    if (options.assetType !== undefined) {
+      builder = builder.andWhere('asset.type = :assetType', { assetType: options.assetType });
     }
 
     let stackJoined = false;
 
-    if (exifInfo !== false) {
+    if (options.exifInfo !== false) {
       stackJoined = true;
       builder = builder
         .leftJoinAndSelect('asset.exifInfo', 'exifInfo')
@@ -655,34 +673,38 @@ export class AssetRepository implements IAssetRepository {
         .leftJoinAndSelect('stack.assets', 'stackedAssets');
     }
 
-    if (albumId) {
-      builder = builder.leftJoin('asset.albums', 'album').andWhere('album.id = :albumId', { albumId });
+    if (options.albumId) {
+      builder = builder.leftJoin('asset.albums', 'album').andWhere('album.id = :albumId', { albumId: options.albumId });
     }
 
-    if (userIds) {
-      builder = builder.andWhere('asset.ownerId IN (:...userIds )', { userIds });
+    if (options.userIds) {
+      builder = builder.andWhere('asset.ownerId IN (:...userIds )', { userIds: options.userIds });
     }
 
-    if (isArchived !== undefined) {
-      builder = builder.andWhere('asset.isArchived = :isArchived', { isArchived });
+    if (options.isArchived !== undefined) {
+      builder = builder.andWhere('asset.isArchived = :isArchived', { isArchived: options.isArchived });
     }
 
-    if (isFavorite !== undefined) {
-      builder = builder.andWhere('asset.isFavorite = :isFavorite', { isFavorite });
+    if (options.isFavorite !== undefined) {
+      builder = builder.andWhere('asset.isFavorite = :isFavorite', { isFavorite: options.isFavorite });
     }
 
-    if (isTrashed !== undefined) {
-      builder = builder.andWhere(`asset.deletedAt ${isTrashed ? 'IS NOT NULL' : 'IS NULL'}`).withDeleted();
+    if (options.isTrashed !== undefined) {
+      builder = builder.andWhere(`asset.deletedAt ${options.isTrashed ? 'IS NOT NULL' : 'IS NULL'}`).withDeleted();
     }
 
-    if (personId !== undefined) {
+    if (options.isDuplicate !== undefined) {
+      builder = builder.andWhere(`asset.duplicateId ${options.isDuplicate ? 'IS NOT NULL' : 'IS NULL'}`);
+    }
+
+    if (options.personId !== undefined) {
       builder = builder
         .innerJoin('asset.faces', 'faces')
         .innerJoin('faces.person', 'person')
-        .andWhere('person.id = :personId', { personId });
+        .andWhere('person.id = :personId', { personId: options.personId });
     }
 
-    if (withStacked) {
+    if (options.withStacked) {
       if (!stackJoined) {
         builder = builder.leftJoinAndSelect('asset.stack', 'stack').leftJoinAndSelect('stack.assets', 'stackedAssets');
       }

server/src/repositories/index.ts

@@ -2,6 +2,7 @@ import { IAccessRepository } from 'src/interfaces/access.interface';
 import { IActivityRepository } from 'src/interfaces/activity.interface';
 import { IAlbumRepository } from 'src/interfaces/album.interface';
 import { IKeyRepository } from 'src/interfaces/api-key.interface';
+import { IAssetDuplicateRepository } from 'src/interfaces/asset-duplicate.interface';
 import { IAssetStackRepository } from 'src/interfaces/asset-stack.interface';
 import { IAssetRepositoryV1 } from 'src/interfaces/asset-v1.interface';
 import { IAssetRepository } from 'src/interfaces/asset.interface';
@@ -56,11 +57,13 @@ import { SystemMetadataRepository } from 'src/repositories/system-metadata.repos
 import { TagRepository } from 'src/repositories/tag.repository';
 import { UserTokenRepository } from 'src/repositories/user-token.repository';
 import { UserRepository } from 'src/repositories/user.repository';
+import { AssetDuplicateRepository } from 'src/repositories/asset-duplicate.repository';
 
 export const repositories = [
   { provide: IActivityRepository, useClass: ActivityRepository },
   { provide: IAccessRepository, useClass: AccessRepository },
   { provide: IAlbumRepository, useClass: AlbumRepository },
+  { provide: IAssetDuplicateRepository, useClass: AssetDuplicateRepository },
   { provide: IAssetRepository, useClass: AssetRepository },
   { provide: IAssetRepositoryV1, useClass: AssetRepositoryV1 },
   { provide: IAssetStackRepository, useClass: AssetStackRepository },

server/src/repositories/job.repository.ts

@@ -64,6 +64,10 @@ export const JOBS_TO_QUEUE: Record<JobName, QueueName> = {
   [JobName.QUEUE_SMART_SEARCH]: QueueName.SMART_SEARCH,
   [JobName.SMART_SEARCH]: QueueName.SMART_SEARCH,
 
+  // duplicate detection
+  [JobName.QUEUE_DUPLICATE_DETECTION]: QueueName.DUPLICATE_DETECTION,
+  [JobName.DUPLICATE_DETECTION]: QueueName.DUPLICATE_DETECTION,
+
   // XMP sidecars
   [JobName.QUEUE_SIDECAR]: QueueName.SIDECAR,
   [JobName.SIDECAR_DISCOVERY]: QueueName.SIDECAR,

server/src/repositories/search.repository.ts

@@ -9,6 +9,8 @@ import { SmartInfoEntity } from 'src/entities/smart-info.entity';
 import { SmartSearchEntity } from 'src/entities/smart-search.entity';
 import { DatabaseExtension } from 'src/interfaces/database.interface';
 import {
+  AssetDuplicateResult,
+  AssetDuplicateSearch,
   AssetSearchOptions,
   FaceEmbeddingSearch,
   FaceSearchResult,
@@ -144,6 +146,39 @@ export class SearchRepository implements ISearchRepository {
     return results;
   }
 
+  @GenerateSql({
+    params: [
+      {
+        embedding: Array.from({ length: 512 }, Math.random),
+        maxDistance: 0.6,
+        userIds: [DummyValue.UUID],
+      },
+    ],
+  })
+  searchDuplicates({ assetId, maxDistance, userIds }: AssetDuplicateSearch): Promise<AssetDuplicateResult[]> {
+    const cte = this.assetRepository.createQueryBuilder('asset');
+    cte
+      .select('search.assetId', 'assetId')
+      .addSelect('asset.duplicateId', 'duplicateId')
+      .addSelect(`(SELECT embedding FROM smart_search WHERE "assetId" = :assetId) <=> search.embedding`, 'distance')
+      .innerJoin('asset.smartSearch', 'search')
+      .where('asset.ownerId IN (:...userIds )')
+      .andWhere('asset.id != :assetId')
+      .andWhere('asset.isVisible = :isVisible')
+      .orderBy('search.embedding <=> (SELECT embedding FROM smart_search WHERE "assetId" = :assetId)')
+      .limit(64)
+      .setParameters({ assetId, isVisible: true, userIds });
+
+    const builder = this.assetRepository.manager
+      .createQueryBuilder()
+      .addCommonTableExpression(cte, 'cte')
+      .from('cte', 'res')
+      .select('res.*')
+      .where('res.distance <= :maxDistance', { maxDistance });
+
+    return builder.getRawMany() as any as Promise<AssetDuplicateResult[]>;
+  }
+
   @GenerateSql({
     params: [
       {

server/src/services/asset.service.ts

@@ -248,6 +248,11 @@ export class AssetService {
     return data;
   }
 
+  async getDuplicates(auth: AuthDto): Promise<AssetResponseDto[]> {
+    const res = await this.assetRepository.getDuplicates({ userIds: [auth.user.id] });
+    return res.map((a) => mapAsset(a, { auth }));
+  }
+
   async update(auth: AuthDto, id: string, dto: UpdateAssetDto): Promise<AssetResponseDto> {
     await this.access.requirePermission(auth, Permission.ASSET_UPDATE, id);
 

server/src/services/job.service.ts

@@ -115,6 +115,11 @@ export class JobService {
         return this.jobRepository.queue({ name: JobName.QUEUE_SMART_SEARCH, data: { force } });
       }
 
+      case QueueName.DUPLICATE_DETECTION: {
+        await this.configCore.requireFeature(FeatureFlag.SMART_SEARCH);
+        return this.jobRepository.queue({ name: JobName.QUEUE_DUPLICATE_DETECTION, data: { force } });
+      }
+
       case QueueName.METADATA_EXTRACTION: {
         return this.jobRepository.queue({ name: JobName.QUEUE_METADATA_EXTRACTION, data: { force } });
       }
@@ -194,7 +199,11 @@ export class JobService {
   }
 
   private isConcurrentQueue(name: QueueName): name is ConcurrentQueueName {
-    return ![QueueName.FACIAL_RECOGNITION, QueueName.STORAGE_TEMPLATE_MIGRATION].includes(name);
+    return ![
+      QueueName.FACIAL_RECOGNITION,
+      QueueName.STORAGE_TEMPLATE_MIGRATION,
+      QueueName.DUPLICATE_DETECTION,
+    ].includes(name);
   }
 
   async handleNightlyJobs() {
@@ -296,6 +305,13 @@ export class JobService {
         break;
       }
 
+      case JobName.SMART_SEARCH: {
+        if (item.data.source === 'upload') {
+          await this.jobRepository.queue({ name: JobName.DUPLICATE_DETECTION, data: item.data });
+        }
+        break;
+      }
+
       case JobName.USER_DELETION: {
         this.eventRepository.clientBroadcast(ClientEvent.USER_DELETE, item.data.id);
         break;

server/src/services/microservices.service.ts

@@ -14,6 +14,7 @@ import { StorageService } from 'src/services/storage.service';
 import { SystemConfigService } from 'src/services/system-config.service';
 import { UserService } from 'src/services/user.service';
 import { otelSDK } from 'src/utils/instrumentation';
+import { SearchService } from './search.service';
 
 @Injectable()
 export class MicroservicesService {
@@ -31,6 +32,7 @@ export class MicroservicesService {
     private storageService: StorageService,
     private userService: UserService,
     private databaseService: DatabaseService,
+    private searchService: SearchService,
   ) {}
 
   async init() {
@@ -47,6 +49,8 @@ export class MicroservicesService {
       [JobName.USER_SYNC_USAGE]: () => this.userService.handleUserSyncUsage(),
       [JobName.QUEUE_SMART_SEARCH]: (data) => this.smartInfoService.handleQueueEncodeClip(data),
       [JobName.SMART_SEARCH]: (data) => this.smartInfoService.handleEncodeClip(data),
+      [JobName.QUEUE_DUPLICATE_DETECTION]: (data) => this.searchService.handleQueueSearchDuplicates(data),
+      [JobName.DUPLICATE_DETECTION]: (data) => this.searchService.handleSearchDuplicates(data),
       [JobName.STORAGE_TEMPLATE_MIGRATION]: () => this.storageTemplateService.handleMigration(),
       [JobName.STORAGE_TEMPLATE_MIGRATION_SINGLE]: (data) => this.storageTemplateService.handleMigrationSingle(data),
       [JobName.QUEUE_MIGRATION]: () => this.mediaService.handleQueueMigration(),

server/src/services/search.service.ts

@@ -17,16 +17,29 @@ import {
 } from 'src/dtos/search.dto';
 import { AssetOrder } from 'src/entities/album.entity';
 import { AssetEntity } from 'src/entities/asset.entity';
-import { IAssetRepository } from 'src/interfaces/asset.interface';
+import { IAssetDuplicateRepository } from 'src/interfaces/asset-duplicate.interface';
+import { IAssetRepository, WithoutProperty } from 'src/interfaces/asset.interface';
+import { ICryptoRepository } from 'src/interfaces/crypto.interface';
+import {
+  IBaseJob,
+  IEntityJob,
+  IJobRepository,
+  JOBS_ASSET_PAGINATION_SIZE,
+  JobName,
+  JobStatus,
+} from 'src/interfaces/job.interface';
 import { IMachineLearningRepository } from 'src/interfaces/machine-learning.interface';
 import { IMetadataRepository } from 'src/interfaces/metadata.interface';
 import { IPartnerRepository } from 'src/interfaces/partner.interface';
 import { IPersonRepository } from 'src/interfaces/person.interface';
 import { ISearchRepository, SearchExploreItem, SearchStrategy } from 'src/interfaces/search.interface';
 import { ISystemConfigRepository } from 'src/interfaces/system-config.interface';
+import { ImmichLogger } from 'src/utils/logger';
+import { usePagination } from 'src/utils/pagination';
 
 @Injectable()
 export class SearchService {
+  private logger = new ImmichLogger(SearchService.name);
   private configCore: SystemConfigCore;
 
   constructor(
@@ -37,6 +50,9 @@ export class SearchService {
     @Inject(IAssetRepository) private assetRepository: IAssetRepository,
     @Inject(IPartnerRepository) private partnerRepository: IPartnerRepository,
     @Inject(IMetadataRepository) private metadataRepository: IMetadataRepository,
+    @Inject(ICryptoRepository) private cryptoRepository: ICryptoRepository,
+    @Inject(IAssetDuplicateRepository) private assetDuplicateRepository: IAssetDuplicateRepository,
+    @Inject(IJobRepository) private jobRepository: IJobRepository,
   ) {
     this.configCore = SystemConfigCore.create(configRepository);
   }
@@ -139,6 +155,84 @@ export class SearchService {
     }
   }
 
+  async handleQueueSearchDuplicates({ force }: IBaseJob): Promise<JobStatus> {
+    const { machineLearning } = await this.configCore.getConfig();
+    if (!machineLearning.enabled || !machineLearning.clip.enabled) {
+      return JobStatus.SKIPPED;
+    }
+
+    const assetPagination = usePagination(JOBS_ASSET_PAGINATION_SIZE, (pagination) => {
+      return force
+        ? this.assetRepository.getAll(pagination, { isVisible: true })
+        : this.assetRepository.getWithout(pagination, WithoutProperty.DUPLICATE);
+    });
+
+    for await (const assets of assetPagination) {
+      await this.jobRepository.queueAll(
+        assets.map((asset) => ({ name: JobName.DUPLICATE_DETECTION, data: { id: asset.id } })),
+      );
+    }
+
+    return JobStatus.SUCCESS;
+  }
+
+  async handleSearchDuplicates({ id }: IEntityJob): Promise<JobStatus> {
+    const { machineLearning } = await this.configCore.getConfig();
+
+    const asset = await this.assetRepository.getById(id, { smartSearch: true });
+    if (!asset) {
+      this.logger.error(`Asset ${id} not found`);
+      return JobStatus.FAILED;
+    }
+
+    if (!asset.isVisible) {
+      this.logger.debug(`Asset ${id} is not visible, skipping`);
+      return JobStatus.SKIPPED;
+    }
+
+    if (asset.duplicateId) {
+      this.logger.debug(`Asset ${id} already has a duplicateId, skipping`);
+      return JobStatus.SKIPPED;
+    }
+
+    if (!asset.resizePath) {
+      this.logger.debug(`Asset ${id} is missing preview image`);
+      return JobStatus.FAILED;
+    }
+
+    if (!asset.smartSearch?.embedding) {
+      this.logger.debug(`Asset ${id} is missing embedding`);
+      return JobStatus.FAILED;
+    }
+
+    const duplicateAssets = await this.searchRepository.searchDuplicates({
+      assetId: asset.id,
+      embedding: asset.smartSearch.embedding,
+      maxDistance: machineLearning.clip.duplicateThreshold,
+      userIds: [asset.ownerId],
+    });
+
+    const assetIds = [asset.id];
+
+    if (duplicateAssets.length > 0) {
+      this.logger.debug(
+        `Found ${duplicateAssets.length} duplicate${duplicateAssets.length === 1 ? '' : 's'} for asset ${asset.id}`,
+      );
+
+      const duplicateIds = duplicateAssets.map((duplicate) => duplicate.duplicateId).filter(Boolean);
+      const duplicateId = duplicateIds[0] || this.cryptoRepository.randomUUID();
+
+      assetIds.push(...duplicateAssets.map((duplicate) => duplicate.assetId));
+
+      await this.assetDuplicateRepository.upsert(duplicateId, assetIds, duplicateIds);
+    }
+
+    const duplicatesDetectedAt = new Date();
+    await this.assetRepository.upsertJobStatus(assetIds.map((assetId) => ({ assetId, duplicatesDetectedAt })));
+
+    return JobStatus.SUCCESS;
+  }
+
   // TODO: remove after implementing new search filters
   /** @deprecated */
   async search(auth: AuthDto, dto: SearchDto): Promise<SearchResponseDto> {

server/src/services/system-config.service.spec.ts

@@ -74,6 +74,7 @@ const updatedConfig = Object.freeze<SystemConfig>({
     clip: {
       enabled: true,
       modelName: 'ViT-B-32__openai',
+      duplicateThreshold: 0.03,
     },
     facialRecognition: {
       enabled: true,

web/src/lib/components/admin-page/jobs/jobs-panel.svelte

@@ -88,6 +88,12 @@
       subtitle: 'Run machine learning on assets to support smart search',
       disabled: !$featureFlags.smartSearch,
     },
+    [JobName.DuplicateDetection]: {
+      icon: mdiImageSearch,
+      title: getJobName(JobName.DuplicateDetection),
+      subtitle: 'Run machine learning on assets to detect near-duplicate images',
+      disabled: !$featureFlags.smartSearch,
+    },
     [JobName.FaceDetection]: {
       icon: mdiFaceRecognition,
       title: getJobName(JobName.FaceDetection),

web/src/lib/components/shared-components/side-bar/side-bar.svelte

@@ -131,6 +131,19 @@
       </svelte:fragment>
     </SideBarLink>
 
+    <SideBarLink title="Duplicates" routeId="/(user)/duplicates" icon={mdiArchiveArrowDownOutline}>
+      <svelte:fragment slot="moreInformation">
+        {#await getStats({ isArchived: true })}
+          <LoadingSpinner />
+        {:then data}
+          <div>
+            <p>{data.videos.toLocaleString($locale)} Videos</p>
+            <p>{data.images.toLocaleString($locale)} Photos</p>
+          </div>
+        {/await}
+      </svelte:fragment>
+    </SideBarLink>
+
     {#if $featureFlags.trash}
       <SideBarLink title="Trash" routeId="/(user)/trash" icon={mdiTrashCanOutline}>
         <svelte:fragment slot="moreInformation">

web/src/lib/constants.ts

@@ -20,6 +20,7 @@ export enum AppRoute {
   ALBUMS = '/albums',
   LIBRARIES = '/libraries',
   ARCHIVE = '/archive',
+  DUPLICATES = '/duplicates',
   FAVORITES = '/favorites',
   PEOPLE = '/people',
   PLACES = '/places',

web/src/lib/utils.ts

@@ -115,6 +115,7 @@ export const getJobName = (jobName: JobName) => {
     [JobName.MetadataExtraction]: 'Extract Metadata',
     [JobName.Sidecar]: 'Sidecar Metadata',
     [JobName.SmartSearch]: 'Smart Search',
+    [JobName.DuplicateDetection]: 'Duplicate Detection',
     [JobName.FaceDetection]: 'Face Detection',
     [JobName.FacialRecognition]: 'Facial Recognition',
     [JobName.VideoConversion]: 'Transcode Videos',

web/src/routes/(user)/duplicates/+page.svelte

@@ -0,0 +1,21 @@
+<script lang="ts">
+  import GalleryViewer from '$lib/components/shared-components/gallery-viewer/gallery-viewer.svelte';
+  import { getAssetDuplicates, type AssetResponseDto } from '@immich/sdk';
+  import type { Viewport } from '$lib/stores/assets.store';
+  import { onMount } from 'svelte';
+
+  let assets: AssetResponseDto[] = [];
+  const viewport: Viewport = { width: 0, height: 0 };
+
+  onMount(async () => {
+    assets = await getAssetDuplicates();
+  });
+</script>
+
+<section
+  class="relative mb-12 bg-immich-bg dark:bg-immich-dark-bg m-4"
+  bind:clientHeight={viewport.height}
+  bind:clientWidth={viewport.width}
+>
+  <GalleryViewer {assets} {viewport}></GalleryViewer>
+</section>

web/src/routes/(user)/duplicates/+page.ts

@@ -0,0 +1,12 @@
+import { authenticate } from '$lib/utils/auth';
+import type { PageLoad } from './$types';
+
+export const load = (async () => {
+  await authenticate();
+
+  return {
+    meta: {
+      title: 'Duplicates',
+    },
+  };
+}) satisfies PageLoad;

web/src/routes/(user)/duplicates/photos/[assetId]/+page.ts

@@ -0,0 +1,7 @@
+import { AppRoute } from '$lib/constants';
+import { redirect } from '@sveltejs/kit';
+import type { PageLoad } from './$types';
+
+export const load: PageLoad = () => {
+  redirect(302, AppRoute.DUPLICATES);
+};