fix: crash on upload

.github/workflows/docs-deploy.yml

@@ -131,7 +131,7 @@ jobs:
           token: ${{ steps.token.outputs.token }}
 
       - name: Setup Mise
-        uses: immich-app/devtools/actions/use-mise@cd24790a7f5f6439ac32cc94f5523cb2de8bfa8c # use-mise-action-v1.1.0
+        uses: immich-app/devtools/actions/use-mise@b868e6e7c8cc212beec876330b4059e661ee44bb # use-mise-action-v1.1.1
 
       - name: Load parameters
         id: parameters

.github/workflows/docs-destroy.yml

@@ -29,7 +29,7 @@ jobs:
           token: ${{ steps.token.outputs.token }}
 
       - name: Setup Mise
-        uses: immich-app/devtools/actions/use-mise@cd24790a7f5f6439ac32cc94f5523cb2de8bfa8c # use-mise-action-v1.1.0
+        uses: immich-app/devtools/actions/use-mise@b868e6e7c8cc212beec876330b4059e661ee44bb # use-mise-action-v1.1.1
 
       - name: Destroy Docs Subdomain
         env:

.github/workflows/test.yml

@@ -502,12 +502,7 @@ jobs:
       - name: Run e2e tests (web)
         env:
           CI: true
-        run: npx playwright test --project=chromium
-        if: ${{ !cancelled() }}
-      - name: Run ui tests (web)
-        env:
-          CI: true
-        run: npx playwright test --project=ui
+        run: npx playwright test
         if: ${{ !cancelled() }}
       - name: Archive test results
         uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0

docs/docs/features/mobile-app.mdx

@@ -68,56 +68,6 @@ Now make sure that the local album is selected in the backup screen (steps 1-2 a
   title="Upload button after photos selection"
 />
 
-## Free Up Space
-
-The **Free Up Space** tool allows you to remove local media files from your device that have already been successfully backed up to your Immich server (and are not in the Immich trash). This helps reclaim storage on your mobile device without losing your memories.
-
-### How it works
-
-1.  **Configuration:**
-    - **Cutoff Date:** You can select a cutoff date. The tool will only look for photos and videos **on or before** this date.
-    - **Filter Options:** You can choose to remove **All** assets, or restrict removal to **Photos only** or **Videos only**.
-    - **Keep Favorites:** By default, local assets marked as favorites are preserved on your device, even if they match the cutoff date.
-2.  **Scan & Review:** Before any files are removed, you are presented with a review screen to verify which items will be deleted.
-3.  **Deletion:** Confirmed items are moved to your device's native Trash/Recycle Bin. They will be permanently removed by the OS based on your system settings (usually after 30 days).
-
-:::info Android Permissions
-For the smoothest experience on Android, you should grant Immich special delete privileges. Without this, you may be prompted to confirm deletion for every single image.
-
-Go to **Immich Settings > Advanced** and enable **"Media Management Access"**.
-:::
-
-### iCloud Photos (iOS Users)
-
-If you use **iCloud Photos** alongside Immich, it is vital to understand how deletion affects your data. iCloud utilizes a two-way sync; this means deleting a photo from your iPhone to free up space will **also delete it from iCloud**.
-
-:::warning iCloud & Backups
-If you rely on iCloud as a secondary backup (part of a 3-2-1 backup strategy), using the Free Up Space feature in Immich will remove the file from both your phone and iCloud.
-
-Once deleted, the photo will exist **only** on your Immich server (and your phone's "Recently Deleted" folder for 30 days).
-
-When you use iCloud Photos and delete a photo or video on one device, it's also deleted on all other devices where you're signed in with the same Apple Account.
-
-More information on the [Apple Support](https://support.apple.com/en-us/108922#iCloud_photo_library) website
-
-**Shared Albums**
-Assets that are part of an **iCloud Shared Album** are automatically excluded from the cleanup scan to ensure they remain viewable to others in the shared album.
-:::
-
-### External App Dependencies (WhatsApp, etc.)
-
-:::danger WhatsApp & Local Files
-Android applications like **WhatsApp** rely on local files to display media in chat history.
-
-If Immich backs up your WhatsApp folder and you run **Free Up Space**, the local copies of these images will be deleted. Consequently, **media in your WhatsApp chats will appear blurry or missing.** You will only be able to view these photos inside the Immich app; they will no longer be visible within the WhatsApp interface.
-
-**Recommendation:** If keeping chat history intact is important, please ensure you review the deletion list carefully or consider excluding WhatsApp folders from the backup if you intend to use this feature frequently.
-:::
-
-:::info reclaim storage
-You must empty the system/gallery trash manually to reclaim storage.
-:::
-
 ## Album Sync
 
 You can sync or mirror an album from your phone to the Immich server on your account. For example, if you select Recents, Camera and Videos album for backup, the corresponding album with the same name will be created on the server. Once the assets from those albums are uploaded, they will be put into the target albums automatically.

e2e/playwright.config.ts

@@ -8,7 +8,7 @@ dotenv.config({ path: resolve(import.meta.dirname, '.env') });
 export const playwrightHost = process.env.PLAYWRIGHT_HOST ?? '127.0.0.1';
 export const playwrightDbHost = process.env.PLAYWRIGHT_DB_HOST ?? '127.0.0.1';
 export const playwriteBaseUrl = process.env.PLAYWRIGHT_BASE_URL ?? `http://${playwrightHost}:2285`;
-export const playwriteSlowMo = Number.parseInt(process.env.PLAYWRIGHT_SLOW_MO ?? '0');
+export const playwriteSlowMo = parseInt(process.env.PLAYWRIGHT_SLOW_MO ?? '0');
 export const playwrightDisableWebserver = process.env.PLAYWRIGHT_DISABLE_WEBSERVER;
 
 process.env.PW_EXPERIMENTAL_SERVICE_WORKER_NETWORK_EVENTS = '1';
@@ -40,9 +40,9 @@ const config: PlaywrightTestConfig = {
       workers: 1,
     },
     {
-      name: 'ui',
+      name: 'parallel tests',
       use: { ...devices['Desktop Chrome'] },
-      testMatch: /.*\.ui-spec\.ts/,
+      testMatch: /.*\.parallel-e2e-spec\.ts/,
       fullyParallel: true,
       workers: process.env.CI ? 3 : Math.max(1, Math.round(cpus().length * 0.75) - 1),
     },

e2e/src/web/specs/asset-viewer/asset-viewer.parallel-e2e-spec.ts

@@ -12,7 +12,7 @@ import {
 import { setupBaseMockApiRoutes } from 'src/mock-network/base-network';
 import { setupTimelineMockApiRoutes, TimelineTestContext } from 'src/mock-network/timeline-network';
 import { utils } from 'src/utils';
-import { assetViewerUtils } from 'src/web/specs/timeline/utils';
+import { assetViewerUtils, cancelAllPollers } from 'src/web/specs/timeline/utils';
 
 test.describe.configure({ mode: 'parallel' });
 test.describe('asset-viewer', () => {
@@ -49,6 +49,7 @@ test.describe('asset-viewer', () => {
   });
 
   test.afterEach(() => {
+    cancelAllPollers();
     testContext.slowBucket = false;
     changes.albumAdditions = [];
     changes.assetDeletions = [];

e2e/src/web/specs/timeline/timeline.parallel-e2e-spec.ts

@@ -18,6 +18,7 @@ import { pageRoutePromise, setupTimelineMockApiRoutes, TimelineTestContext } fro
 import { utils } from 'src/utils';
 import {
   assetViewerUtils,
+  cancelAllPollers,
   padYearMonth,
   pageUtils,
   poll,
@@ -63,6 +64,7 @@ test.describe('Timeline', () => {
   });
 
   test.afterEach(() => {
+    cancelAllPollers();
     testContext.slowBucket = false;
     changes.albumAdditions = [];
     changes.assetDeletions = [];

e2e/src/web/specs/timeline/utils.ts

@@ -23,6 +23,13 @@ export async function throttlePage(context: BrowserContext, page: Page) {
   await session.send('Emulation.setCPUThrottlingRate', { rate: 10 });
 }
 
+let activePollsAbortController = new AbortController();
+
+export const cancelAllPollers = () => {
+  activePollsAbortController.abort();
+  activePollsAbortController = new AbortController();
+};
+
 export const poll = async <T>(
   page: Page,
   query: () => Promise<T>,
@@ -30,14 +37,21 @@ export const poll = async <T>(
 ) => {
   let result;
   const timeout = Date.now() + 10_000;
+  const signal = activePollsAbortController.signal;
 
   const terminate = callback || ((result: Awaited<T> | undefined) => !!result);
   while (!terminate(result) && Date.now() < timeout) {
+    if (signal.aborted) {
+      return;
+    }
     try {
       result = await query();
     } catch {
       // ignore
     }
+    if (signal.aborted) {
+      return;
+    }
     if (page.isClosed()) {
       return;
     }

i18n/en.json

@@ -1009,11 +1009,9 @@
   "error_getting_places": "Error getting places",
   "error_loading_image": "Error loading image",
   "error_loading_partners": "Error loading partners: {error}",
-  "error_retrieving_asset_information": "Error retrieving asset information",
   "error_saving_image": "Error: {error}",
   "error_tag_face_bounding_box": "Error tagging face - cannot get bounding box coordinates",
   "error_title": "Error - Something went wrong",
-  "error_while_navigating": "Error while navigating to asset",
   "errors": {
     "cannot_navigate_next_asset": "Cannot navigate to the next asset",
     "cannot_navigate_previous_asset": "Cannot navigate to previous asset",
@@ -1557,7 +1555,7 @@
   "no_albums_with_name_yet": "It looks like you do not have any albums with this name yet.",
   "no_albums_yet": "It looks like you do not have any albums yet.",
   "no_archived_assets_message": "Archive photos and videos to hide them from your Photos view",
-  "no_assets_message": "Click to upload your first photo",
+  "no_assets_message": "CLICK TO UPLOAD YOUR FIRST PHOTO",
   "no_assets_to_show": "No assets to show",
   "no_cast_devices_found": "No cast devices found",
   "no_checksum_local": "No checksum available - cannot fetch local assets",
@@ -1911,7 +1909,6 @@
   "search_filter_media_type_title": "Select media type",
   "search_filter_ocr": "Search by OCR",
   "search_filter_people_title": "Select people",
-  "search_filter_star_rating": "Star Rating",
   "search_for": "Search for",
   "search_for_existing_person": "Search for existing person",
   "search_no_more_result": "No more results",
@@ -2192,7 +2189,6 @@
   "theme_setting_theme_subtitle": "Choose the app's theme setting",
   "theme_setting_three_stage_loading_subtitle": "Three-stage loading might increase the loading performance but causes significantly higher network load",
   "theme_setting_three_stage_loading_title": "Enable three-stage loading",
-  "then": "Then",
   "they_will_be_merged_together": "They will be merged together",
   "third_party_resources": "Third-Party Resources",
   "time": "Time",

mobile/lib/domain/models/events.model.dart

@@ -30,8 +30,3 @@ class MultiSelectToggleEvent extends Event {
   final bool isEnabled;
   const MultiSelectToggleEvent(this.isEnabled);
 }
-
-// Map Events
-class MapMarkerReloadEvent extends Event {
-  const MapMarkerReloadEvent();
-}

mobile/lib/domain/models/exif.model.dart

@@ -6,7 +6,6 @@ class ExifInfo {
   final String? orientation;
   final String? timeZone;
   final DateTime? dateTimeOriginal;
-  final int? rating;
 
   // GPS
   final double? latitude;
@@ -47,7 +46,6 @@ class ExifInfo {
     this.orientation,
     this.timeZone,
     this.dateTimeOriginal,
-    this.rating,
     this.isFlipped = false,
     this.latitude,
     this.longitude,
@@ -73,7 +71,6 @@ class ExifInfo {
         other.orientation == orientation &&
         other.timeZone == timeZone &&
         other.dateTimeOriginal == dateTimeOriginal &&
-        other.rating == rating &&
         other.latitude == latitude &&
         other.longitude == longitude &&
         other.city == city &&
@@ -97,7 +94,6 @@ class ExifInfo {
         isFlipped.hashCode ^
         timeZone.hashCode ^
         dateTimeOriginal.hashCode ^
-        rating.hashCode ^
         latitude.hashCode ^
         longitude.hashCode ^
         city.hashCode ^
@@ -122,7 +118,6 @@ orientation: ${orientation ?? 'NA'},
 isFlipped: $isFlipped,
 timeZone: ${timeZone ?? 'NA'},
 dateTimeOriginal: ${dateTimeOriginal ?? 'NA'},
-rating: ${rating ?? 'NA'},
 latitude: ${latitude ?? 'NA'},
 longitude: ${longitude ?? 'NA'},
 city: ${city ?? 'NA'},
@@ -145,7 +140,6 @@ exposureSeconds: ${exposureSeconds ?? 'NA'},
     String? orientation,
     String? timeZone,
     DateTime? dateTimeOriginal,
-    int? rating,
     double? latitude,
     double? longitude,
     String? city,
@@ -167,7 +161,6 @@ exposureSeconds: ${exposureSeconds ?? 'NA'},
       orientation: orientation ?? this.orientation,
       timeZone: timeZone ?? this.timeZone,
       dateTimeOriginal: dateTimeOriginal ?? this.dateTimeOriginal,
-      rating: rating ?? this.rating,
       isFlipped: isFlipped ?? this.isFlipped,
       latitude: latitude ?? this.latitude,
       longitude: longitude ?? this.longitude,

mobile/lib/domain/services/background_worker.service.dart

@@ -24,12 +24,11 @@ import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/repositories/file_media.repository.dart';
 import 'package:immich_mobile/services/app_settings.service.dart';
 import 'package:immich_mobile/services/auth.service.dart';
-import 'package:immich_mobile/services/localization.service.dart';
 import 'package:immich_mobile/services/foreground_upload.service.dart';
+import 'package:immich_mobile/services/localization.service.dart';
 import 'package:immich_mobile/utils/bootstrap.dart';
 import 'package:immich_mobile/utils/debug_print.dart';
 import 'package:immich_mobile/utils/http_ssl_options.dart';
-import 'package:immich_mobile/wm_executor.dart';
 import 'package:isar/isar.dart';
 import 'package:logging/logging.dart';
 
@@ -93,7 +92,6 @@ class BackgroundWorkerBgService extends BackgroundWorkerFlutterApi {
       await Future.wait(
         [
           loadTranslations(),
-          workerManagerPatch.init(dynamicSpawning: true),
           _ref?.read(authServiceProvider).setOpenApiServiceEndpoint(),
           // Initialize the file downloader
           FileDownloader().configure(
@@ -192,25 +190,21 @@ class BackgroundWorkerBgService extends BackgroundWorkerFlutterApi {
       final backgroundSyncManager = _ref?.read(backgroundSyncProvider);
       final nativeSyncApi = _ref?.read(nativeSyncApiProvider);
 
-      await _drift.close();
-      await _driftLogger.close();
-
       _ref?.dispose();
       _ref = null;
 
+      await _drift.close();
+      await _driftLogger.close();
+
       _cancellationToken.cancel();
       _logger.info("Cleaning up background worker");
 
       final cleanupFutures = [
         nativeSyncApi?.cancelHashing(),
-        workerManagerPatch.dispose().catchError((_) async {
-          // Discard any errors on the dispose call
-          return;
-        }),
         LogService.I.dispose(),
         Store.dispose(),
-
         backgroundSyncManager?.cancel(),
+        backgroundSyncManager?.cancelLocal(),
       ];
 
       if (_isar.isOpen) {

mobile/lib/domain/services/map.service.dart

@@ -1,6 +1,5 @@
 import 'package:immich_mobile/domain/models/map.model.dart';
 import 'package:immich_mobile/infrastructure/repositories/map.repository.dart';
-import 'package:immich_mobile/infrastructure/repositories/timeline.repository.dart';
 import 'package:maplibre_gl/maplibre_gl.dart';
 
 typedef MapMarkerSource = Future<List<Marker>> Function(LatLngBounds? bounds);
@@ -12,8 +11,7 @@ class MapFactory {
 
   const MapFactory({required DriftMapRepository mapRepository}) : _mapRepository = mapRepository;
 
-  MapService remote(List<String> ownerIds, TimelineMapOptions options) =>
-      MapService(_mapRepository.remote(ownerIds, options));
+  MapService remote(String ownerId) => MapService(_mapRepository.remote(ownerId));
 }
 
 class MapService {

mobile/lib/domain/services/timeline.service.dart

@@ -11,6 +11,7 @@ import 'package:immich_mobile/domain/services/setting.service.dart';
 import 'package:immich_mobile/domain/utils/event_stream.dart';
 import 'package:immich_mobile/infrastructure/repositories/timeline.repository.dart';
 import 'package:immich_mobile/utils/async_mutex.dart';
+import 'package:maplibre_gl/maplibre_gl.dart';
 
 typedef TimelineAssetSource = Future<List<BaseAsset>> Function(int index, int count);
 
@@ -81,8 +82,8 @@ class TimelineFactory {
   TimelineService fromAssetsWithBuckets(List<BaseAsset> assets, TimelineOrigin type) =>
       TimelineService(_timelineRepository.fromAssetsWithBuckets(assets, type));
 
-  TimelineService map(List<String> userIds, TimelineMapOptions options) =>
-      TimelineService(_timelineRepository.map(userIds, options, groupBy));
+  TimelineService map(String userId, LatLngBounds bounds) =>
+      TimelineService(_timelineRepository.map(userId, bounds, groupBy));
 }
 
 class TimelineService {

mobile/lib/domain/utils/background_sync.dart

@@ -4,7 +4,6 @@ import 'package:immich_mobile/domain/utils/migrate_cloud_ids.dart' as m;
 import 'package:immich_mobile/domain/utils/sync_linked_album.dart';
 import 'package:immich_mobile/providers/infrastructure/sync.provider.dart';
 import 'package:immich_mobile/utils/isolate.dart';
-import 'package:worker_manager/worker_manager.dart';
 
 typedef SyncCallback = void Function();
 typedef SyncCallbackWithResult<T> = void Function(T result);
@@ -27,12 +26,12 @@ class BackgroundSyncManager {
   final SyncCallback? onCloudIdSyncComplete;
   final SyncErrorCallback? onCloudIdSyncError;
 
-  Cancelable<bool?>? _syncTask;
-  Cancelable<void>? _syncWebsocketTask;
-  Cancelable<void>? _cloudIdSyncTask;
-  Cancelable<void>? _deviceAlbumSyncTask;
-  Cancelable<void>? _linkedAlbumSyncTask;
-  Cancelable<void>? _hashTask;
+  CancellableTask<bool>? _syncTask;
+  CancellableTask<void>? _syncWebsocketTask;
+  CancellableTask<void>? _cloudIdSyncTask;
+  CancellableTask<void>? _deviceAlbumSyncTask;
+  CancellableTask<void>? _linkedAlbumSyncTask;
+  CancellableTask<void>? _hashTask;
 
   BackgroundSyncManager({
     this.onRemoteSyncStart,
@@ -50,59 +49,42 @@ class BackgroundSyncManager {
   });
 
   Future<void> cancel() async {
-    final futures = <Future>[];
-
-    if (_syncTask != null) {
-      futures.add(_syncTask!.future);
-    }
     _syncTask?.cancel();
-    _syncTask = null;
-
-    if (_syncWebsocketTask != null) {
-      futures.add(_syncWebsocketTask!.future);
-    }
     _syncWebsocketTask?.cancel();
-    _syncWebsocketTask = null;
-
-    if (_cloudIdSyncTask != null) {
-      futures.add(_cloudIdSyncTask!.future);
-    }
     _cloudIdSyncTask?.cancel();
-    _cloudIdSyncTask = null;
-
-    if (_linkedAlbumSyncTask != null) {
-      futures.add(_linkedAlbumSyncTask!.future);
-    }
     _linkedAlbumSyncTask?.cancel();
-    _linkedAlbumSyncTask = null;
 
     try {
-      await Future.wait(futures);
-    } on CanceledError {
-      // Ignore cancellation errors
+      await Future.wait(
+        [
+          _syncTask?.future,
+          _syncWebsocketTask?.future,
+          _cloudIdSyncTask?.future,
+          _linkedAlbumSyncTask?.future,
+        ].nonNulls,
+      );
+    } catch (e) {
+      // Ignore cancellation errors and cleanup timeouts
     }
+
+    _syncTask = null;
+    _syncWebsocketTask = null;
+    _cloudIdSyncTask = null;
+    _linkedAlbumSyncTask = null;
   }
 
   Future<void> cancelLocal() async {
-    final futures = <Future>[];
-
-    if (_hashTask != null) {
-      futures.add(_hashTask!.future);
-    }
     _hashTask?.cancel();
-    _hashTask = null;
-
-    if (_deviceAlbumSyncTask != null) {
-      futures.add(_deviceAlbumSyncTask!.future);
-    }
     _deviceAlbumSyncTask?.cancel();
-    _deviceAlbumSyncTask = null;
 
     try {
-      await Future.wait(futures);
-    } on CanceledError {
-      // Ignore cancellation errors
+      await Future.wait([_hashTask?.future, _deviceAlbumSyncTask?.future].nonNulls);
+    } catch (e) {
+      // Ignore cancellation errors and cleanup timeouts
     }
+
+    _hashTask = null;
+    _deviceAlbumSyncTask = null;
   }
 
   // No need to cancel the task, as it can also be run when the user logs out
@@ -133,7 +115,8 @@ class BackgroundSyncManager {
         .catchError((error) {
           onLocalSyncError?.call(error.toString());
           _deviceAlbumSyncTask = null;
-        });
+        })
+        .future;
   }
 
   Future<void> hashAssets() {
@@ -156,7 +139,8 @@ class BackgroundSyncManager {
         .catchError((error) {
           onHashingError?.call(error.toString());
           _hashTask = null;
-        });
+        })
+        .future;
   }
 
   Future<bool> syncRemote() {
@@ -170,7 +154,7 @@ class BackgroundSyncManager {
       computation: (ref) => ref.read(syncStreamServiceProvider).sync(),
       debugLabel: 'remote-sync',
     );
-    return _syncTask!
+    return _syncTask!.future
         .then((result) {
           final success = result ?? false;
           onRemoteSyncComplete?.call(success);
@@ -193,7 +177,7 @@ class BackgroundSyncManager {
     _syncWebsocketTask = _handleWsAssetUploadReadyV1Batch(batchData);
     return _syncWebsocketTask!.whenComplete(() {
       _syncWebsocketTask = null;
-    });
+    }).future;
   }
 
   Future<void> syncWebsocketEditBatch(List<dynamic> batchData) {
@@ -203,7 +187,7 @@ class BackgroundSyncManager {
     _syncWebsocketTask = _handleWsAssetEditReadyV1Batch(batchData);
     return _syncWebsocketTask!.whenComplete(() {
       _syncWebsocketTask = null;
-    });
+    }).future;
   }
 
   Future<void> syncLinkedAlbum() {
@@ -214,7 +198,7 @@ class BackgroundSyncManager {
     _linkedAlbumSyncTask = runInIsolateGentle(computation: syncLinkedAlbumsIsolated, debugLabel: 'linked-album-sync');
     return _linkedAlbumSyncTask!.whenComplete(() {
       _linkedAlbumSyncTask = null;
-    });
+    }).future;
   }
 
   Future<void> syncCloudIds() {
@@ -224,7 +208,7 @@ class BackgroundSyncManager {
 
     onCloudIdSyncStart?.call();
 
-    _cloudIdSyncTask = runInIsolateGentle(computation: m.syncCloudIds);
+    _cloudIdSyncTask = runInIsolateGentle(computation: m.syncCloudIds, debugLabel: 'cloud-id-sync');
     return _cloudIdSyncTask!
         .whenComplete(() {
           onCloudIdSyncComplete?.call();
@@ -233,16 +217,17 @@ class BackgroundSyncManager {
         .catchError((error) {
           onCloudIdSyncError?.call(error.toString());
           _cloudIdSyncTask = null;
-        });
+        })
+        .future;
   }
 }
 
-Cancelable<void> _handleWsAssetUploadReadyV1Batch(List<dynamic> batchData) => runInIsolateGentle(
+CancellableTask<void> _handleWsAssetUploadReadyV1Batch(List<dynamic> batchData) => runInIsolateGentle(
   computation: (ref) => ref.read(syncStreamServiceProvider).handleWsAssetUploadReadyV1Batch(batchData),
   debugLabel: 'websocket-batch',
 );
 
-Cancelable<void> _handleWsAssetEditReadyV1Batch(List<dynamic> batchData) => runInIsolateGentle(
+CancellableTask<void> _handleWsAssetEditReadyV1Batch(List<dynamic> batchData) => runInIsolateGentle(
   computation: (ref) => ref.read(syncStreamServiceProvider).handleWsAssetEditReadyV1Batch(batchData),
   debugLabel: 'websocket-edit',
 );

mobile/lib/infrastructure/entities/exif.entity.dart

@@ -151,7 +151,6 @@ extension RemoteExifEntityDataDomainEx on RemoteExifEntityData {
   domain.ExifInfo toDto() => domain.ExifInfo(
     fileSize: fileSize,
     dateTimeOriginal: dateTimeOriginal,
-    rating: rating,
     timeZone: timeZone,
     make: make,
     model: model,

mobile/lib/infrastructure/repositories/map.repository.dart

@@ -5,7 +5,6 @@ import 'package:immich_mobile/domain/services/map.service.dart';
 import 'package:immich_mobile/infrastructure/entities/exif.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/entities/remote_asset.entity.drift.dart';
 import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
-import 'package:immich_mobile/infrastructure/repositories/timeline.repository.dart';
 import 'package:maplibre_gl/maplibre_gl.dart';
 
 class DriftMapRepository extends DriftDatabaseRepository {
@@ -13,27 +12,9 @@ class DriftMapRepository extends DriftDatabaseRepository {
 
   const DriftMapRepository(super._db) : _db = _db;
 
-  MapQuery remote(List<String> ownerIds, TimelineMapOptions options) => _mapQueryBuilder(
-    assetFilter: (row) {
-      Expression<bool> condition =
-          row.deletedAt.isNull() &
-          row.ownerId.isIn(ownerIds) &
-          _db.remoteAssetEntity.visibility.isIn([
-            AssetVisibility.timeline.index,
-            if (options.includeArchived) AssetVisibility.archive.index,
-          ]);
-
-      if (options.onlyFavorites) {
-        condition = condition & _db.remoteAssetEntity.isFavorite.equals(true);
-      }
-
-      if (options.relativeDays != 0) {
-        final cutoffDate = DateTime.now().toUtc().subtract(Duration(days: options.relativeDays));
-        condition = condition & _db.remoteAssetEntity.createdAt.isBiggerOrEqualValue(cutoffDate);
-      }
-
-      return condition;
-    },
+  MapQuery remote(String ownerId) => _mapQueryBuilder(
+    assetFilter: (row) =>
+        row.deletedAt.isNull() & row.visibility.equalsValue(AssetVisibility.timeline) & row.ownerId.equals(ownerId),
   );
 
   MapQuery _mapQueryBuilder({Expression<bool> Function($RemoteAssetEntityTable row)? assetFilter}) {

mobile/lib/infrastructure/repositories/remote_asset.repository.dart

@@ -255,12 +255,6 @@ class RemoteAssetRepository extends DriftDatabaseRepository {
     );
   }
 
-  Future<void> updateRating(String assetId, int rating) async {
-    await (_db.remoteExifEntity.update()..where((row) => row.assetId.equals(assetId))).write(
-      RemoteExifEntityCompanion(rating: Value(rating)),
-    );
-  }
-
   Future<int> getCount() {
     return _db.managers.remoteAssetEntity.count();
   }

mobile/lib/infrastructure/repositories/search_api.repository.dart

@@ -31,7 +31,6 @@ class SearchApiRepository extends ApiRepository {
           takenAfter: filter.date.takenAfter,
           takenBefore: filter.date.takenBefore,
           visibility: filter.display.isArchive ? AssetVisibility.archive : AssetVisibility.timeline,
-          rating: filter.rating.rating,
           isFavorite: filter.display.isFavorite ? true : null,
           isNotInAlbum: filter.display.isNotInAlbum ? true : null,
           personIds: filter.people.map((e) => e.id).toList(),
@@ -55,7 +54,6 @@ class SearchApiRepository extends ApiRepository {
         takenAfter: filter.date.takenAfter,
         takenBefore: filter.date.takenBefore,
         visibility: filter.display.isArchive ? AssetVisibility.archive : AssetVisibility.timeline,
-        rating: filter.rating.rating,
         isFavorite: filter.display.isFavorite ? true : null,
         isNotInAlbum: filter.display.isNotInAlbum ? true : null,
         personIds: filter.people.map((e) => e.id).toList(),

mobile/lib/infrastructure/repositories/timeline.repository.dart

@@ -15,22 +15,6 @@ import 'package:immich_mobile/infrastructure/repositories/map.repository.dart';
 import 'package:maplibre_gl/maplibre_gl.dart';
 import 'package:stream_transform/stream_transform.dart';
 
-class TimelineMapOptions {
-  final LatLngBounds bounds;
-  final bool onlyFavorites;
-  final bool includeArchived;
-  final bool withPartners;
-  final int relativeDays;
-
-  const TimelineMapOptions({
-    required this.bounds,
-    this.onlyFavorites = false,
-    this.includeArchived = false,
-    this.withPartners = false,
-    this.relativeDays = 0,
-  });
-}
-
 class DriftTimelineRepository extends DriftDatabaseRepository {
   final Drift _db;
 
@@ -483,15 +467,15 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
     return query.map((row) => row.readTable(_db.remoteAssetEntity).toDto()).get();
   }
 
-  TimelineQuery map(List<String> userIds, TimelineMapOptions options, GroupAssetsBy groupBy) => (
-    bucketSource: () => _watchMapBucket(userIds, options, groupBy: groupBy),
-    assetSource: (offset, count) => _getMapBucketAssets(userIds, options, offset: offset, count: count),
+  TimelineQuery map(String userId, LatLngBounds bounds, GroupAssetsBy groupBy) => (
+    bucketSource: () => _watchMapBucket(userId, bounds, groupBy: groupBy),
+    assetSource: (offset, count) => _getMapBucketAssets(userId, bounds, offset: offset, count: count),
     origin: TimelineOrigin.map,
   );
 
   Stream<List<Bucket>> _watchMapBucket(
-    List<String> userId,
-    TimelineMapOptions options, {
+    String userId,
+    LatLngBounds bounds, {
     GroupAssetsBy groupBy = GroupAssetsBy.day,
   }) {
     if (groupBy == GroupAssetsBy.none) {
@@ -512,26 +496,14 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
         ),
       ])
       ..where(
-        _db.remoteAssetEntity.ownerId.isIn(userId) &
-            _db.remoteExifEntity.inBounds(options.bounds) &
-            _db.remoteAssetEntity.visibility.isIn([
-              AssetVisibility.timeline.index,
-              if (options.includeArchived) AssetVisibility.archive.index,
-            ]) &
+        _db.remoteAssetEntity.ownerId.equals(userId) &
+            _db.remoteExifEntity.inBounds(bounds) &
+            _db.remoteAssetEntity.visibility.equalsValue(AssetVisibility.timeline) &
             _db.remoteAssetEntity.deletedAt.isNull(),
       )
       ..groupBy([dateExp])
       ..orderBy([OrderingTerm.desc(dateExp)]);
 
-    if (options.onlyFavorites) {
-      query.where(_db.remoteAssetEntity.isFavorite.equals(true));
-    }
-
-    if (options.relativeDays != 0) {
-      final cutoffDate = DateTime.now().toUtc().subtract(Duration(days: options.relativeDays));
-      query.where(_db.remoteAssetEntity.createdAt.isBiggerOrEqualValue(cutoffDate));
-    }
-
     return query.map((row) {
       final timeline = row.read(dateExp)!.truncateDate(groupBy);
       final assetCount = row.read(assetCountExp)!;
@@ -540,8 +512,8 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
   }
 
   Future<List<BaseAsset>> _getMapBucketAssets(
-    List<String> userId,
-    TimelineMapOptions options, {
+    String userId,
+    LatLngBounds bounds, {
     required int offset,
     required int count,
   }) {
@@ -554,26 +526,13 @@ class DriftTimelineRepository extends DriftDatabaseRepository {
             ),
           ])
           ..where(
-            _db.remoteAssetEntity.ownerId.isIn(userId) &
-                _db.remoteExifEntity.inBounds(options.bounds) &
-                _db.remoteAssetEntity.visibility.isIn([
-                  AssetVisibility.timeline.index,
-                  if (options.includeArchived) AssetVisibility.archive.index,
-                ]) &
+            _db.remoteAssetEntity.ownerId.equals(userId) &
+                _db.remoteExifEntity.inBounds(bounds) &
+                _db.remoteAssetEntity.visibility.equalsValue(AssetVisibility.timeline) &
                 _db.remoteAssetEntity.deletedAt.isNull(),
           )
           ..orderBy([OrderingTerm.desc(_db.remoteAssetEntity.createdAt)])
           ..limit(count, offset: offset);
-
-    if (options.onlyFavorites) {
-      query.where(_db.remoteAssetEntity.isFavorite.equals(true));
-    }
-
-    if (options.relativeDays != 0) {
-      final cutoffDate = DateTime.now().toUtc().subtract(Duration(days: options.relativeDays));
-      query.where(_db.remoteAssetEntity.createdAt.isBiggerOrEqualValue(cutoffDate));
-    }
-
     return query.map((row) => row.readTable(_db.remoteAssetEntity).toDto()).get();
   }
 

mobile/lib/main.dart

@@ -1,6 +1,5 @@
 import 'dart:async';
 import 'dart:io';
-import 'dart:math';
 
 import 'package:auto_route/auto_route.dart';
 import 'package:background_downloader/background_downloader.dart';
@@ -41,7 +40,6 @@ import 'package:immich_mobile/utils/debug_print.dart';
 import 'package:immich_mobile/utils/http_ssl_options.dart';
 import 'package:immich_mobile/utils/licenses.dart';
 import 'package:immich_mobile/utils/migration.dart';
-import 'package:immich_mobile/wm_executor.dart';
 import 'package:immich_ui/immich_ui.dart';
 import 'package:intl/date_symbol_data_local.dart';
 import 'package:logging/logging.dart';
@@ -53,8 +51,6 @@ void main() async {
   final (isar, drift, logDb) = await Bootstrap.initDB();
   await Bootstrap.initDomain(isar, drift, logDb);
   await initApp();
-  // Warm-up isolate pool for worker manager
-  await workerManagerPatch.init(dynamicSpawning: true, isolatesCount: max(Platform.numberOfProcessors - 1, 5));
   await migrateDatabaseIfNeeded(isar, drift);
   HttpSSLOptions.apply();
 

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

@@ -126,41 +126,6 @@ class SearchDateFilter {
   int get hashCode => takenBefore.hashCode ^ takenAfter.hashCode;
 }
 
-class SearchRatingFilter {
-  int? rating;
-  SearchRatingFilter({this.rating});
-
-  SearchRatingFilter copyWith({int? rating}) {
-    return SearchRatingFilter(rating: rating ?? this.rating);
-  }
-
-  Map<String, dynamic> toMap() {
-    return <String, dynamic>{'rating': rating};
-  }
-
-  factory SearchRatingFilter.fromMap(Map<String, dynamic> map) {
-    return SearchRatingFilter(rating: map['rating'] != null ? map['rating'] as int : null);
-  }
-
-  String toJson() => json.encode(toMap());
-
-  factory SearchRatingFilter.fromJson(String source) =>
-      SearchRatingFilter.fromMap(json.decode(source) as Map<String, dynamic>);
-
-  @override
-  String toString() => 'SearchRatingFilter(rating: $rating)';
-
-  @override
-  bool operator ==(covariant SearchRatingFilter other) {
-    if (identical(this, other)) return true;
-
-    return other.rating == rating;
-  }
-
-  @override
-  int get hashCode => rating.hashCode;
-}
-
 class SearchDisplayFilters {
   bool isNotInAlbum = false;
   bool isArchive = false;
@@ -218,7 +183,6 @@ class SearchFilter {
   SearchLocationFilter location;
   SearchCameraFilter camera;
   SearchDateFilter date;
-  SearchRatingFilter rating;
   SearchDisplayFilters display;
 
   // Enum
@@ -236,7 +200,6 @@ class SearchFilter {
     required this.camera,
     required this.date,
     required this.display,
-    required this.rating,
     required this.mediaType,
   });
 
@@ -257,7 +220,6 @@ class SearchFilter {
         display.isNotInAlbum == false &&
         display.isArchive == false &&
         display.isFavorite == false &&
-        rating.rating == null &&
         mediaType == AssetType.other;
   }
 
@@ -273,7 +235,6 @@ class SearchFilter {
     SearchCameraFilter? camera,
     SearchDateFilter? date,
     SearchDisplayFilters? display,
-    SearchRatingFilter? rating,
     AssetType? mediaType,
   }) {
     return SearchFilter(
@@ -288,14 +249,13 @@ class SearchFilter {
       camera: camera ?? this.camera,
       date: date ?? this.date,
       display: display ?? this.display,
-      rating: rating ?? this.rating,
       mediaType: mediaType ?? this.mediaType,
     );
   }
 
   @override
   String toString() {
-    return 'SearchFilter(context: $context, filename: $filename, description: $description, language: $language, ocr: $ocr, people: $people, location: $location, camera: $camera, date: $date, display: $display, rating: $rating, mediaType: $mediaType, assetId: $assetId)';
+    return 'SearchFilter(context: $context, filename: $filename, description: $description, language: $language, ocr: $ocr, people: $people, location: $location, camera: $camera, date: $date, display: $display, mediaType: $mediaType, assetId: $assetId)';
   }
 
   @override
@@ -313,7 +273,6 @@ class SearchFilter {
         other.camera == camera &&
         other.date == date &&
         other.display == display &&
-        other.rating == rating &&
         other.mediaType == mediaType;
   }
 
@@ -330,7 +289,6 @@ class SearchFilter {
         camera.hashCode ^
         date.hashCode ^
         display.hashCode ^
-        rating.hashCode ^
         mediaType.hashCode;
   }
 }

mobile/lib/pages/common/splash_screen.page.dart

@@ -10,7 +10,6 @@ import 'package:immich_mobile/providers/background_sync.provider.dart';
 import 'package:immich_mobile/providers/backup/backup.provider.dart';
 import 'package:immich_mobile/providers/backup/drift_backup.provider.dart';
 import 'package:immich_mobile/providers/gallery_permission.provider.dart';
-import 'package:immich_mobile/providers/server_info.provider.dart';
 import 'package:immich_mobile/providers/websocket.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:logging/logging.dart';
@@ -50,7 +49,6 @@ class SplashScreenPageState extends ConsumerState<SplashScreenPage> {
     final accessToken = Store.tryGet(StoreKey.accessToken);
 
     if (accessToken != null && serverUrl != null && endpoint != null) {
-      final infoProvider = ref.read(serverInfoProvider.notifier);
       final wsProvider = ref.read(websocketProvider.notifier);
       final backgroundManager = ref.read(backgroundSyncProvider);
       final backupProvider = ref.read(driftBackupProvider.notifier);
@@ -60,7 +58,6 @@ class SplashScreenPageState extends ConsumerState<SplashScreenPage> {
           (_) async {
             try {
               wsProvider.connect();
-              unawaited(infoProvider.getServerInfo());
 
               if (Store.isBetaTimelineEnabled) {
                 bool syncSuccess = false;

mobile/lib/pages/library/places/places_collection.page.dart

@@ -113,7 +113,6 @@ class PlaceTile extends StatelessWidget {
             camera: SearchCameraFilter(),
             date: SearchDateFilter(),
             display: SearchDisplayFilters(isNotInAlbum: false, isArchive: false, isFavorite: false),
-            rating: SearchRatingFilter(),
             mediaType: AssetType.other,
           ),
         ),

mobile/lib/pages/search/search.page.dart

@@ -43,7 +43,6 @@ class SearchPage extends HookConsumerWidget {
         date: prefilter?.date ?? SearchDateFilter(),
         display: prefilter?.display ?? SearchDisplayFilters(isNotInAlbum: false, isArchive: false, isFavorite: false),
         mediaType: prefilter?.mediaType ?? AssetType.other,
-        rating: prefilter?.rating ?? SearchRatingFilter(),
         language: "${context.locale.languageCode}-${context.locale.countryCode}",
       ),
     );

mobile/lib/presentation/pages/drift_map.page.dart

@@ -2,7 +2,6 @@ import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/presentation/widgets/map/map.widget.dart';
-import 'package:immich_mobile/presentation/widgets/map/map_settings_sheet.dart';
 import 'package:maplibre_gl/maplibre_gl.dart';
 
 @RoutePage()
@@ -11,16 +10,6 @@ class DriftMapPage extends StatelessWidget {
 
   const DriftMapPage({super.key, this.initialLocation});
 
-  void onSettingsPressed(BuildContext context) {
-    showModalBottomSheet(
-      elevation: 0.0,
-      showDragHandle: true,
-      isScrollControlled: true,
-      context: context,
-      builder: (_) => const DriftMapSettingsSheet(),
-    );
-  }
-
   @override
   Widget build(BuildContext context) {
     return Scaffold(
@@ -29,8 +18,8 @@ class DriftMapPage extends StatelessWidget {
         children: [
           DriftMap(initialLocation: initialLocation),
           Positioned(
-            left: 20,
-            top: 70,
+            left: 16,
+            top: 60,
             child: IconButton.filled(
               color: Colors.white,
               onPressed: () => context.pop(),
@@ -43,21 +32,6 @@ class DriftMapPage extends StatelessWidget {
               ),
             ),
           ),
-          Positioned(
-            right: 20,
-            top: 70,
-            child: IconButton.filled(
-              color: Colors.white,
-              onPressed: () => onSettingsPressed(context),
-              icon: const Icon(Icons.more_vert_rounded),
-              style: IconButton.styleFrom(
-                padding: const EdgeInsets.all(8),
-                backgroundColor: Colors.indigo,
-                shadowColor: Colors.black26,
-                elevation: 4,
-              ),
-            ),
-          ),
         ],
       ),
     );

mobile/lib/presentation/pages/search/drift_search.page.dart

@@ -18,7 +18,6 @@ import 'package:immich_mobile/presentation/widgets/bottom_sheet/general_bottom_s
 import 'package:immich_mobile/presentation/widgets/search/quick_date_picker.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/timeline.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/user_metadata.provider.dart';
 import 'package:immich_mobile/providers/search/search_input_focus.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/widgets/common/feature_check.dart';
@@ -31,7 +30,6 @@ import 'package:immich_mobile/widgets/search/search_filter/media_type_picker.dar
 import 'package:immich_mobile/widgets/search/search_filter/people_picker.dart';
 import 'package:immich_mobile/widgets/search/search_filter/search_filter_chip.dart';
 import 'package:immich_mobile/widgets/search/search_filter/search_filter_utils.dart';
-import 'package:immich_mobile/widgets/search/search_filter/star_rating_picker.dart';
 
 @RoutePage()
 class DriftSearchPage extends HookConsumerWidget {
@@ -50,7 +48,6 @@ class DriftSearchPage extends HookConsumerWidget {
         camera: preFilter?.camera ?? SearchCameraFilter(),
         date: preFilter?.date ?? SearchDateFilter(),
         display: preFilter?.display ?? SearchDisplayFilters(isNotInAlbum: false, isArchive: false, isFavorite: false),
-        rating: preFilter?.rating ?? SearchRatingFilter(),
         mediaType: preFilter?.mediaType ?? AssetType.other,
         language: "${context.locale.languageCode}-${context.locale.countryCode}",
         assetId: preFilter?.assetId,
@@ -65,15 +62,10 @@ class DriftSearchPage extends HookConsumerWidget {
     final cameraCurrentFilterWidget = useState<Widget?>(null);
     final locationCurrentFilterWidget = useState<Widget?>(null);
     final mediaTypeCurrentFilterWidget = useState<Widget?>(null);
-    final ratingCurrentFilterWidget = useState<Widget?>(null);
     final displayOptionCurrentFilterWidget = useState<Widget?>(null);
 
     final isSearching = useState(false);
 
-    final isRatingEnabled = ref
-        .watch(userMetadataPreferencesProvider)
-        .maybeWhen(data: (prefs) => prefs?.ratingsEnabled ?? false, orElse: () => false);
-
     SnackBar searchInfoSnackBar(String message) {
       return SnackBar(
         content: Text(message, style: context.textTheme.labelLarge),
@@ -377,35 +369,6 @@ class DriftSearchPage extends HookConsumerWidget {
       );
     }
 
-    // STAR RATING PICKER
-    showStarRatingPicker() {
-      handleOnSelected(SearchRatingFilter rating) {
-        filter.value = filter.value.copyWith(rating: rating);
-
-        ratingCurrentFilterWidget.value = Text(
-          'rating_count'.t(args: {'count': rating.rating!}),
-          style: context.textTheme.labelLarge,
-        );
-      }
-
-      handleClear() {
-        filter.value = filter.value.copyWith(rating: SearchRatingFilter(rating: null));
-        ratingCurrentFilterWidget.value = null;
-        search();
-      }
-
-      showFilterBottomSheet(
-        context: context,
-        isScrollControlled: true,
-        child: FilterBottomSheetScaffold(
-          title: 'rating'.t(context: context),
-          onSearch: search,
-          onClear: handleClear,
-          child: StarRatingPicker(onSelect: handleOnSelected, filter: filter.value.rating),
-        ),
-      );
-    }
-
     // DISPLAY OPTION
     showDisplayOptionPicker() {
       handleOnSelect(Map<DisplayOption, bool> value) {
@@ -666,14 +629,6 @@ class DriftSearchPage extends HookConsumerWidget {
                       label: 'search_filter_media_type'.t(context: context),
                       currentFilter: mediaTypeCurrentFilterWidget.value,
                     ),
-                    if (isRatingEnabled) ...[
-                      SearchFilterChip(
-                        icon: Icons.star_outline_rounded,
-                        onTap: showStarRatingPicker,
-                        label: 'search_filter_star_rating'.t(context: context),
-                        currentFilter: ratingCurrentFilterWidget.value,
-                      ),
-                    ],
                     SearchFilterChip(
                       icon: Icons.display_settings_outlined,
                       onTap: showDisplayOptionPicker,

mobile/lib/presentation/widgets/action_buttons/similar_photos_action_button.widget.dart

@@ -34,7 +34,6 @@ class SimilarPhotosActionButton extends ConsumerWidget {
             camera: SearchCameraFilter(),
             date: SearchDateFilter(),
             display: SearchDisplayFilters(isNotInAlbum: false, isArchive: false, isFavorite: false),
-            rating: SearchRatingFilter(),
             mediaType: AssetType.image,
           ),
         );

mobile/lib/presentation/widgets/asset_viewer/asset_viewer.page.dart

@@ -118,6 +118,7 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
   bool dragInProgress = false;
   bool shouldPopOnDrag = false;
   bool assetReloadRequested = false;
+  double? initialScale;
   double previousExtent = _kBottomSheetMinimumExtent;
   Offset dragDownPosition = Offset.zero;
   int totalAssets = 0;
@@ -263,6 +264,7 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
           (context.height * bottomSheetController.size) - (context.height * _kBottomSheetMinimumExtent);
       controller.position = Offset(0, -verticalOffset);
       // Apply the zoom effect when the bottom sheet is showing
+      initialScale = controller.scale;
       controller.scale = (controller.scale ?? 1.0) + 0.01;
     }
   }
@@ -314,7 +316,7 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
     hasDraggedDown = null;
     viewController?.animateMultiple(
       position: initialPhotoViewState.position,
-      scale: viewController?.initialScale ?? initialPhotoViewState.scale,
+      scale: initialPhotoViewState.scale,
       rotation: initialPhotoViewState.rotation,
     );
     ref.read(assetViewerProvider.notifier).setOpacity(255);
@@ -364,9 +366,8 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
     final maxScaleDistance = ctx.height * 0.5;
     final scaleReduction = (distance / maxScaleDistance).clamp(0.0, dragRatio);
     double? updatedScale;
-    double? initialScale = viewController?.initialScale ?? initialPhotoViewState.scale;
-    if (initialScale != null) {
-      updatedScale = initialScale * (1.0 - scaleReduction);
+    if (initialPhotoViewState.scale != null) {
+      updatedScale = initialPhotoViewState.scale! * (1.0 - scaleReduction);
     }
 
     final backgroundOpacity = (255 * (1.0 - (scaleReduction / dragRatio))).round();
@@ -480,6 +481,8 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
 
   void _openBottomSheet(BuildContext ctx, {double extent = _kBottomSheetMinimumExtent, bool activitiesMode = false}) {
     ref.read(assetViewerProvider.notifier).setBottomSheet(true);
+    initialScale = viewController?.scale;
+    // viewController?.updateMultiple(scale: (viewController?.scale ?? 1.0) + 0.01);
     previousExtent = _kBottomSheetMinimumExtent;
     sheetCloseController = showBottomSheet(
       context: ctx,
@@ -501,7 +504,7 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
 
   void _handleSheetClose() {
     viewController?.animateMultiple(position: Offset.zero);
-    viewController?.updateMultiple(scale: viewController?.initialScale);
+    viewController?.updateMultiple(scale: initialScale);
     ref.read(assetViewerProvider.notifier).setBottomSheet(false);
     sheetCloseController = null;
     shouldPopOnDrag = false;

mobile/lib/presentation/widgets/asset_viewer/bottom_sheet.widget.dart

@@ -16,13 +16,11 @@ import 'package:immich_mobile/presentation/widgets/album/album_tile.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_viewer.state.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/bottom_sheet/sheet_location_details.widget.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/bottom_sheet/sheet_people_details.widget.dart';
-import 'package:immich_mobile/presentation/widgets/asset_viewer/rating_bar.widget.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/sheet_tile.widget.dart';
 import 'package:immich_mobile/presentation/widgets/bottom_sheet/base_bottom_sheet.widget.dart';
 import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/asset_viewer/current_asset.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/user_metadata.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/repositories/asset_media.repository.dart';
 import 'package:immich_mobile/routing/router.dart';
@@ -206,9 +204,6 @@ class _AssetDetailBottomSheet extends ConsumerWidget {
     final cameraTitle = _getCameraInfoTitle(exifInfo);
     final lensTitle = exifInfo?.lens != null && exifInfo!.lens!.isNotEmpty ? exifInfo.lens : null;
     final isOwner = ref.watch(currentUserProvider)?.id == (asset is RemoteAsset ? asset.ownerId : null);
-    final isRatingEnabled = ref
-        .watch(userMetadataPreferencesProvider)
-        .maybeWhen(data: (prefs) => prefs?.ratingsEnabled ?? false, orElse: () => false);
 
     // Build file info tile based on asset type
     Widget buildFileInfoTile() {
@@ -288,38 +283,6 @@ class _AssetDetailBottomSheet extends ConsumerWidget {
             subtitleStyle: context.textTheme.bodyMedium?.copyWith(color: context.colorScheme.onSurfaceSecondary),
           ),
         ],
-        // Rating bar
-        if (isRatingEnabled) ...[
-          Padding(
-            padding: const EdgeInsets.only(left: 16.0, top: 16.0),
-            child: Column(
-              mainAxisSize: MainAxisSize.min,
-              crossAxisAlignment: CrossAxisAlignment.start,
-              spacing: 8,
-              children: [
-                Text(
-                  'rating'.t(context: context).toUpperCase(),
-                  style: context.textTheme.labelMedium?.copyWith(
-                    color: context.textTheme.labelMedium?.color?.withAlpha(200),
-                    fontWeight: FontWeight.w600,
-                  ),
-                ),
-                RatingBar(
-                  initialRating: exifInfo?.rating?.toDouble() ?? 0,
-                  filledColor: context.themeData.colorScheme.primary,
-                  unfilledColor: context.themeData.colorScheme.onSurface.withAlpha(100),
-                  itemSize: 40,
-                  onRatingUpdate: (rating) async {
-                    await ref.read(actionProvider.notifier).updateRating(ActionSource.viewer, rating.round());
-                  },
-                  onClearRating: () async {
-                    await ref.read(actionProvider.notifier).updateRating(ActionSource.viewer, 0);
-                  },
-                ),
-              ],
-            ),
-          ),
-        ],
         // Appears in (Albums)
         Padding(padding: const EdgeInsets.only(top: 16.0), child: _buildAppearsInList(ref, context)),
         // padding at the bottom to avoid cut-off

mobile/lib/presentation/widgets/asset_viewer/rating_bar.widget.dart

@@ -1,125 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/extensions/translate_extensions.dart';
-
-class RatingBar extends StatefulWidget {
-  final double initialRating;
-  final int itemCount;
-  final double itemSize;
-  final Color filledColor;
-  final Color unfilledColor;
-  final ValueChanged<int>? onRatingUpdate;
-  final VoidCallback? onClearRating;
-  final Widget? itemBuilder;
-  final double starPadding;
-
-  const RatingBar({
-    super.key,
-    this.initialRating = 0.0,
-    this.itemCount = 5,
-    this.itemSize = 40.0,
-    this.filledColor = Colors.amber,
-    this.unfilledColor = Colors.grey,
-    this.onRatingUpdate,
-    this.onClearRating,
-    this.itemBuilder,
-    this.starPadding = 4.0,
-  });
-
-  @override
-  State<RatingBar> createState() => _RatingBarState();
-}
-
-class _RatingBarState extends State<RatingBar> {
-  late double _currentRating;
-
-  @override
-  void initState() {
-    super.initState();
-    _currentRating = widget.initialRating;
-  }
-
-  void _updateRating(Offset localPosition, bool isRTL, {bool isTap = false}) {
-    final totalWidth = widget.itemCount * widget.itemSize + (widget.itemCount - 1) * widget.starPadding;
-    double dx = localPosition.dx;
-
-    if (isRTL) dx = totalWidth - dx;
-
-    double newRating;
-
-    if (dx <= 0) {
-      newRating = 0;
-    } else if (dx >= totalWidth) {
-      newRating = widget.itemCount.toDouble();
-    } else {
-      double starWithPadding = widget.itemSize + widget.starPadding;
-      int tappedIndex = (dx / starWithPadding).floor().clamp(0, widget.itemCount - 1);
-      newRating = tappedIndex + 1.0;
-
-      if (isTap && newRating == _currentRating && _currentRating != 0) {
-        newRating = 0;
-      }
-    }
-
-    if (_currentRating != newRating) {
-      setState(() {
-        _currentRating = newRating;
-      });
-      widget.onRatingUpdate?.call(newRating.round());
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final isRTL = Directionality.of(context) == TextDirection.rtl;
-    final double visualAlignmentOffset = 5.0;
-
-    return Column(
-      mainAxisSize: MainAxisSize.min,
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        Transform.translate(
-          offset: Offset(isRTL ? visualAlignmentOffset : -visualAlignmentOffset, 0),
-          child: GestureDetector(
-            behavior: HitTestBehavior.opaque,
-            onTapDown: (details) => _updateRating(details.localPosition, isRTL, isTap: true),
-            onPanUpdate: (details) => _updateRating(details.localPosition, isRTL, isTap: false),
-            child: Row(
-              mainAxisSize: MainAxisSize.min,
-              textDirection: isRTL ? TextDirection.rtl : TextDirection.ltr,
-              children: List.generate(widget.itemCount * 2 - 1, (i) {
-                if (i.isOdd) {
-                  return SizedBox(width: widget.starPadding);
-                }
-                int index = i ~/ 2;
-                bool filled = _currentRating > index;
-                return widget.itemBuilder ??
-                    Icon(
-                      Icons.star_rounded,
-                      size: widget.itemSize,
-                      color: filled ? widget.filledColor : widget.unfilledColor,
-                    );
-              }),
-            ),
-          ),
-        ),
-        if (_currentRating > 0)
-          Padding(
-            padding: const EdgeInsets.only(top: 12.0),
-            child: GestureDetector(
-              onTap: () {
-                setState(() {
-                  _currentRating = 0;
-                });
-                widget.onClearRating?.call();
-              },
-              child: Text(
-                'rating_clear'.t(context: context),
-                style: TextStyle(color: context.themeData.colorScheme.primary),
-              ),
-            ),
-          ),
-      ],
-    );
-  }
-}

mobile/lib/presentation/widgets/bottom_sheet/map_bottom_sheet.widget.dart

@@ -14,7 +14,7 @@ class MapBottomSheet extends StatelessWidget {
   Widget build(BuildContext context) {
     return BaseBottomSheet(
       initialChildSize: 0.25,
-      maxChildSize: 0.75,
+      maxChildSize: 0.9,
       shouldCloseOnMinExtent: false,
       resizeOnScroll: false,
       actions: [],
@@ -38,13 +38,8 @@ class _ScopedMapTimeline extends StatelessWidget {
             throw Exception('User must be logged in to access archive');
           }
 
-          final users = ref.watch(mapStateProvider).withPartners
-              ? ref.watch(timelineUsersProvider).valueOrNull ?? [user.id]
-              : [user.id];
-
-          final timelineService = ref
-              .watch(timelineFactoryProvider)
-              .map(users, ref.watch(mapStateProvider).toOptions());
+          final bounds = ref.watch(mapStateProvider).bounds;
+          final timelineService = ref.watch(timelineFactoryProvider).map(user.id, bounds);
           ref.onDispose(timelineService.dispose);
           return timelineService;
         }),

mobile/lib/presentation/widgets/images/thumbnail_tile.widget.dart

@@ -6,7 +6,6 @@ import 'package:immich_mobile/domain/models/setting.model.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/duration_extensions.dart';
 import 'package:immich_mobile/extensions/theme_extensions.dart';
-import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_viewer.state.dart';
 import 'package:immich_mobile/presentation/widgets/images/thumbnail.widget.dart';
 import 'package:immich_mobile/presentation/widgets/timeline/constants.dart';
 import 'package:immich_mobile/providers/backup/asset_upload_progress.provider.dart';
@@ -48,7 +47,6 @@ class _ThumbnailTileState extends ConsumerState<ThumbnailTile> {
   Widget build(BuildContext context) {
     final asset = widget.asset;
     final heroIndex = widget.heroOffset ?? TabsRouterScope.of(context)?.controller.activeIndex ?? 0;
-    final isCurrentAsset = ref.watch(assetViewerProvider.select((current) => current.currentAsset == asset));
 
     final assetContainerColor = context.isDarkTheme
         ? context.primaryColor.darken(amount: 0.4)
@@ -61,10 +59,6 @@ class _ThumbnailTileState extends ConsumerState<ThumbnailTile> {
     final bool storageIndicator =
         ref.watch(settingsProvider.select((s) => s.get(Setting.showStorageIndicator))) && widget.showStorageIndicator;
 
-    if (!isCurrentAsset) {
-      _hideIndicators = false;
-    }
-
     if (isSelected) {
       _showSelectionContainer = true;
     }
@@ -102,11 +96,7 @@ class _ThumbnailTileState extends ConsumerState<ThumbnailTile> {
               children: [
                 Positioned.fill(
                   child: Hero(
-                    // This key resets the hero animation when the asset is changed in the asset viewer.
-                    // It doesn't seem like the best solution, and only works to reset the hero, not prime the hero of the new active asset for animation,
-                    // but other solutions have failed thus far.
-                    key: ValueKey(isCurrentAsset),
-                    tag: '${asset?.heroTag}_$heroIndex',
+                    tag: '${asset?.heroTag ?? ''}_$heroIndex',
                     child: Thumbnail.fromAsset(asset: asset, size: widget.size),
                     // Placeholderbuilder used to hide indicators on first hero animation, since flightShuttleBuilder isn't called until both source and destination hero exist in widget tree.
                     placeholderBuilder: (context, heroSize, child) {

mobile/lib/presentation/widgets/map/map.state.dart

@@ -1,30 +1,11 @@
-import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/domain/models/events.model.dart';
-import 'package:immich_mobile/domain/utils/event_stream.dart';
-import 'package:immich_mobile/infrastructure/repositories/timeline.repository.dart';
-import 'package:immich_mobile/providers/app_settings.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/map.provider.dart';
-import 'package:immich_mobile/providers/map/map_state.provider.dart';
-import 'package:immich_mobile/services/app_settings.service.dart';
 import 'package:maplibre_gl/maplibre_gl.dart';
 
 class MapState {
-  final ThemeMode themeMode;
   final LatLngBounds bounds;
-  final bool onlyFavorites;
-  final bool includeArchived;
-  final bool withPartners;
-  final int relativeDays;
 
-  const MapState({
-    this.themeMode = ThemeMode.system,
-    required this.bounds,
-    this.onlyFavorites = false,
-    this.includeArchived = false,
-    this.withPartners = false,
-    this.relativeDays = 0,
-  });
+  const MapState({required this.bounds});
 
   @override
   bool operator ==(covariant MapState other) {
@@ -34,31 +15,9 @@ class MapState {
   @override
   int get hashCode => bounds.hashCode;
 
-  MapState copyWith({
-    LatLngBounds? bounds,
-    ThemeMode? themeMode,
-    bool? onlyFavorites,
-    bool? includeArchived,
-    bool? withPartners,
-    int? relativeDays,
-  }) {
-    return MapState(
-      bounds: bounds ?? this.bounds,
-      themeMode: themeMode ?? this.themeMode,
-      onlyFavorites: onlyFavorites ?? this.onlyFavorites,
-      includeArchived: includeArchived ?? this.includeArchived,
-      withPartners: withPartners ?? this.withPartners,
-      relativeDays: relativeDays ?? this.relativeDays,
-    );
+  MapState copyWith({LatLngBounds? bounds}) {
+    return MapState(bounds: bounds ?? this.bounds);
   }
-
-  TimelineMapOptions toOptions() => TimelineMapOptions(
-    bounds: bounds,
-    onlyFavorites: onlyFavorites,
-    includeArchived: includeArchived,
-    withPartners: withPartners,
-    relativeDays: relativeDays,
-  );
 }
 
 class MapStateNotifier extends Notifier<MapState> {
@@ -72,50 +31,11 @@ class MapStateNotifier extends Notifier<MapState> {
     return true;
   }
 
-  void switchTheme(ThemeMode mode) {
-    // TODO: Remove this line when map theme provider is removed
-    // Until then, keep both in sync as MapThemeOverride uses map state provider
-    // ref.read(appSettingsServiceProvider).setSetting(AppSettingsEnum.mapThemeMode, mode.index);
-    ref.read(mapStateNotifierProvider.notifier).switchTheme(mode);
-    state = state.copyWith(themeMode: mode);
-  }
-
-  void switchFavoriteOnly(bool isFavoriteOnly) {
-    ref.read(appSettingsServiceProvider).setSetting(AppSettingsEnum.mapShowFavoriteOnly, isFavoriteOnly);
-    state = state.copyWith(onlyFavorites: isFavoriteOnly);
-    EventStream.shared.emit(const MapMarkerReloadEvent());
-  }
-
-  void switchIncludeArchived(bool isIncludeArchived) {
-    ref.read(appSettingsServiceProvider).setSetting(AppSettingsEnum.mapIncludeArchived, isIncludeArchived);
-    state = state.copyWith(includeArchived: isIncludeArchived);
-    EventStream.shared.emit(const MapMarkerReloadEvent());
-  }
-
-  void switchWithPartners(bool isWithPartners) {
-    ref.read(appSettingsServiceProvider).setSetting(AppSettingsEnum.mapwithPartners, isWithPartners);
-    state = state.copyWith(withPartners: isWithPartners);
-    EventStream.shared.emit(const MapMarkerReloadEvent());
-  }
-
-  void setRelativeTime(int relativeDays) {
-    ref.read(appSettingsServiceProvider).setSetting(AppSettingsEnum.mapRelativeDate, relativeDays);
-    state = state.copyWith(relativeDays: relativeDays);
-    EventStream.shared.emit(const MapMarkerReloadEvent());
-  }
-
   @override
-  MapState build() {
-    final appSettingsService = ref.read(appSettingsServiceProvider);
-    return MapState(
-      themeMode: ThemeMode.values[appSettingsService.getSetting(AppSettingsEnum.mapThemeMode)],
-      onlyFavorites: appSettingsService.getSetting(AppSettingsEnum.mapShowFavoriteOnly),
-      includeArchived: appSettingsService.getSetting(AppSettingsEnum.mapIncludeArchived),
-      withPartners: appSettingsService.getSetting(AppSettingsEnum.mapwithPartners),
-      relativeDays: appSettingsService.getSetting(AppSettingsEnum.mapRelativeDate),
-      bounds: LatLngBounds(northeast: const LatLng(0, 0), southwest: const LatLng(0, 0)),
-    );
-  }
+  MapState build() => MapState(
+    // TODO: set default bounds
+    bounds: LatLngBounds(northeast: const LatLng(0, 0), southwest: const LatLng(0, 0)),
+  );
 }
 
 // This provider watches the markers from the map service and serves the markers.

mobile/lib/presentation/widgets/map/map.widget.dart

@@ -6,8 +6,6 @@ import 'package:flutter/material.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:geolocator/geolocator.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/domain/models/events.model.dart';
-import 'package:immich_mobile/domain/utils/event_stream.dart';
 import 'package:immich_mobile/extensions/asyncvalue_extensions.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
@@ -53,19 +51,11 @@ class _DriftMapState extends ConsumerState<DriftMap> {
   final _reloadMutex = AsyncMutex();
   final _debouncer = Debouncer(interval: const Duration(milliseconds: 500), maxWaitTime: const Duration(seconds: 2));
   final ValueNotifier<double> bottomSheetOffset = ValueNotifier(0.25);
-  StreamSubscription? _eventSubscription;
-
-  @override
-  void initState() {
-    super.initState();
-    _eventSubscription = EventStream.shared.listen<MapMarkerReloadEvent>(_onEvent);
-  }
 
   @override
   void dispose() {
     _debouncer.dispose();
     bottomSheetOffset.dispose();
-    _eventSubscription?.cancel();
     super.dispose();
   }
 
@@ -73,8 +63,6 @@ class _DriftMapState extends ConsumerState<DriftMap> {
     mapController = controller;
   }
 
-  void _onEvent(_) => _debouncer.run(() => setBounds(forceReload: true));
-
   Future<void> onMapReady() async {
     final controller = mapController;
     if (controller == null) {
@@ -110,7 +98,7 @@ class _DriftMapState extends ConsumerState<DriftMap> {
       );
     }
 
-    _debouncer.run(() => setBounds(forceReload: true));
+    _debouncer.run(setBounds);
     controller.addListener(onMapMoved);
   }
 
@@ -122,7 +110,7 @@ class _DriftMapState extends ConsumerState<DriftMap> {
     _debouncer.run(setBounds);
   }
 
-  Future<void> setBounds({bool forceReload = false}) async {
+  Future<void> setBounds() async {
     final controller = mapController;
     if (controller == null || !mounted) {
       return;
@@ -139,7 +127,7 @@ class _DriftMapState extends ConsumerState<DriftMap> {
     final bounds = await controller.getVisibleRegion();
     unawaited(
       _reloadMutex.run(() async {
-        if (mounted && (ref.read(mapStateProvider.notifier).setBounds(bounds) || forceReload)) {
+        if (mounted && ref.read(mapStateProvider.notifier).setBounds(bounds)) {
           final markers = await ref.read(mapMarkerProvider(bounds).future);
           await reloadMarkers(markers);
         }
@@ -215,7 +203,7 @@ class _Map extends StatelessWidget {
           onMapCreated: onMapCreated,
           onStyleLoadedCallback: onMapReady,
           attributionButtonPosition: AttributionButtonPosition.topRight,
-          attributionButtonMargins: const Point(8, kToolbarHeight),
+          attributionButtonMargins: Platform.isIOS ? const Point(40, 12) : const Point(40, 72),
         ),
       ),
     );
@@ -256,7 +244,7 @@ class _DynamicMyLocationButton extends StatelessWidget {
       valueListenable: bottomSheetOffset,
       builder: (context, offset, child) {
         return Positioned(
-          right: 20,
+          right: 16,
           bottom: context.height * (offset - 0.02) + context.padding.bottom,
           child: AnimatedOpacity(
             opacity: offset < 0.8 ? 1 : 0,

mobile/lib/presentation/widgets/map/map_settings_sheet.dart

@@ -1,61 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/extensions/translate_extensions.dart';
-import 'package:immich_mobile/presentation/widgets/map/map.state.dart';
-import 'package:immich_mobile/widgets/map/map_settings/map_settings_list_tile.dart';
-import 'package:immich_mobile/widgets/map/map_settings/map_settings_time_dropdown.dart';
-import 'package:immich_mobile/widgets/map/map_settings/map_theme_picker.dart';
-
-class DriftMapSettingsSheet extends HookConsumerWidget {
-  const DriftMapSettingsSheet({super.key});
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final mapState = ref.watch(mapStateProvider);
-
-    return DraggableScrollableSheet(
-      expand: false,
-      initialChildSize: 0.6,
-      builder: (ctx, scrollController) => SingleChildScrollView(
-        controller: scrollController,
-        child: Card(
-          elevation: 0.0,
-          shadowColor: Colors.transparent,
-          color: Colors.transparent,
-          margin: EdgeInsets.zero,
-          child: Column(
-            mainAxisSize: MainAxisSize.max,
-            children: [
-              MapThemePicker(
-                themeMode: mapState.themeMode,
-                onThemeChange: (mode) => ref.read(mapStateProvider.notifier).switchTheme(mode),
-              ),
-              const Divider(height: 30, thickness: 1),
-              MapSettingsListTile(
-                title: "map_settings_only_show_favorites".t(context: context),
-                selected: mapState.onlyFavorites,
-                onChanged: (favoriteOnly) => ref.read(mapStateProvider.notifier).switchFavoriteOnly(favoriteOnly),
-              ),
-              MapSettingsListTile(
-                title: "map_settings_include_show_archived".t(context: context),
-                selected: mapState.includeArchived,
-                onChanged: (includeArchive) =>
-                    ref.read(mapStateProvider.notifier).switchIncludeArchived(includeArchive),
-              ),
-              MapSettingsListTile(
-                title: "map_settings_include_show_partners".t(context: context),
-                selected: mapState.withPartners,
-                onChanged: (withPartners) => ref.read(mapStateProvider.notifier).switchWithPartners(withPartners),
-              ),
-              MapTimeDropDown(
-                relativeTime: mapState.relativeDays,
-                onTimeChange: (time) => ref.read(mapStateProvider.notifier).setRelativeTime(time),
-              ),
-              const SizedBox(height: 20),
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-}

mobile/lib/providers/app_life_cycle.provider.dart

@@ -218,7 +218,14 @@ class AppLifeCycleNotifier extends StateNotifier<AppLifeCycleEnum> {
 
     try {
       if (Store.isBetaTimelineEnabled) {
-        unawaited(_ref.read(backgroundWorkerLockServiceProvider).unlock());
+        unawaited(
+          Future.wait([
+            _ref.read(backgroundWorkerLockServiceProvider).unlock(),
+            _ref.read(nativeSyncApiProvider).cancelHashing(),
+            _ref.read(backgroundSyncProvider).cancel(),
+            _ref.read(backgroundSyncProvider).cancelLocal(),
+          ]),
+        );
       }
       await _performPause();
     } catch (e, stackTrace) {

mobile/lib/providers/background_sync.provider.dart

@@ -21,7 +21,13 @@ final backgroundSyncProvider = Provider<BackgroundSyncManager>((ref) {
         backupProvider.updateError(isSuccess == true ? BackupError.none : BackupError.syncFailed);
       }
     },
-    onRemoteSyncError: syncStatusNotifier.errorRemoteSync,
+    onRemoteSyncError: (error) {
+      syncStatusNotifier.errorRemoteSync(error);
+      final backupProvider = ref.read(driftBackupProvider.notifier);
+      if (backupProvider.mounted) {
+        backupProvider.updateError(BackupError.syncFailed);
+      }
+    },
     onLocalSyncStart: syncStatusNotifier.startLocalSync,
     onLocalSyncComplete: syncStatusNotifier.completeLocalSync,
     onLocalSyncError: syncStatusNotifier.errorLocalSync,

mobile/lib/providers/infrastructure/action.provider.dart

@@ -359,22 +359,6 @@ class ActionNotifier extends Notifier<void> {
     }
   }
 
-  Future<ActionResult> updateRating(ActionSource source, int rating) async {
-    final ids = _getRemoteIdsForSource(source);
-    if (ids.length != 1) {
-      _logger.warning('updateRating called with multiple assets, expected single asset');
-      return ActionResult(count: ids.length, success: false, error: 'Expected single asset for rating update');
-    }
-
-    try {
-      final isUpdated = await _service.updateRating(ids.first, rating);
-      return ActionResult(count: 1, success: isUpdated);
-    } catch (error, stack) {
-      _logger.severe('Failed to update rating for asset', error, stack);
-      return ActionResult(count: 1, success: false, error: error.toString());
-    }
-  }
-
   Future<ActionResult> stack(String userId, ActionSource source) async {
     final ids = _getOwnedRemoteIdsForSource(source);
     try {

mobile/lib/providers/infrastructure/map.provider.dart

@@ -1,9 +1,7 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/domain/services/map.service.dart';
 import 'package:immich_mobile/infrastructure/repositories/map.repository.dart';
-import 'package:immich_mobile/presentation/widgets/map/map.state.dart';
 import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
-import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
+import 'package:immich_mobile/domain/services/map.service.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
 
 final mapRepositoryProvider = Provider<DriftMapRepository>((ref) => DriftMapRepository(ref.watch(driftProvider)));
@@ -15,11 +13,7 @@ final mapServiceProvider = Provider<MapService>(
       throw Exception('User must be logged in to access map');
     }
 
-    final users = ref.watch(mapStateProvider).withPartners
-        ? ref.watch(timelineUsersProvider).valueOrNull ?? [user.id]
-        : [user.id];
-
-    final mapService = ref.watch(mapFactoryProvider).remote(users, ref.watch(mapStateProvider).toOptions());
+    final mapService = ref.watch(mapFactoryProvider).remote(user.id);
     return mapService;
   },
   // Empty dependencies to inform the framework that this provider

mobile/lib/providers/infrastructure/user_metadata.provider.dart

@@ -1,22 +1,7 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/domain/models/user_metadata.model.dart';
 import 'package:immich_mobile/infrastructure/repositories/user_metadata.repository.dart';
 import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
-import 'package:immich_mobile/providers/user.provider.dart';
 
 final userMetadataRepository = Provider<DriftUserMetadataRepository>(
   (ref) => DriftUserMetadataRepository(ref.watch(driftProvider)),
 );
-
-final userMetadataProvider = FutureProvider<List<UserMetadata>>((ref) async {
-  final repository = ref.watch(userMetadataRepository);
-  final user = ref.watch(currentUserProvider);
-  if (user == null) return [];
-  return repository.getUserMetadata(user.id);
-});
-
-final userMetadataPreferencesProvider = FutureProvider<Preferences?>((ref) async {
-  final metadataList = await ref.watch(userMetadataProvider.future);
-  final metadataWithPrefs = metadataList.firstWhere((meta) => meta.preferences != null);
-  return metadataWithPrefs.preferences;
-});

mobile/lib/repositories/asset_api.repository.dart

@@ -101,10 +101,6 @@ class AssetApiRepository extends ApiRepository {
   Future<void> updateDescription(String assetId, String description) {
     return _api.updateAsset(assetId, UpdateAssetDto(description: description));
   }
-
-  Future<void> updateRating(String assetId, int rating) {
-    return _api.updateAsset(assetId, UpdateAssetDto(rating: rating));
-  }
 }
 
 extension on StackResponseDto {

mobile/lib/services/action.service.dart

@@ -214,14 +214,6 @@ class ActionService {
     return true;
   }
 
-  Future<bool> updateRating(String assetId, int rating) async {
-    // update remote first, then local to ensure consistency
-    await _assetApiRepository.updateRating(assetId, rating);
-    await _remoteAssetRepository.updateRating(assetId, rating);
-
-    return true;
-  }
-
   Future<void> stack(String userId, List<String> remoteIds) async {
     final stack = await _assetApiRepository.stack(remoteIds);
     await _remoteAssetRepository.stack(userId, stack);

mobile/lib/services/background_upload.service.dart

@@ -285,12 +285,7 @@ class BackgroundUploadService {
       return null;
     }
 
-    String fileName = await _assetMediaRepository.getOriginalFilename(asset.id) ?? asset.name;
-    final hasExtension = p.extension(fileName).isNotEmpty;
-    if (!hasExtension) {
-      fileName = p.setExtension(fileName, p.extension(asset.name));
-    }
-
+    final fileName = await _assetMediaRepository.getOriginalFilename(asset.id) ?? asset.name;
     final originalFileName = entity.isLivePhoto ? p.setExtension(fileName, p.extension(file.path)) : fileName;
 
     String metadata = UploadTaskMetadata(
@@ -312,10 +307,10 @@ class BackgroundUploadService {
       priority: priority,
       isFavorite: asset.isFavorite,
       requiresWiFi: requiresWiFi,
-      cloudId: entity.isLivePhoto ? null : asset.cloudId,
-      adjustmentTime: entity.isLivePhoto ? null : asset.adjustmentTime?.toIso8601String(),
-      latitude: entity.isLivePhoto ? null : asset.latitude?.toString(),
-      longitude: entity.isLivePhoto ? null : asset.longitude?.toString(),
+      cloudId: asset.cloudId,
+      adjustmentTime: asset.adjustmentTime?.toIso8601String(),
+      latitude: asset.latitude?.toString(),
+      longitude: asset.longitude?.toString(),
     );
   }
 

mobile/lib/services/foreground_upload.service.dart

@@ -16,7 +16,6 @@ import 'package:immich_mobile/platform/connectivity_api.g.dart';
 import 'package:immich_mobile/providers/app_settings.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/platform.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/storage.provider.dart';
-import 'package:immich_mobile/repositories/asset_media.repository.dart';
 import 'package:immich_mobile/repositories/upload.repository.dart';
 import 'package:immich_mobile/services/api.service.dart';
 import 'package:immich_mobile/services/app_settings.service.dart';
@@ -41,7 +40,6 @@ final foregroundUploadServiceProvider = Provider((ref) {
     ref.watch(backupRepositoryProvider),
     ref.watch(connectivityApiProvider),
     ref.watch(appSettingsServiceProvider),
-    ref.watch(assetMediaRepositoryProvider),
   );
 });
 
@@ -57,7 +55,6 @@ class ForegroundUploadService {
     this._backupRepository,
     this._connectivityApi,
     this._appSettingsService,
-    this._assetMediaRepository,
   );
 
   final UploadRepository _uploadRepository;
@@ -65,7 +62,6 @@ class ForegroundUploadService {
   final DriftBackupRepository _backupRepository;
   final ConnectivityApi _connectivityApi;
   final AppSettingsService _appSettingsService;
-  final AssetMediaRepository _assetMediaRepository;
   final Logger _logger = Logger('ForegroundUploadService');
 
   bool shouldAbortUpload = false;
@@ -315,17 +311,7 @@ class ForegroundUploadService {
         return;
       }
 
-      String fileName = await _assetMediaRepository.getOriginalFilename(asset.id) ?? asset.name;
-
-      /// Handle special file name from DJI or Fusion app
-      /// If the file name has no extension, likely due to special renaming template by specific apps
-      /// we append the original extension from the asset name
-      final hasExtension = p.extension(fileName).isNotEmpty;
-      if (!hasExtension) {
-        fileName = p.setExtension(fileName, p.extension(asset.name));
-      }
-
-      final originalFileName = entity.isLivePhoto ? p.setExtension(fileName, p.extension(file.path)) : fileName;
+      final originalFileName = entity.isLivePhoto ? p.setExtension(asset.name, p.extension(file.path)) : asset.name;
       final deviceId = Store.get(StoreKey.deviceId);
 
       final headers = ApiService.getRequestHeaders();
@@ -336,6 +322,19 @@ class ForegroundUploadService {
         'fileModifiedAt': asset.updatedAt.toUtc().toIso8601String(),
         'isFavorite': asset.isFavorite.toString(),
         'duration': asset.duration.toString(),
+        if (CurrentPlatform.isIOS && asset.cloudId != null)
+          'metadata': jsonEncode([
+            RemoteAssetMetadataItem(
+              key: RemoteAssetMetadataKey.mobileApp,
+              value: RemoteAssetMobileAppMetadata(
+                cloudId: asset.cloudId,
+                createdAt: asset.createdAt.toIso8601String(),
+                adjustmentTime: asset.adjustmentTime?.toIso8601String(),
+                latitude: asset.latitude?.toString(),
+                longitude: asset.longitude?.toString(),
+              ),
+            ),
+          ]),
       };
 
       // Upload live photo video first if available
@@ -364,22 +363,6 @@ class ForegroundUploadService {
         fields['livePhotoVideoId'] = livePhotoVideoId;
       }
 
-      // Add cloudId metadata only to the still image, not the motion video, becasue when the sync id happens, the motion video can get associated with the wrong still image.
-      if (CurrentPlatform.isIOS && asset.cloudId != null) {
-        fields['metadata'] = jsonEncode([
-          RemoteAssetMetadataItem(
-            key: RemoteAssetMetadataKey.mobileApp,
-            value: RemoteAssetMobileAppMetadata(
-              cloudId: asset.cloudId,
-              createdAt: asset.createdAt.toIso8601String(),
-              adjustmentTime: asset.adjustmentTime?.toIso8601String(),
-              latitude: asset.latitude?.toString(),
-              longitude: asset.longitude?.toString(),
-            ),
-          ),
-        ]);
-      }
-
       final result = await _uploadRepository.uploadFile(
         file: file,
         originalFileName: originalFileName,

mobile/lib/utils/isolate.dart

@@ -1,95 +1,307 @@
 import 'dart:async';
+import 'dart:isolate';
 import 'dart:ui';
 
 import 'package:flutter/services.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/services/log.service.dart';
 import 'package:immich_mobile/entities/store.entity.dart';
+import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/logger_db.repository.dart';
 import 'package:immich_mobile/providers/db.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/cancel.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
 import 'package:immich_mobile/utils/bootstrap.dart';
 import 'package:immich_mobile/utils/debug_print.dart';
 import 'package:immich_mobile/utils/http_ssl_options.dart';
-import 'package:immich_mobile/wm_executor.dart';
+import 'package:isar/isar.dart';
 import 'package:logging/logging.dart';
-import 'package:worker_manager/worker_manager.dart';
 
-class InvalidIsolateUsageException implements Exception {
-  const InvalidIsolateUsageException();
+class CancellableTask<T> {
+  final Future<T?> future;
+  final void Function() cancel;
 
-  @override
-  String toString() => "IsolateHelper should only be used from the root isolate";
-}
+  const CancellableTask({required this.future, required this.cancel});
 
-// !! Should be used only from the root isolate
-Cancelable<T?> runInIsolateGentle<T>({
-  required Future<T> Function(ProviderContainer ref) computation,
-  String? debugLabel,
-}) {
-  final token = RootIsolateToken.instance;
-  if (token == null) {
-    throw const InvalidIsolateUsageException();
+  CancellableTask<T> whenComplete(void Function() action) {
+    return CancellableTask(future: future.whenComplete(action), cancel: cancel);
   }
 
-  return workerManagerPatch.executeGentle((cancelledChecker) async {
-    T? result;
-    await runZonedGuarded(
-      () async {
-        BackgroundIsolateBinaryMessenger.ensureInitialized(token);
-        DartPluginRegistrant.ensureInitialized();
+  CancellableTask<T> catchError(Function onError) {
+    return CancellableTask(future: future.catchError(onError), cancel: cancel);
+  }
 
-        final (isar, drift, logDb) = await Bootstrap.initDB();
-        await Bootstrap.initDomain(isar, drift, logDb, shouldBufferLogs: false, listenStoreUpdates: false);
-        final ref = ProviderContainer(
+  CancellableTask<R> then<R>(FutureOr<R> Function(T?) onValue) {
+    return CancellableTask(future: future.then(onValue), cancel: cancel);
+  }
+}
+
+sealed class _IsolateMessage {
+  const _IsolateMessage();
+}
+
+class _InitMessage extends _IsolateMessage {
+  final SendPort sendPort;
+  const _InitMessage(this.sendPort);
+}
+
+class _CancelMessage extends _IsolateMessage {
+  const _CancelMessage();
+}
+
+class _ResultMessage extends _IsolateMessage {
+  final dynamic data;
+  const _ResultMessage(this.data);
+}
+
+class _ErrorMessage extends _IsolateMessage {
+  final Object? error;
+  final StackTrace? stackTrace;
+  const _ErrorMessage(this.error, [this.stackTrace]);
+}
+
+class _DoneMessage extends _IsolateMessage {
+  const _DoneMessage();
+}
+
+class _IsolateTaskConfig<T> {
+  final Future<T> Function(ProviderContainer ref) computation;
+  final SendPort mainSendPort;
+  final RootIsolateToken rootToken;
+  final String debugLabel;
+
+  const _IsolateTaskConfig({
+    required this.computation,
+    required this.mainSendPort,
+    required this.rootToken,
+    required this.debugLabel,
+  });
+}
+
+class _IsolateTaskRunner<T> {
+  final Completer<T?> _completer = Completer<T?>();
+  final ReceivePort _receivePort = ReceivePort();
+  final String debugLabel;
+
+  Isolate? _isolate;
+  SendPort? _isolateSendPort;
+  bool _isCancelled = false;
+  bool _isCleanedUp = false;
+  Timer? _cleanupTimeoutTimer;
+
+  _IsolateTaskRunner({required this.debugLabel});
+
+  Future<void> start(Future<T> Function(ProviderContainer ref) computation) async {
+    final token = RootIsolateToken.instance;
+    if (token == null) {
+      _completer.completeError(Exception("RootIsolateToken is not available. Isolate cannot be started."));
+      return;
+    }
+
+    _receivePort.listen(_handleMessage);
+
+    final config = _IsolateTaskConfig<T>(
+      computation: computation,
+      mainSendPort: _receivePort.sendPort,
+      rootToken: token,
+      debugLabel: debugLabel,
+    );
+
+    try {
+      _isolate = await Isolate.spawn(_isolateEntryPoint<T>, config, debugName: debugLabel);
+    } catch (error, stack) {
+      _completer.completeError(error, stack);
+      _cleanup();
+    }
+  }
+
+  void cancel() {
+    if (_isCancelled || _isCleanedUp) return;
+
+    _isCancelled = true;
+    dPrint(() => "[$debugLabel] Cancellation requested");
+
+    _isolateSendPort?.send(const _CancelMessage());
+    _cleanupTimeoutTimer = Timer(const Duration(seconds: 4), () {
+      if (!_isCleanedUp) {
+        dPrint(() => "[$debugLabel] Cleanup timeout - force killing isolate");
+        _isolate?.kill(priority: Isolate.immediate);
+        if (!_completer.isCompleted) {
+          _completer.completeError(Exception("Isolate cleanup timed out for task: $debugLabel"));
+        }
+        _cleanup();
+      }
+    });
+  }
+
+  void _handleMessage(dynamic message) {
+    if (message is! _IsolateMessage) return;
+
+    switch (message) {
+      case _InitMessage(:var sendPort):
+        _isolateSendPort = sendPort;
+        dPrint(() => "[$debugLabel] Isolate initialized");
+        break;
+
+      case _ResultMessage(:var data):
+        _cleanup();
+        if (!_completer.isCompleted) {
+          _completer.complete(data as T?);
+          dPrint(() => "[$debugLabel] Isolate task completed with result - $data");
+        }
+        break;
+
+      case _ErrorMessage(:var error, :var stackTrace):
+        _cleanup();
+        if (!_completer.isCompleted) {
+          dPrint(() => "[$debugLabel] Isolate task completed with error - $error");
+          _completer.completeError(error ?? Exception("Unknown error in isolate"), stackTrace ?? StackTrace.current);
+        }
+        break;
+
+      case _DoneMessage():
+        dPrint(() => "[$debugLabel] Isolate cleanup completed");
+        _cleanup();
+        break;
+
+      case _CancelMessage():
+        // Not expected to receive cancel from isolate
+        break;
+    }
+  }
+
+  void _cleanup() {
+    if (_isCleanedUp) return;
+    _isCleanedUp = true;
+
+    _cleanupTimeoutTimer?.cancel();
+    _receivePort.close();
+    _isolate?.kill(priority: Isolate.immediate);
+    _isolate = null;
+    _isolateSendPort = null;
+
+    dPrint(() => "[$debugLabel] Isolate cleaned up");
+  }
+
+  Future<T?> get future => _completer.future;
+}
+
+Future<void> _cleanupResources<T>(ProviderContainer? ref, Isar isar, Drift drift, DriftLogger logDb) async {
+  try {
+    final cleanupFutures = <Future>[
+      Store.dispose(),
+      LogService.I.dispose(),
+      logDb.close(),
+      drift.close(),
+      if (isar.isOpen) isar.close().catchError((_) => false),
+    ];
+
+    ref?.dispose();
+
+    await Future.wait(cleanupFutures).timeout(
+      const Duration(seconds: 2),
+      onTimeout: () {
+        dPrint(() => "Cleanup timeout - some resources may not be closed");
+        return [];
+      },
+    );
+  } catch (error, stack) {
+    dPrint(() => "Error during isolate cleanup: $error with stack: $stack");
+  }
+}
+
+Future<void> _isolateEntryPoint<T>(_IsolateTaskConfig<T> config) async {
+  final receivePort = ReceivePort();
+  config.mainSendPort.send(_InitMessage(receivePort.sendPort));
+
+  bool isCancelled = false;
+  ProviderContainer? ref;
+  final Isar isar;
+  final Drift drift;
+  final DriftLogger logDb;
+
+  try {
+    BackgroundIsolateBinaryMessenger.ensureInitialized(config.rootToken);
+    DartPluginRegistrant.ensureInitialized();
+    final (bootIsar, bootDrift, bootLogDb) = await Bootstrap.initDB();
+    await Bootstrap.initDomain(bootIsar, bootDrift, bootLogDb, shouldBufferLogs: false, listenStoreUpdates: false);
+    isar = bootIsar;
+    drift = bootDrift;
+    logDb = bootLogDb;
+  } catch (error, stack) {
+    dPrint(() => "[$config.debugLabel] Error during isolate bootstrap: $error");
+    config.mainSendPort.send(_ErrorMessage(error, stack));
+    return;
+  }
+
+  final subscription = receivePort.listen((message) async {
+    if (message is _CancelMessage) {
+      isCancelled = true;
+      try {
+        receivePort.close();
+        await _cleanupResources(ref, isar, drift, logDb);
+      } catch (error, stack) {
+        dPrint(() => "Error during isolate cancellation cleanup: $error with stack: $stack");
+      } finally {
+        config.mainSendPort.send(const _ErrorMessage("Isolate task cancelled"));
+      }
+    }
+  });
+
+  final log = Logger("IsolateWorker[${config.debugLabel}]");
+  await runZonedGuarded(
+    () async {
+      try {
+        ref = ProviderContainer(
           overrides: [
-            // TODO: Remove once isar is removed
             dbProvider.overrideWithValue(isar),
             isarProvider.overrideWithValue(isar),
-            cancellationProvider.overrideWithValue(cancelledChecker),
+            cancellationProvider.overrideWithValue(() => isCancelled),
             driftProvider.overrideWith(driftOverride(drift)),
           ],
         );
 
-        Logger log = Logger("IsolateLogger");
+        HttpSSLOptions.apply(applyNative: false);
+        final result = await config.computation(ref!);
 
-        try {
-          HttpSSLOptions.apply(applyNative: false);
-          result = await computation(ref);
-        } on CanceledError {
-          log.warning("Computation cancelled ${debugLabel == null ? '' : ' for $debugLabel'}");
-        } catch (error, stack) {
-          log.severe("Error in runInIsolateGentle ${debugLabel == null ? '' : ' for $debugLabel'}", error, stack);
-        } finally {
-          try {
-            ref.dispose();
-
-            await Store.dispose();
-            await LogService.I.dispose();
-            await logDb.close();
-            await drift.close();
-
-            // Close Isar safely
-            try {
-              if (isar.isOpen) {
-                await isar.close();
-              }
-            } catch (e) {
-              dPrint(() => "Error closing Isar: $e");
-            }
-          } catch (error, stack) {
-            dPrint(() => "Error closing resources in isolate: $error, $stack");
-          } finally {
-            ref.dispose();
-            // Delay to ensure all resources are released
-            await Future.delayed(const Duration(seconds: 2));
-          }
+        if (!isCancelled) {
+          config.mainSendPort.send(_ResultMessage(result));
+        } else {
+          log.fine("Task completed but was cancelled - not sending result");
         }
-      },
-      (error, stack) {
-        dPrint(() => "Error in isolate $debugLabel zone: $error, $stack");
-      },
-    );
-    return result;
-  });
+      } catch (error, stack) {
+        log.severe("Error in isolate execution", error, stack);
+        config.mainSendPort.send(_ErrorMessage(error, stack));
+      } finally {
+        try {
+          receivePort.close();
+          unawaited(subscription.cancel());
+          await _cleanupResources(ref, isar, drift, logDb);
+        } catch (error, stack) {
+          dPrint(() => "Error during isolate cleanup: $error with stack: $stack");
+        } finally {
+          unawaited(subscription.cancel());
+          config.mainSendPort.send(const _DoneMessage());
+        }
+      }
+    },
+    (error, stack) async {
+      dPrint(() => "Uncaught error in isolate zone: $error, $stack");
+      receivePort.close();
+      unawaited(subscription.cancel());
+      await _cleanupResources(ref, isar, drift, logDb);
+      config.mainSendPort.send(_ErrorMessage(error, stack));
+    },
+  );
+}
+
+CancellableTask<T> runInIsolateGentle<T>({
+  required Future<T> Function(ProviderContainer ref) computation,
+  String? debugLabel,
+}) {
+  final runner = _IsolateTaskRunner<T>(
+    debugLabel: debugLabel ?? 'isolate-task-${DateTime.now().millisecondsSinceEpoch}',
+  )..start(computation);
+
+  return CancellableTask<T>(future: runner.future, cancel: runner.cancel);
 }

mobile/lib/widgets/map/map_settings/map_settings_list_tile.dart

@@ -1,3 +1,4 @@
+import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
@@ -13,7 +14,7 @@ class MapSettingsListTile extends StatelessWidget {
   Widget build(BuildContext context) {
     return SwitchListTile.adaptive(
       activeThumbColor: context.primaryColor,
-      title: Text(title, style: context.textTheme.bodyLarge!.copyWith(fontWeight: FontWeight.w500, height: 1.5)),
+      title: Text(title, style: context.textTheme.labelLarge?.copyWith(fontWeight: FontWeight.bold)).tr(),
       value: selected,
       onChanged: onChanged,
     );

mobile/lib/widgets/map/map_settings/map_settings_time_dropdown.dart

@@ -1,7 +1,5 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
-import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/extensions/translate_extensions.dart';
 
 class MapTimeDropDown extends StatelessWidget {
   final int relativeTime;
@@ -13,47 +11,41 @@ class MapTimeDropDown extends StatelessWidget {
   Widget build(BuildContext context) {
     final now = DateTime.now();
 
-    return Padding(
-      padding: const EdgeInsets.only(left: 16, right: 28.0),
-      child: Row(
-        crossAxisAlignment: CrossAxisAlignment.center,
-        mainAxisAlignment: MainAxisAlignment.spaceBetween,
-        children: [
-          Text(
-            "date_range".t(context: context),
-            style: context.textTheme.bodyLarge!.copyWith(fontWeight: FontWeight.w500, height: 1.5),
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.center,
+      children: [
+        Padding(
+          padding: const EdgeInsets.only(bottom: 20),
+          child: Text("date_range".tr(), style: const TextStyle(fontWeight: FontWeight.bold)),
+        ),
+        LayoutBuilder(
+          builder: (_, constraints) => DropdownMenu(
+            width: constraints.maxWidth * 0.9,
+            enableSearch: false,
+            enableFilter: false,
+            initialSelection: relativeTime,
+            onSelected: (value) => onTimeChange(value!),
+            dropdownMenuEntries: [
+              DropdownMenuEntry(value: 0, label: "all".tr()),
+              DropdownMenuEntry(value: 1, label: "map_settings_date_range_option_day".tr()),
+              DropdownMenuEntry(value: 7, label: "map_settings_date_range_option_days".tr(namedArgs: {'days': "7"})),
+              DropdownMenuEntry(value: 30, label: "map_settings_date_range_option_days".tr(namedArgs: {'days': "30"})),
+              DropdownMenuEntry(
+                value: now
+                    .difference(DateTime(now.year - 1, now.month, now.day, now.hour, now.minute, now.second))
+                    .inDays,
+                label: "map_settings_date_range_option_year".tr(),
+              ),
+              DropdownMenuEntry(
+                value: now
+                    .difference(DateTime(now.year - 3, now.month, now.day, now.hour, now.minute, now.second))
+                    .inDays,
+                label: "map_settings_date_range_option_years".tr(namedArgs: {'years': "3"}),
+              ),
+            ],
           ),
-          Flexible(
-            child: DropdownMenu(
-              enableSearch: false,
-              enableFilter: false,
-              initialSelection: relativeTime,
-              onSelected: (value) => onTimeChange(value!),
-              dropdownMenuEntries: [
-                DropdownMenuEntry(value: 0, label: "all".t(context: context)),
-                DropdownMenuEntry(value: 1, label: "map_settings_date_range_option_day".t(context: context)),
-                DropdownMenuEntry(value: 7, label: "map_settings_date_range_option_days".tr(namedArgs: {'days': "7"})),
-                DropdownMenuEntry(
-                  value: 30,
-                  label: "map_settings_date_range_option_days".tr(namedArgs: {'days': "30"}),
-                ),
-                DropdownMenuEntry(
-                  value: now
-                      .difference(DateTime(now.year - 1, now.month, now.day, now.hour, now.minute, now.second))
-                      .inDays,
-                  label: "map_settings_date_range_option_year".t(context: context),
-                ),
-                DropdownMenuEntry(
-                  value: now
-                      .difference(DateTime(now.year - 3, now.month, now.day, now.hour, now.minute, now.second))
-                      .inDays,
-                  label: "map_settings_date_range_option_years".t(args: {'years': "3"}),
-                ),
-              ],
-            ),
-          ),
-        ],
-      ),
+        ),
+      ],
     );
   }
 }

mobile/lib/widgets/map/map_settings/map_theme_picker.dart

@@ -1,6 +1,6 @@
+import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/widgets/map/map_thumbnail.dart';
 import 'package:maplibre_gl/maplibre_gl.dart';
 
@@ -18,9 +18,9 @@ class MapThemePicker extends StatelessWidget {
           padding: const EdgeInsets.only(bottom: 20),
           child: Center(
             child: Text(
-              "map_settings_theme_settings".t(context: context),
-              style: context.textTheme.bodyLarge!.copyWith(fontWeight: FontWeight.w500, height: 1.5),
-            ),
+              "map_settings_theme_settings",
+              style: context.textTheme.bodyMedium?.copyWith(fontWeight: FontWeight.bold),
+            ).tr(),
           ),
         ),
         Row(

mobile/lib/widgets/photo_view/src/controller/photo_view_controller.dart

@@ -2,7 +2,6 @@ import 'dart:async';
 
 import 'package:flutter/widgets.dart';
 import 'package:immich_mobile/widgets/photo_view/src/utils/ignorable_change_notifier.dart';
-import 'package:immich_mobile/widgets/photo_view/src/utils/photo_view_utils.dart';
 
 /// The interface in which controllers will be implemented.
 ///
@@ -63,9 +62,6 @@ abstract class PhotoViewControllerBase<T extends PhotoViewControllerValue> {
   /// The scale factor to transform the child (image or a customChild).
   late double? scale;
 
-  double? get initialScale;
-  ScaleBoundaries? scaleBoundaries;
-
   /// Nevermind this method :D, look away
   void setScaleInvisibly(double? scale);
 
@@ -145,9 +141,6 @@ class PhotoViewController implements PhotoViewControllerBase<PhotoViewController
 
   late StreamController<PhotoViewControllerValue> _outputCtrl;
 
-  @override
-  ScaleBoundaries? scaleBoundaries;
-
   late void Function(Offset)? _animatePosition;
   late void Function(double)? _animateScale;
   late void Function(double)? _animateRotation;
@@ -318,7 +311,4 @@ class PhotoViewController implements PhotoViewControllerBase<PhotoViewController
     }
     _valueNotifier.value = newValue;
   }
-
-  @override
-  double? get initialScale => scaleBoundaries?.initialScale ?? initial.scale;
 }

mobile/lib/widgets/photo_view/src/photo_view_wrappers.dart

@@ -108,17 +108,6 @@ class _ImageWrapperState extends State<ImageWrapper> {
     }
   }
 
-  // Should be called only when _imageSize is not null
-  ScaleBoundaries get scaleBoundaries {
-    return ScaleBoundaries(
-      widget.minScale ?? 0.0,
-      widget.maxScale ?? double.infinity,
-      widget.initialScale ?? PhotoViewComputedScale.contained,
-      widget.outerSize,
-      _imageSize!,
-    );
-  }
-
   // retrieve image from the provider
   void _resolveImage() {
     final ImageStream newStream = widget.imageProvider.resolve(const ImageConfiguration());
@@ -144,7 +133,6 @@ class _ImageWrapperState extends State<ImageWrapper> {
         _lastStack = null;
 
         _didLoadSynchronously = synchronousCall;
-        widget.controller.scaleBoundaries = scaleBoundaries;
       }
 
       synchronousCall && !_didLoadSynchronously ? setupCB() : setState(setupCB);
@@ -216,6 +204,14 @@ class _ImageWrapperState extends State<ImageWrapper> {
       );
     }
 
+    final scaleBoundaries = ScaleBoundaries(
+      widget.minScale ?? 0.0,
+      widget.maxScale ?? double.infinity,
+      widget.initialScale ?? PhotoViewComputedScale.contained,
+      widget.outerSize,
+      _imageSize!,
+    );
+
     return PhotoViewCore(
       imageProvider: widget.imageProvider,
       backgroundDecoration: widget.backgroundDecoration,

mobile/lib/widgets/search/explore_grid.dart

@@ -55,7 +55,6 @@ class ExploreGrid extends StatelessWidget {
                         camera: SearchCameraFilter(),
                         date: SearchDateFilter(),
                         display: SearchDisplayFilters(isNotInAlbum: false, isArchive: false, isFavorite: false),
-                        rating: SearchRatingFilter(),
                         mediaType: AssetType.other,
                       ),
                     ),

mobile/lib/widgets/search/search_filter/star_rating_picker.dart

@@ -1,35 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_hooks/flutter_hooks.dart';
-import 'package:immich_mobile/extensions/translate_extensions.dart';
-import 'package:immich_mobile/models/search/search_filter.model.dart';
-
-class StarRatingPicker extends HookWidget {
-  const StarRatingPicker({super.key, required this.onSelect, this.filter});
-  final Function(SearchRatingFilter) onSelect;
-  final SearchRatingFilter? filter;
-
-  @override
-  Widget build(BuildContext context) {
-    final selectedRating = useState(filter);
-
-    return RadioGroup(
-      groupValue: selectedRating.value?.rating,
-      onChanged: (int? newValue) {
-        if (newValue == null) return;
-        final newFilter = SearchRatingFilter(rating: newValue);
-        selectedRating.value = newFilter;
-        onSelect(newFilter);
-      },
-      child: Column(
-        children: List.generate(
-          6,
-          (index) => RadioListTile<int>(
-            key: Key("star_$index"),
-            title: Text('rating_count'.t(args: {'count': (index)})),
-            value: index,
-          ),
-        ),
-      ),
-    );
-  }
-}

mobile/lib/wm_executor.dart

@@ -1,251 +0,0 @@
-// part of 'package:worker_manager/worker_manager.dart';
-// ignore_for_file: implementation_imports, avoid_print
-
-import 'dart:async';
-import 'dart:math';
-
-import 'package:collection/collection.dart';
-import 'package:flutter/foundation.dart';
-import 'package:worker_manager/src/number_of_processors/processors_io.dart';
-import 'package:worker_manager/src/worker/worker.dart';
-import 'package:worker_manager/worker_manager.dart';
-
-final workerManagerPatch = _Executor();
-
-// [-2^54; 2^53] is compatible with dart2js, see core.int doc
-const _minId = -9007199254740992;
-const _maxId = 9007199254740992;
-
-class Mixinable<T> {
-  late final itSelf = this as T;
-}
-
-mixin _ExecutorLogger on Mixinable<_Executor> {
-  var log = false;
-
-  @mustCallSuper
-  void init() {
-    logMessage("${itSelf._isolatesCount} workers have been spawned and initialized");
-  }
-
-  void logTaskAdded<R>(String uid) {
-    logMessage("added task with number $uid");
-  }
-
-  @mustCallSuper
-  void dispose() {
-    logMessage("worker_manager have been disposed");
-  }
-
-  @mustCallSuper
-  void _cancel(Task task) {
-    logMessage("Task ${task.id} have been canceled");
-  }
-
-  void logMessage(String message) {
-    if (log) print(message);
-  }
-}
-
-class _Executor extends Mixinable<_Executor> with _ExecutorLogger {
-  final _queue = PriorityQueue<Task>();
-  final _pool = <Worker>[];
-  var _nextTaskId = _minId;
-  var _dynamicSpawning = false;
-  var _isolatesCount = numberOfProcessors;
-
-  @override
-  Future<void> init({int? isolatesCount, bool? dynamicSpawning}) async {
-    if (_pool.isNotEmpty) {
-      print("worker_manager already warmed up, init is ignored. Dispose before init");
-      return;
-    }
-    if (isolatesCount != null) {
-      if (isolatesCount < 0) {
-        throw Exception("isolatesCount must be greater than 0");
-      }
-
-      _isolatesCount = isolatesCount;
-    }
-    _dynamicSpawning = dynamicSpawning ?? false;
-    await _ensureWorkersInitialized();
-    super.init();
-  }
-
-  @override
-  Future<void> dispose() async {
-    _queue.clear();
-    for (final worker in _pool) {
-      worker.kill();
-    }
-    _pool.clear();
-    super.dispose();
-  }
-
-  Cancelable<R> execute<R>(Execute<R> execution, {WorkPriority priority = WorkPriority.immediately}) {
-    return _createCancelable<R>(execution: execution, priority: priority);
-  }
-
-  Cancelable<R> executeNow<R>(ExecuteGentle<R> execution) {
-    final task = TaskGentle<R>(
-      id: "",
-      workPriority: WorkPriority.immediately,
-      execution: execution,
-      completer: Completer<R>(),
-    );
-
-    Future<void> run() async {
-      try {
-        final result = await execution(() => task.canceled);
-        task.complete(result, null, null);
-      } catch (error, st) {
-        task.complete(null, error, st);
-      }
-    }
-
-    run();
-    return Cancelable(completer: task.completer, onCancel: () => _cancel(task));
-  }
-
-  Cancelable<R> executeWithPort<R, T>(
-    ExecuteWithPort<R> execution, {
-    WorkPriority priority = WorkPriority.immediately,
-    required void Function(T value) onMessage,
-  }) {
-    return _createCancelable<R>(
-      execution: execution,
-      priority: priority,
-      onMessage: (message) => onMessage(message as T),
-    );
-  }
-
-  Cancelable<R> executeGentle<R>(ExecuteGentle<R> execution, {WorkPriority priority = WorkPriority.immediately}) {
-    return _createCancelable<R>(execution: execution, priority: priority);
-  }
-
-  Cancelable<R> executeGentleWithPort<R, T>(
-    ExecuteGentleWithPort<R> execution, {
-    WorkPriority priority = WorkPriority.immediately,
-    required void Function(T value) onMessage,
-  }) {
-    return _createCancelable<R>(
-      execution: execution,
-      priority: priority,
-      onMessage: (message) => onMessage(message as T),
-    );
-  }
-
-  void _createWorkers() {
-    for (var i = 0; i < _isolatesCount; i++) {
-      _pool.add(Worker());
-    }
-  }
-
-  Future<void> _initializeWorkers() async {
-    await Future.wait(_pool.map((e) => e.initialize()));
-  }
-
-  Cancelable<R> _createCancelable<R>({
-    required Function execution,
-    WorkPriority priority = WorkPriority.immediately,
-    void Function(Object value)? onMessage,
-  }) {
-    if (_nextTaskId + 1 == _maxId) {
-      _nextTaskId = _minId;
-    }
-    final id = _nextTaskId.toString();
-    _nextTaskId++;
-    late final Task<R> task;
-    final completer = Completer<R>();
-    if (execution is Execute<R>) {
-      task = TaskRegular<R>(id: id, workPriority: priority, execution: execution, completer: completer);
-    } else if (execution is ExecuteWithPort<R>) {
-      task = TaskWithPort<R>(
-        id: id,
-        workPriority: priority,
-        execution: execution,
-        completer: completer,
-        onMessage: onMessage!,
-      );
-    } else if (execution is ExecuteGentle<R>) {
-      task = TaskGentle<R>(id: id, workPriority: priority, execution: execution, completer: completer);
-    } else if (execution is ExecuteGentleWithPort<R>) {
-      task = TaskGentleWithPort<R>(
-        id: id,
-        workPriority: priority,
-        execution: execution,
-        completer: completer,
-        onMessage: onMessage!,
-      );
-    }
-    _queue.add(task);
-    _schedule();
-    logTaskAdded(task.id);
-    return Cancelable(completer: task.completer, onCancel: () => _cancel(task));
-  }
-
-  Future<void> _ensureWorkersInitialized() async {
-    if (_pool.isEmpty) {
-      _createWorkers();
-      if (!_dynamicSpawning) {
-        await _initializeWorkers();
-        final poolSize = _pool.length;
-        final queueSize = _queue.length;
-        for (int i = 0; i <= min(poolSize, queueSize); i++) {
-          _schedule();
-        }
-      }
-    }
-    if (_pool.every((worker) => worker.taskId != null)) {
-      return;
-    }
-    if (_dynamicSpawning) {
-      final freeWorker = _pool.firstWhereOrNull(
-        (worker) => worker.taskId == null && !worker.initialized && !worker.initializing,
-      );
-      await freeWorker?.initialize();
-      _schedule();
-    }
-  }
-
-  void _schedule() {
-    final availableWorker = _pool.firstWhereOrNull((worker) => worker.taskId == null && worker.initialized);
-    if (availableWorker == null) {
-      _ensureWorkersInitialized();
-      return;
-    }
-    if (_queue.isEmpty) return;
-    final task = _queue.removeFirst();
-
-    availableWorker
-        .work(task)
-        .then(
-          (value) {
-            //could be completed already by cancel and it is normal.
-            //Assuming that worker finished with error and cleaned gracefully
-            task.complete(value, null, null);
-          },
-          onError: (error, st) {
-            task.complete(null, error, st);
-          },
-        )
-        .whenComplete(() {
-          if (_dynamicSpawning && _queue.isEmpty) availableWorker.kill();
-          _schedule();
-        });
-  }
-
-  @override
-  void _cancel(Task task) {
-    task.cancel();
-    _queue.remove(task);
-    final targetWorker = _pool.firstWhereOrNull((worker) => worker.taskId == task.id);
-    if (task is Gentle) {
-      targetWorker?.cancelGentle();
-    } else {
-      targetWorker?.kill();
-      if (!_dynamicSpawning) targetWorker?.initialize();
-    }
-    super._cancel(task);
-  }
-}

mobile/openapi/lib/api/assets_api.dart

@@ -1691,7 +1691,7 @@ class AssetsApi {
 
   /// View asset thumbnail
   ///
-  /// Retrieve the thumbnail image for the specified asset. Viewing the fullsize thumbnail might redirect to downloadAsset, which requires a different permission.
+  /// Retrieve the thumbnail image for the specified asset.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -1747,7 +1747,7 @@ class AssetsApi {
 
   /// View asset thumbnail
   ///
-  /// Retrieve the thumbnail image for the specified asset. Viewing the fullsize thumbnail might redirect to downloadAsset, which requires a different permission.
+  /// Retrieve the thumbnail image for the specified asset.
   ///
   /// Parameters:
   ///

mobile/openapi/lib/model/asset_media_size.dart

@@ -23,14 +23,12 @@ class AssetMediaSize {
 
   String toJson() => value;
 
-  static const original = AssetMediaSize._(r'original');
   static const fullsize = AssetMediaSize._(r'fullsize');
   static const preview = AssetMediaSize._(r'preview');
   static const thumbnail = AssetMediaSize._(r'thumbnail');
 
   /// List of all possible values in this [enum][AssetMediaSize].
   static const values = <AssetMediaSize>[
-    original,
     fullsize,
     preview,
     thumbnail,
@@ -72,7 +70,6 @@ class AssetMediaSizeTypeTransformer {
   AssetMediaSize? decode(dynamic data, {bool allowNull = true}) {
     if (data != null) {
       switch (data) {
-        case r'original': return AssetMediaSize.original;
         case r'fullsize': return AssetMediaSize.fullsize;
         case r'preview': return AssetMediaSize.preview;
         case r'thumbnail': return AssetMediaSize.thumbnail;

mobile/openapi/lib/model/permission.dart

@@ -72,7 +72,6 @@ class Permission {
   static const facePeriodRead = Permission._(r'face.read');
   static const facePeriodUpdate = Permission._(r'face.update');
   static const facePeriodDelete = Permission._(r'face.delete');
-  static const folderPeriodRead = Permission._(r'folder.read');
   static const jobPeriodCreate = Permission._(r'job.create');
   static const jobPeriodRead = Permission._(r'job.read');
   static const libraryPeriodCreate = Permission._(r'library.create');
@@ -83,8 +82,6 @@ class Permission {
   static const timelinePeriodRead = Permission._(r'timeline.read');
   static const timelinePeriodDownload = Permission._(r'timeline.download');
   static const maintenance = Permission._(r'maintenance');
-  static const mapPeriodRead = Permission._(r'map.read');
-  static const mapPeriodSearch = Permission._(r'map.search');
   static const memoryPeriodCreate = Permission._(r'memory.create');
   static const memoryPeriodRead = Permission._(r'memory.read');
   static const memoryPeriodUpdate = Permission._(r'memory.update');
@@ -231,7 +228,6 @@ class Permission {
     facePeriodRead,
     facePeriodUpdate,
     facePeriodDelete,
-    folderPeriodRead,
     jobPeriodCreate,
     jobPeriodRead,
     libraryPeriodCreate,
@@ -242,8 +238,6 @@ class Permission {
     timelinePeriodRead,
     timelinePeriodDownload,
     maintenance,
-    mapPeriodRead,
-    mapPeriodSearch,
     memoryPeriodCreate,
     memoryPeriodRead,
     memoryPeriodUpdate,
@@ -425,7 +419,6 @@ class PermissionTypeTransformer {
         case r'face.read': return Permission.facePeriodRead;
         case r'face.update': return Permission.facePeriodUpdate;
         case r'face.delete': return Permission.facePeriodDelete;
-        case r'folder.read': return Permission.folderPeriodRead;
         case r'job.create': return Permission.jobPeriodCreate;
         case r'job.read': return Permission.jobPeriodRead;
         case r'library.create': return Permission.libraryPeriodCreate;
@@ -436,8 +429,6 @@ class PermissionTypeTransformer {
         case r'timeline.read': return Permission.timelinePeriodRead;
         case r'timeline.download': return Permission.timelinePeriodDownload;
         case r'maintenance': return Permission.maintenance;
-        case r'map.read': return Permission.mapPeriodRead;
-        case r'map.search': return Permission.mapPeriodSearch;
         case r'memory.create': return Permission.memoryPeriodCreate;
         case r'memory.read': return Permission.memoryPeriodRead;
         case r'memory.update': return Permission.memoryPeriodUpdate;

mobile/pubspec.lock

@@ -2154,14 +2154,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.0.3"
-  worker_manager:
-    dependency: "direct main"
-    description:
-      name: worker_manager
-      sha256: "1bce9f894a0c187856f5fc0e150e7fe1facce326f048ca6172947754dac3d4f3"
-      url: "https://pub.dev"
-    source: hosted
-    version: "7.2.7"
   xdg_directories:
     dependency: transitive
     description:

mobile/pubspec.yaml

@@ -85,7 +85,6 @@ dependencies:
   url_launcher: ^6.3.2
   uuid: ^4.5.1
   wakelock_plus: ^1.3.0
-  worker_manager: ^7.2.7
 
 dev_dependencies:
   auto_route_generator: ^9.0.0

open-api/bin/generate-open-api.sh

@@ -27,7 +27,7 @@ function dart {
 }
 
 function typescript {
-  pnpm dlx oazapfts --optimistic --argumentStyle=object --useEnumType --allSchemas immich-openapi-specs.json typescript-sdk/src/fetch-client.ts
+  pnpm dlx oazapfts --optimistic --argumentStyle=object --useEnumType immich-openapi-specs.json typescript-sdk/src/fetch-client.ts
   pnpm --filter @immich/sdk install --frozen-lockfile
   pnpm --filter @immich/sdk build
 }

open-api/immich-openapi-specs.json

@@ -3173,7 +3173,6 @@
             "state": "Stable"
           }
         ],
-        "x-immich-permission": "asset.upload",
         "x-immich-state": "Stable"
       }
     },
@@ -3226,7 +3225,6 @@
             "state": "Stable"
           }
         ],
-        "x-immich-permission": "job.create",
         "x-immich-state": "Stable"
       }
     },
@@ -4279,7 +4277,7 @@
     },
     "/assets/{id}/thumbnail": {
       "get": {
-        "description": "Retrieve the thumbnail image for the specified asset. Viewing the fullsize thumbnail might redirect to downloadAsset, which requires a different permission.",
+        "description": "Retrieve the thumbnail image for the specified asset.",
         "operationId": "viewAsset",
         "parameters": [
           {
@@ -6307,7 +6305,6 @@
             "state": "Stable"
           }
         ],
-        "x-immich-permission": "map.read",
         "x-immich-state": "Stable"
       }
     },
@@ -6379,7 +6376,6 @@
             "state": "Stable"
           }
         ],
-        "x-immich-permission": "map.search",
         "x-immich-state": "Stable"
       }
     },
@@ -14620,7 +14616,6 @@
             "state": "Stable"
           }
         ],
-        "x-immich-permission": "folder.read",
         "x-immich-state": "Stable"
       }
     },
@@ -14673,7 +14668,6 @@
             "state": "Stable"
           }
         ],
-        "x-immich-permission": "folder.read",
         "x-immich-state": "Stable"
       }
     },
@@ -16305,7 +16299,6 @@
       },
       "AssetMediaSize": {
         "enum": [
-          "original",
           "fullsize",
           "preview",
           "thumbnail"
@@ -18963,7 +18956,6 @@
           "face.read",
           "face.update",
           "face.delete",
-          "folder.read",
           "job.create",
           "job.read",
           "library.create",
@@ -18974,8 +18966,6 @@
           "timeline.read",
           "timeline.download",
           "maintenance",
-          "map.read",
-          "map.search",
           "memory.create",
           "memory.read",
           "memory.update",

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

@@ -1875,210 +1875,6 @@ export type WorkflowUpdateDto = {
     name?: string;
     triggerType?: PluginTriggerType;
 };
-export type SyncAckV1 = {};
-export type SyncAlbumDeleteV1 = {
-    albumId: string;
-};
-export type SyncAlbumToAssetDeleteV1 = {
-    albumId: string;
-    assetId: string;
-};
-export type SyncAlbumToAssetV1 = {
-    albumId: string;
-    assetId: string;
-};
-export type SyncAlbumUserDeleteV1 = {
-    albumId: string;
-    userId: string;
-};
-export type SyncAlbumUserV1 = {
-    albumId: string;
-    role: AlbumUserRole;
-    userId: string;
-};
-export type SyncAlbumV1 = {
-    createdAt: string;
-    description: string;
-    id: string;
-    isActivityEnabled: boolean;
-    name: string;
-    order: AssetOrder;
-    ownerId: string;
-    thumbnailAssetId: string | null;
-    updatedAt: string;
-};
-export type SyncAssetDeleteV1 = {
-    assetId: string;
-};
-export type SyncAssetExifV1 = {
-    assetId: string;
-    city: string | null;
-    country: string | null;
-    dateTimeOriginal: string | null;
-    description: string | null;
-    exifImageHeight: number | null;
-    exifImageWidth: number | null;
-    exposureTime: string | null;
-    fNumber: number | null;
-    fileSizeInByte: number | null;
-    focalLength: number | null;
-    fps: number | null;
-    iso: number | null;
-    latitude: number | null;
-    lensModel: string | null;
-    longitude: number | null;
-    make: string | null;
-    model: string | null;
-    modifyDate: string | null;
-    orientation: string | null;
-    profileDescription: string | null;
-    projectionType: string | null;
-    rating: number | null;
-    state: string | null;
-    timeZone: string | null;
-};
-export type SyncAssetFaceDeleteV1 = {
-    assetFaceId: string;
-};
-export type SyncAssetFaceV1 = {
-    assetId: string;
-    boundingBoxX1: number;
-    boundingBoxX2: number;
-    boundingBoxY1: number;
-    boundingBoxY2: number;
-    id: string;
-    imageHeight: number;
-    imageWidth: number;
-    personId: string | null;
-    sourceType: string;
-};
-export type SyncAssetMetadataDeleteV1 = {
-    assetId: string;
-    key: string;
-};
-export type SyncAssetMetadataV1 = {
-    assetId: string;
-    key: string;
-    value: object;
-};
-export type SyncAssetV1 = {
-    checksum: string;
-    deletedAt: string | null;
-    duration: string | null;
-    fileCreatedAt: string | null;
-    fileModifiedAt: string | null;
-    height: number | null;
-    id: string;
-    isEdited: boolean;
-    isFavorite: boolean;
-    libraryId: string | null;
-    livePhotoVideoId: string | null;
-    localDateTime: string | null;
-    originalFileName: string;
-    ownerId: string;
-    stackId: string | null;
-    thumbhash: string | null;
-    "type": AssetTypeEnum;
-    visibility: AssetVisibility;
-    width: number | null;
-};
-export type SyncAuthUserV1 = {
-    avatarColor: (UserAvatarColor) | null;
-    deletedAt: string | null;
-    email: string;
-    hasProfileImage: boolean;
-    id: string;
-    isAdmin: boolean;
-    name: string;
-    oauthId: string;
-    pinCode: string | null;
-    profileChangedAt: string;
-    quotaSizeInBytes: number | null;
-    quotaUsageInBytes: number;
-    storageLabel: string | null;
-};
-export type SyncCompleteV1 = {};
-export type SyncMemoryAssetDeleteV1 = {
-    assetId: string;
-    memoryId: string;
-};
-export type SyncMemoryAssetV1 = {
-    assetId: string;
-    memoryId: string;
-};
-export type SyncMemoryDeleteV1 = {
-    memoryId: string;
-};
-export type SyncMemoryV1 = {
-    createdAt: string;
-    data: object;
-    deletedAt: string | null;
-    hideAt: string | null;
-    id: string;
-    isSaved: boolean;
-    memoryAt: string;
-    ownerId: string;
-    seenAt: string | null;
-    showAt: string | null;
-    "type": MemoryType;
-    updatedAt: string;
-};
-export type SyncPartnerDeleteV1 = {
-    sharedById: string;
-    sharedWithId: string;
-};
-export type SyncPartnerV1 = {
-    inTimeline: boolean;
-    sharedById: string;
-    sharedWithId: string;
-};
-export type SyncPersonDeleteV1 = {
-    personId: string;
-};
-export type SyncPersonV1 = {
-    birthDate: string | null;
-    color: string | null;
-    createdAt: string;
-    faceAssetId: string | null;
-    id: string;
-    isFavorite: boolean;
-    isHidden: boolean;
-    name: string;
-    ownerId: string;
-    updatedAt: string;
-};
-export type SyncResetV1 = {};
-export type SyncStackDeleteV1 = {
-    stackId: string;
-};
-export type SyncStackV1 = {
-    createdAt: string;
-    id: string;
-    ownerId: string;
-    primaryAssetId: string;
-    updatedAt: string;
-};
-export type SyncUserDeleteV1 = {
-    userId: string;
-};
-export type SyncUserMetadataDeleteV1 = {
-    key: UserMetadataKey;
-    userId: string;
-};
-export type SyncUserMetadataV1 = {
-    key: UserMetadataKey;
-    userId: string;
-    value: object;
-};
-export type SyncUserV1 = {
-    avatarColor: (UserAvatarColor) | null;
-    deletedAt: string | null;
-    email: string;
-    hasProfileImage: boolean;
-    id: string;
-    name: string;
-    profileChangedAt: string;
-};
 /**
  * List all activities
  */
@@ -5728,7 +5524,6 @@ export enum Permission {
     FaceRead = "face.read",
     FaceUpdate = "face.update",
     FaceDelete = "face.delete",
-    FolderRead = "folder.read",
     JobCreate = "job.create",
     JobRead = "job.read",
     LibraryCreate = "library.create",
@@ -5739,8 +5534,6 @@ export enum Permission {
     TimelineRead = "timeline.read",
     TimelineDownload = "timeline.download",
     Maintenance = "maintenance",
-    MapRead = "map.read",
-    MapSearch = "map.search",
     MemoryCreate = "memory.create",
     MemoryRead = "memory.read",
     MemoryUpdate = "memory.update",
@@ -5865,7 +5658,6 @@ export enum MirrorAxis {
     Vertical = "vertical"
 }
 export enum AssetMediaSize {
-    Original = "original",
     Fullsize = "fullsize",
     Preview = "preview",
     Thumbnail = "thumbnail"
@@ -6143,8 +5935,3 @@ export enum OAuthTokenEndpointAuthMethod {
     ClientSecretPost = "client_secret_post",
     ClientSecretBasic = "client_secret_basic"
 }
-export enum UserMetadataKey {
-    Preferences = "preferences",
-    License = "license",
-    Onboarding = "onboarding"
-}

pnpm-lock.yaml

@@ -36,7 +36,7 @@ importers:
         version: 1.20.1
       lodash-es:
         specifier: ^4.17.21
-        version: 4.17.23
+        version: 4.17.22
       micromatch:
         specifier: ^4.0.8
         version: 4.0.8
@@ -489,7 +489,7 @@ importers:
         version: 3.0.0(kysely@0.28.2)(postgres@3.4.8)
       lodash:
         specifier: ^4.17.21
-        version: 4.17.23
+        version: 4.17.21
       luxon:
         specifier: ^3.4.2
         version: 3.7.2
@@ -802,7 +802,7 @@ importers:
         version: 4.1.0
       lodash-es:
         specifier: ^4.17.21
-        version: 4.17.23
+        version: 4.17.22
       luxon:
         specifier: ^3.4.4
         version: 3.7.2
@@ -8916,8 +8916,8 @@ packages:
   lodash-es@4.17.21:
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
 
-  lodash-es@4.17.23:
-    resolution: {integrity: sha512-kVI48u3PZr38HdYz98UmfPnXl2DXrpdctLrFLCd3kOx1xUkOmpFPx7gCWWM5MPkL/fD8zb+Ph0QzjGFs4+hHWg==}
+  lodash-es@4.17.22:
+    resolution: {integrity: sha512-XEawp1t0gxSi9x01glktRZ5HDy0HXqrM0x5pXQM98EaI0NxO6jVM7omDOxsuEo5UIASAnm2bRp1Jt/e0a2XU8Q==}
 
   lodash.camelcase@4.3.0:
     resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
@@ -8964,9 +8964,6 @@ packages:
   lodash@4.17.21:
     resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==}
 
-  lodash@4.17.23:
-    resolution: {integrity: sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==}
-
   log-symbols@4.1.0:
     resolution: {integrity: sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==}
     engines: {node: '>=10'}
@@ -14545,7 +14542,7 @@ snapshots:
       html-tags: 3.3.1
       html-webpack-plugin: 5.6.5(webpack@5.104.1)
       leven: 3.1.0
-      lodash: 4.17.23
+      lodash: 4.17.21
       open: 8.4.2
       p-map: 4.0.0
       prompts: 2.4.2
@@ -14662,7 +14659,7 @@ snapshots:
       cheerio: 1.0.0-rc.12
       feed: 4.2.2
       fs-extra: 11.3.2
-      lodash: 4.17.23
+      lodash: 4.17.21
       react: 18.3.1
       react-dom: 18.3.1(react@18.3.1)
       schema-dts: 1.1.5
@@ -14704,7 +14701,7 @@ snapshots:
       combine-promises: 1.2.0
       fs-extra: 11.3.2
       js-yaml: 4.1.1
-      lodash: 4.17.23
+      lodash: 4.17.21
       react: 18.3.1
       react-dom: 18.3.1(react@18.3.1)
       schema-dts: 1.1.5
@@ -15017,7 +15014,7 @@ snapshots:
       '@mdx-js/react': 3.1.1(@types/react@19.2.8)(react@18.3.1)
       clsx: 2.1.1
       infima: 0.2.0-alpha.45
-      lodash: 4.17.23
+      lodash: 4.17.21
       nprogress: 0.2.0
       postcss: 8.5.6
       prism-react-renderer: 2.4.1(react@18.3.1)
@@ -15115,7 +15112,7 @@ snapshots:
       clsx: 2.1.1
       eta: 2.2.0
       fs-extra: 11.3.2
-      lodash: 4.17.23
+      lodash: 4.17.21
       react: 18.3.1
       react-dom: 18.3.1(react@18.3.1)
       tslib: 2.8.1
@@ -15190,7 +15187,7 @@ snapshots:
       fs-extra: 11.3.2
       joi: 17.13.3
       js-yaml: 4.1.1
-      lodash: 4.17.23
+      lodash: 4.17.21
       tslib: 2.8.1
     transitivePeerDependencies:
       - '@swc/core'
@@ -15215,7 +15212,7 @@ snapshots:
       gray-matter: 4.0.3
       jiti: 1.21.7
       js-yaml: 4.1.1
-      lodash: 4.17.23
+      lodash: 4.17.21
       micromatch: 4.0.8
       p-queue: 6.6.2
       prompts: 2.4.2
@@ -15600,7 +15597,7 @@ snapshots:
     dependencies:
       '@nestjs/common': 11.1.12(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2)
       '@nestjs/core': 11.1.12(@nestjs/common@11.1.12(class-transformer@0.5.1)(class-validator@0.14.3)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/platform-express@11.1.12)(@nestjs/websockets@11.1.12)(reflect-metadata@0.2.2)(rxjs@7.8.2)
-      lodash: 4.17.23
+      lodash: 4.17.21
 
   '@grpc/grpc-js@1.14.3':
     dependencies:
@@ -18845,7 +18842,7 @@ snapshots:
       graceful-fs: 4.2.11
       is-stream: 2.0.1
       lazystream: 1.0.1
-      lodash: 4.17.23
+      lodash: 4.17.21
       normalize-path: 3.0.0
       readable-stream: 4.7.0
 
@@ -19335,7 +19332,7 @@ snapshots:
   chevrotain-allstar@0.3.1(chevrotain@11.0.3):
     dependencies:
       chevrotain: 11.0.3
-      lodash-es: 4.17.23
+      lodash-es: 4.17.22
 
   chevrotain@11.0.3:
     dependencies:
@@ -20030,7 +20027,7 @@ snapshots:
   dagre-d3-es@7.0.13:
     dependencies:
       d3: 7.9.0
-      lodash-es: 4.17.23
+      lodash-es: 4.17.22
 
   data-urls@3.0.2:
     dependencies:
@@ -21578,7 +21575,7 @@ snapshots:
     dependencies:
       '@types/html-minifier-terser': 6.1.0
       html-minifier-terser: 6.1.0
-      lodash: 4.17.23
+      lodash: 4.17.21
       pretty-error: 4.0.0
       tapable: 2.3.0
     optionalDependencies:
@@ -21772,7 +21769,7 @@ snapshots:
       cli-cursor: 3.1.0
       cli-width: 3.0.0
       figures: 3.2.0
-      lodash: 4.17.23
+      lodash: 4.17.21
       mute-stream: 0.0.8
       ora: 5.4.1
       run-async: 2.4.1
@@ -22379,7 +22376,7 @@ snapshots:
 
   lodash-es@4.17.21: {}
 
-  lodash-es@4.17.23: {}
+  lodash-es@4.17.22: {}
 
   lodash.camelcase@4.3.0: {}
 
@@ -22411,8 +22408,6 @@ snapshots:
 
   lodash@4.17.21: {}
 
-  lodash@4.17.23: {}
-
   log-symbols@4.1.0:
     dependencies:
       chalk: 4.1.2
@@ -22815,7 +22810,7 @@ snapshots:
       dompurify: 3.3.1
       katex: 0.16.27
       khroma: 2.1.0
-      lodash-es: 4.17.23
+      lodash-es: 4.17.22
       marked: 16.4.2
       roughjs: 4.6.6
       stylis: 4.3.6
@@ -23388,7 +23383,7 @@ snapshots:
 
   node-emoji@1.11.0:
     dependencies:
-      lodash: 4.17.23
+      lodash: 4.17.21
 
   node-emoji@2.2.0:
     dependencies:
@@ -24389,7 +24384,7 @@ snapshots:
 
   pretty-error@4.0.0:
     dependencies:
-      lodash: 4.17.23
+      lodash: 4.17.21
       renderkid: 3.0.0
 
   pretty-format@27.5.1:
@@ -24862,7 +24857,7 @@ snapshots:
       css-select: 4.3.0
       dom-converter: 0.2.0
       htmlparser2: 6.1.0
-      lodash: 4.17.23
+      lodash: 4.17.21
       strip-ansi: 6.0.1
 
   repeat-string@1.6.1: {}
@@ -25719,7 +25714,7 @@ snapshots:
       json-source-map: 0.6.1
       jsonpath-plus: 10.3.0
       jsonrepair: 3.13.1
-      lodash-es: 4.17.23
+      lodash-es: 4.17.22
       memoize-one: 6.0.0
       natural-compare-lite: 1.4.0
       sass: 1.97.1

readme_i18n/README_de_DE.md

@@ -38,6 +38,11 @@
   <a href="README_th_TH.md">ภาษาไทย</a>
 </p>
 
+## Warnung
+
+- ⚠️ Das Projekt befindet sich in **sehr aktiver** Entwicklung.
+- ⚠️ Gehe von möglichen Fehlern und von Änderungen mit Breaking-Changes aus.
+- ⚠️ **Nutze die App auf keinen Fall als einziges Speichermedium für deine Fotos und Videos.**
 - ⚠️ Befolge immer die [3-2-1](https://www.backblaze.com/blog/the-3-2-1-backup-strategy/) Backup-Regel für deine wertvollen Fotos und Videos!
 
 > [!NOTE]
@@ -57,7 +62,7 @@
 
 ## Demo
 
-Die Web-Demo kannst Du unter https://demo.immich.app finden. Für die Smartphone-App kannst Du `https://demo.immich.app` als `Server Endpoint URL` angeben.
+Die Web-Demo kannst Du unter https://demo.immich.app finden. Für die Handy-App kannst Du `https://demo.immich.app` als `Server Endpoint URL` angeben.
 
 ### Login Daten
 
@@ -88,7 +93,7 @@ Die Web-Demo kannst Du unter https://demo.immich.app finden. Für die Smartphone
 | LivePhoto/MotionPhoto Sicherung und Wiedergabe       | Ja     | Ja    |
 | Unterstützung für 360-Grad-Bilder     	             | Nein   | Ja    |
 | Benutzerdefinierte Speicherstruktur                  | Ja     | Ja    |
-| Öffentliches Teilen                                  | Ja     | Ja    |
+| Öffentliches Teilen                                  | Nein   | Ja    |
 | Archiv und Favoriten                                 | Ja     | Ja    |
 | Globale Karte                                        | Ja     | Ja    |
 | Partnerfreigabe (Teilen)                             | Ja     | Ja    |
@@ -98,7 +103,7 @@ Die Web-Demo kannst Du unter https://demo.immich.app finden. Für die Smartphone
 | Schreibgeschützte Gallerie                           | Ja     | Ja    |
 | Gestapelte Bilder                                    | Ja     | Ja    |
 | Tags                                                 | Nein   | Ja    |
-| Ordner-Ansicht                                       | Ja     | Ja    |
+| Ordner-Ansicht                                       | Nein   | Ja    |
 
 
 ## Übersetzungen

server/src/config.ts

@@ -15,7 +15,7 @@ import {
 } from 'src/enum';
 import { ConcurrentQueueName, FullsizeImageOptions, ImageOptions } from 'src/types';
 
-export type SystemConfig = {
+export interface SystemConfig {
   backup: {
     database: {
       enabled: boolean;
@@ -187,7 +187,7 @@ export type SystemConfig = {
   user: {
     deleteDelay: number;
   };
-};
+}
 
 export type MachineLearningConfig = SystemConfig['machineLearning'];
 

server/src/controllers/asset-media.controller.ts

@@ -147,8 +147,7 @@ export class AssetMediaController {
   @Authenticated({ permission: Permission.AssetView, sharedLink: true })
   @Endpoint({
     summary: 'View asset thumbnail',
-    description:
-      'Retrieve the thumbnail image for the specified asset. Viewing the fullsize thumbnail might redirect to downloadAsset, which requires a different permission.',
+    description: 'Retrieve the thumbnail image for the specified asset.',
     history: new HistoryBuilder().added('v1').beta('v1').stable('v2'),
   })
   async viewAsset(
@@ -203,7 +202,7 @@ export class AssetMediaController {
   }
 
   @Post('exist')
-  @Authenticated({ permission: Permission.AssetUpload })
+  @Authenticated()
   @Endpoint({
     summary: 'Check existing assets',
     description: 'Checks if multiple assets exist on the server and returns all existing - used by background backup',

server/src/controllers/asset.controller.ts

@@ -66,7 +66,7 @@ export class AssetController {
   }
 
   @Post('jobs')
-  @Authenticated({ permission: Permission.JobCreate })
+  @Authenticated()
   @HttpCode(HttpStatus.NO_CONTENT)
   @Endpoint({
     summary: 'Run an asset job',

server/src/controllers/map.controller.ts

@@ -8,7 +8,7 @@ import {
   MapReverseGeocodeDto,
   MapReverseGeocodeResponseDto,
 } from 'src/dtos/map.dto';
-import { ApiTag, Permission } from 'src/enum';
+import { ApiTag } from 'src/enum';
 import { Auth, Authenticated } from 'src/middleware/auth.guard';
 import { MapService } from 'src/services/map.service';
 
@@ -18,7 +18,7 @@ export class MapController {
   constructor(private service: MapService) {}
 
   @Get('markers')
-  @Authenticated({ permission: Permission.MapRead })
+  @Authenticated()
   @Endpoint({
     summary: 'Retrieve map markers',
     description: 'Retrieve a list of latitude and longitude coordinates for every asset with location data.',
@@ -28,8 +28,8 @@ export class MapController {
     return this.service.getMapMarkers(auth, options);
   }
 
+  @Authenticated()
   @Get('reverse-geocode')
-  @Authenticated({ permission: Permission.MapSearch })
   @HttpCode(HttpStatus.OK)
   @Endpoint({
     summary: 'Reverse geocode coordinates',

server/src/controllers/view.controller.ts

@@ -3,7 +3,7 @@ import { ApiTags } from '@nestjs/swagger';
 import { Endpoint, HistoryBuilder } from 'src/decorators';
 import { AssetResponseDto } from 'src/dtos/asset-response.dto';
 import { AuthDto } from 'src/dtos/auth.dto';
-import { ApiTag, Permission } from 'src/enum';
+import { ApiTag } from 'src/enum';
 import { Auth, Authenticated } from 'src/middleware/auth.guard';
 import { ViewService } from 'src/services/view.service';
 
@@ -13,7 +13,7 @@ export class ViewController {
   constructor(private service: ViewService) {}
 
   @Get('folder/unique-paths')
-  @Authenticated({ permission: Permission.FolderRead })
+  @Authenticated()
   @Endpoint({
     summary: 'Retrieve unique paths',
     description: 'Retrieve a list of unique folder paths from asset original paths.',
@@ -24,7 +24,7 @@ export class ViewController {
   }
 
   @Get('folder')
-  @Authenticated({ permission: Permission.FolderRead })
+  @Authenticated()
   @Endpoint({
     summary: 'Retrieve assets by original path',
     description: 'Retrieve assets that are children of a specific folder.',

server/src/cores/storage.core.ts

@@ -1,15 +1,7 @@
 import { randomUUID } from 'node:crypto';
 import { dirname, join, resolve } from 'node:path';
 import { StorageAsset } from 'src/database';
-import {
-  AssetFileType,
-  AssetPathType,
-  ImageFormat,
-  PathType,
-  PersonPathType,
-  RawExtractedFormat,
-  StorageFolder,
-} from 'src/enum';
+import { AssetFileType, AssetPathType, ImageFormat, PathType, PersonPathType, StorageFolder } from 'src/enum';
 import { AssetRepository } from 'src/repositories/asset.repository';
 import { ConfigRepository } from 'src/repositories/config.repository';
 import { CryptoRepository } from 'src/repositories/crypto.repository';
@@ -32,6 +24,15 @@ export interface MoveRequest {
   };
 }
 
+export type GeneratedImageType =
+  | AssetPathType.Preview
+  | AssetPathType.Thumbnail
+  | AssetPathType.FullSize
+  | AssetPathType.EditedPreview
+  | AssetPathType.EditedThumbnail
+  | AssetPathType.EditedFullSize;
+export type GeneratedAssetType = GeneratedImageType | AssetPathType.EncodedVideo;
+
 export type ThumbnailPathEntity = { id: string; ownerId: string };
 
 let instance: StorageCore | null;
@@ -110,19 +111,8 @@ export class StorageCore {
     return StorageCore.getNestedPath(StorageFolder.Thumbnails, person.ownerId, `${person.id}.jpeg`);
   }
 
-  static getImagePath(
-    asset: ThumbnailPathEntity,
-    {
-      fileType,
-      format,
-      isEdited,
-    }: { fileType: AssetFileType; format: ImageFormat | RawExtractedFormat; isEdited: boolean },
-  ) {
-    return StorageCore.getNestedPath(
-      StorageFolder.Thumbnails,
-      asset.ownerId,
-      `${asset.id}_${fileType}${isEdited ? '_edited' : ''}.${format}`,
-    );
+  static getImagePath(asset: ThumbnailPathEntity, type: GeneratedImageType, format: 'jpeg' | 'webp') {
+    return StorageCore.getNestedPath(StorageFolder.Thumbnails, asset.ownerId, `${asset.id}-${type}.${format}`);
   }
 
   static getEncodedVideoPath(asset: ThumbnailPathEntity) {
@@ -147,14 +137,14 @@ export class StorageCore {
     return normalizedPath.startsWith(normalizedAppMediaLocation);
   }
 
-  async moveAssetImage(asset: StorageAsset, fileType: AssetFileType, format: ImageFormat) {
+  async moveAssetImage(asset: StorageAsset, pathType: GeneratedImageType, format: ImageFormat) {
     const { id: entityId, files } = asset;
-    const oldFile = getAssetFile(files, fileType, { isEdited: false });
+    const oldFile = getAssetFile(files, pathType);
     return this.moveFile({
       entityId,
-      pathType: fileType,
+      pathType,
       oldPath: oldFile?.path || null,
-      newPath: StorageCore.getImagePath(asset, { fileType, format, isEdited: false }),
+      newPath: StorageCore.getImagePath(asset, pathType, format),
     });
   }
 
@@ -308,19 +298,19 @@ export class StorageCore {
       case AssetPathType.Original: {
         return this.assetRepository.update({ id, originalPath: newPath });
       }
-      case AssetFileType.FullSize: {
+      case AssetPathType.FullSize: {
         return this.assetRepository.upsertFile({ assetId: id, type: AssetFileType.FullSize, path: newPath });
       }
-      case AssetFileType.Preview: {
+      case AssetPathType.Preview: {
         return this.assetRepository.upsertFile({ assetId: id, type: AssetFileType.Preview, path: newPath });
       }
-      case AssetFileType.Thumbnail: {
+      case AssetPathType.Thumbnail: {
         return this.assetRepository.upsertFile({ assetId: id, type: AssetFileType.Thumbnail, path: newPath });
       }
       case AssetPathType.EncodedVideo: {
         return this.assetRepository.update({ id, encodedVideoPath: newPath });
       }
-      case AssetFileType.Sidecar: {
+      case AssetPathType.Sidecar: {
         return this.assetRepository.upsertFile({ assetId: id, type: AssetFileType.Sidecar, path: newPath });
       }
       case PersonPathType.Face: {

server/src/database.ts

@@ -39,7 +39,6 @@ export type AssetFile = {
   id: string;
   type: AssetFileType;
   path: string;
-  isEdited: boolean;
 };
 
 export type Library = {
@@ -345,7 +344,7 @@ export const columns = {
     'asset.width',
     'asset.height',
   ],
-  assetFiles: ['asset_file.id', 'asset_file.path', 'asset_file.type', 'asset_file.isEdited'],
+  assetFiles: ['asset_file.id', 'asset_file.path', 'asset_file.type'],
   authUser: ['user.id', 'user.name', 'user.email', 'user.isAdmin', 'user.quotaUsageInBytes', 'user.quotaSizeInBytes'],
   authApiKey: ['api_key.id', 'api_key.permissions'],
   authSession: ['session.id', 'session.updatedAt', 'session.pinExpiresAt', 'session.appVersion'],
@@ -458,7 +457,6 @@ export const columns = {
     'asset_exif.projectionType',
     'asset_exif.rating',
     'asset_exif.state',
-    'asset_exif.tags',
     'asset_exif.timeZone',
   ],
   plugin: [
@@ -482,5 +480,4 @@ export const lockableProperties = [
   'longitude',
   'rating',
   'timeZone',
-  'tags',
 ] as const;

server/src/dtos/asset-media.dto.ts

@@ -7,7 +7,6 @@ import { AssetVisibility } from 'src/enum';
 import { Optional, ValidateBoolean, ValidateDate, ValidateEnum, ValidateUUID } from 'src/validation';
 
 export enum AssetMediaSize {
-  Original = 'original',
   /**
    * An full-sized image extracted/converted from non-web-friendly formats like RAW/HIF.
    * or otherwise the original image itself.

server/src/enum.ts

@@ -45,6 +45,9 @@ export enum AssetFileType {
   Preview = 'preview',
   Thumbnail = 'thumbnail',
   Sidecar = 'sidecar',
+  FullSizeEdited = 'fullsize_edited',
+  PreviewEdited = 'preview_edited',
+  ThumbnailEdited = 'thumbnail_edited',
 }
 
 export enum AlbumUserRole {
@@ -146,8 +149,6 @@ export enum Permission {
   FaceUpdate = 'face.update',
   FaceDelete = 'face.delete',
 
-  FolderRead = 'folder.read',
-
   JobCreate = 'job.create',
   JobRead = 'job.read',
 
@@ -162,9 +163,6 @@ export enum Permission {
 
   Maintenance = 'maintenance',
 
-  MapRead = 'map.read',
-  MapSearch = 'map.search',
-
   MemoryCreate = 'memory.create',
   MemoryRead = 'memory.read',
   MemoryUpdate = 'memory.update',
@@ -371,7 +369,14 @@ export enum ManualJobName {
 
 export enum AssetPathType {
   Original = 'original',
+  FullSize = 'fullsize',
+  Preview = 'preview',
+  EditedFullSize = 'edited_fullsize',
+  EditedPreview = 'edited_preview',
+  EditedThumbnail = 'edited_thumbnail',
+  Thumbnail = 'thumbnail',
   EncodedVideo = 'encoded_video',
+  Sidecar = 'sidecar',
 }
 
 export enum PersonPathType {
@@ -382,7 +387,7 @@ export enum UserPathType {
   Profile = 'profile',
 }
 
-export type PathType = AssetFileType | AssetPathType | PersonPathType | UserPathType;
+export type PathType = AssetPathType | PersonPathType | UserPathType;
 
 export enum TranscodePolicy {
   All = 'all',

server/src/queries/asset.edit.repository.sql

@@ -15,5 +15,3 @@ from
   "asset_edit"
 where
   "assetId" = $1
-order by
-  "sequence" asc

server/src/queries/asset.job.repository.sql

@@ -29,8 +29,7 @@ select
         select
           "asset_file"."id",
           "asset_file"."path",
-          "asset_file"."type",
-          "asset_file"."isEdited"
+          "asset_file"."type"
         from
           "asset_file"
         where
@@ -38,6 +37,20 @@ select
           and "asset_file"."type" = $1
       ) as agg
   ) as "files",
+  (
+    select
+      coalesce(json_agg(agg), '[]')
+    from
+      (
+        select
+          "tag"."value"
+        from
+          "tag"
+          inner join "tag_asset" on "tag"."id" = "tag_asset"."tagId"
+        where
+          "asset"."id" = "tag_asset"."assetId"
+      ) as agg
+  ) as "tags",
   to_json("asset_exif") as "exifInfo"
 from
   "asset"
@@ -59,8 +72,7 @@ select
         select
           "asset_file"."id",
           "asset_file"."path",
-          "asset_file"."type",
-          "asset_file"."isEdited"
+          "asset_file"."type"
         from
           "asset_file"
         where
@@ -87,8 +99,7 @@ select
         select
           "asset_file"."id",
           "asset_file"."path",
-          "asset_file"."type",
-          "asset_file"."isEdited"
+          "asset_file"."type"
         from
           "asset_file"
         where
@@ -134,8 +145,7 @@ select
         select
           "asset_file"."id",
           "asset_file"."path",
-          "asset_file"."type",
-          "asset_file"."isEdited"
+          "asset_file"."type"
         from
           "asset_file"
         where
@@ -164,8 +174,7 @@ select
         select
           "asset_file"."id",
           "asset_file"."path",
-          "asset_file"."type",
-          "asset_file"."isEdited"
+          "asset_file"."type"
         from
           "asset_file"
         where
@@ -235,8 +244,7 @@ select
         select
           "asset_file"."id",
           "asset_file"."path",
-          "asset_file"."type",
-          "asset_file"."isEdited"
+          "asset_file"."type"
         from
           "asset_file"
         where
@@ -261,8 +269,7 @@ where
 select
   "asset_file"."id",
   "asset_file"."path",
-  "asset_file"."type",
-  "asset_file"."isEdited"
+  "asset_file"."type"
 from
   "asset_file"
 where
@@ -311,8 +318,7 @@ select
         select
           "asset_file"."id",
           "asset_file"."path",
-          "asset_file"."type",
-          "asset_file"."isEdited"
+          "asset_file"."type"
         from
           "asset_file"
         where
@@ -351,8 +357,7 @@ select
         select
           "asset_file"."id",
           "asset_file"."path",
-          "asset_file"."type",
-          "asset_file"."isEdited"
+          "asset_file"."type"
         from
           "asset_file"
         where
@@ -439,8 +444,7 @@ select
         select
           "asset_file"."id",
           "asset_file"."path",
-          "asset_file"."type",
-          "asset_file"."isEdited"
+          "asset_file"."type"
         from
           "asset_file"
         where
@@ -532,8 +536,7 @@ select
         select
           "asset_file"."id",
           "asset_file"."path",
-          "asset_file"."type",
-          "asset_file"."isEdited"
+          "asset_file"."type"
         from
           "asset_file"
         where
@@ -572,8 +575,7 @@ select
         select
           "asset_file"."id",
           "asset_file"."path",
-          "asset_file"."type",
-          "asset_file"."isEdited"
+          "asset_file"."type"
         from
           "asset_file"
         where

server/src/queries/asset.repository.sql

@@ -286,8 +286,7 @@ select
         select
           "asset_file"."id",
           "asset_file"."path",
-          "asset_file"."type",
-          "asset_file"."isEdited"
+          "asset_file"."type"
         from
           "asset_file"
         where

server/src/queries/stack.repository.sql

@@ -43,7 +43,6 @@ select
               "asset_exif"."projectionType",
               "asset_exif"."rating",
               "asset_exif"."state",
-              "asset_exif"."tags",
               "asset_exif"."timeZone"
             from
               "asset_exif"
@@ -128,7 +127,6 @@ select
               "asset_exif"."projectionType",
               "asset_exif"."rating",
               "asset_exif"."state",
-              "asset_exif"."tags",
               "asset_exif"."timeZone"
             from
               "asset_exif"

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

@@ -12,14 +12,14 @@ export class AssetEditRepository {
   @GenerateSql({
     params: [DummyValue.UUID],
   })
-  replaceAll(assetId: string, edits: AssetEditActionItem[]): Promise<AssetEditActionItem[]> {
-    return this.db.transaction().execute(async (trx) => {
+  async replaceAll(assetId: string, edits: AssetEditActionItem[]): Promise<AssetEditActionItem[]> {
+    return await this.db.transaction().execute(async (trx) => {
       await trx.deleteFrom('asset_edit').where('assetId', '=', assetId).execute();
 
       if (edits.length > 0) {
         return trx
           .insertInto('asset_edit')
-          .values(edits.map((edit, i) => ({ assetId, sequence: i, ...edit })))
+          .values(edits.map((edit) => ({ assetId, ...edit })))
           .returning(['action', 'parameters'])
           .execute() as Promise<AssetEditActionItem[]>;
       }
@@ -31,12 +31,11 @@ export class AssetEditRepository {
   @GenerateSql({
     params: [DummyValue.UUID],
   })
-  getAll(assetId: string): Promise<AssetEditActionItem[]> {
+  async getAll(assetId: string): Promise<AssetEditActionItem[]> {
     return this.db
       .selectFrom('asset_edit')
       .select(['action', 'parameters'])
       .where('assetId', '=', assetId)
-      .orderBy('sequence', 'asc')
       .execute() as Promise<AssetEditActionItem[]>;
   }
 }

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

@@ -1,5 +1,6 @@
 import { Injectable } from '@nestjs/common';
 import { Kysely } from 'kysely';
+import { jsonArrayFrom } from 'kysely/helpers/postgres';
 import { InjectKysely } from 'nestjs-kysely';
 import { Asset, columns } from 'src/database';
 import { DummyValue, GenerateSql } from 'src/decorators';
@@ -41,6 +42,15 @@ export class AssetJobRepository {
       .where('asset.id', '=', asUuid(id))
       .select(['id', 'originalPath'])
       .select((eb) => withFiles(eb, AssetFileType.Sidecar))
+      .select((eb) =>
+        jsonArrayFrom(
+          eb
+            .selectFrom('tag')
+            .select(['tag.value'])
+            .innerJoin('tag_asset', 'tag.id', 'tag_asset.tagId')
+            .whereRef('asset.id', '=', 'tag_asset.assetId'),
+        ).as('tags'),
+      )
       .$call(withExifInner)
       .limit(1)
       .executeTakeFirst();

server/src/repositories/asset.repository.ts

@@ -178,7 +178,6 @@ export class AssetRepository {
                 bitsPerSample: ref('bitsPerSample'),
                 rating: ref('rating'),
                 fps: ref('fps'),
-                tags: ref('tags'),
                 lockedProperties:
                   lockedPropertiesBehavior === 'append'
                     ? distinctLocked(eb, exif.lockedProperties ?? null)
@@ -904,22 +903,20 @@ export class AssetRepository {
       .execute();
   }
 
-  async upsertFile(file: Pick<Insertable<AssetFileTable>, 'assetId' | 'path' | 'type' | 'isEdited'>): Promise<void> {
+  async upsertFile(file: Pick<Insertable<AssetFileTable>, 'assetId' | 'path' | 'type'>): Promise<void> {
     const value = { ...file, assetId: asUuid(file.assetId) };
     await this.db
       .insertInto('asset_file')
       .values(value)
       .onConflict((oc) =>
-        oc.columns(['assetId', 'type', 'isEdited']).doUpdateSet((eb) => ({
+        oc.columns(['assetId', 'type']).doUpdateSet((eb) => ({
           path: eb.ref('excluded.path'),
         })),
       )
       .execute();
   }
 
-  async upsertFiles(
-    files: Pick<Insertable<AssetFileTable>, 'assetId' | 'path' | 'type' | 'isEdited'>[],
-  ): Promise<void> {
+  async upsertFiles(files: Pick<Insertable<AssetFileTable>, 'assetId' | 'path' | 'type'>[]): Promise<void> {
     if (files.length === 0) {
       return;
     }
@@ -929,7 +926,7 @@ export class AssetRepository {
       .insertInto('asset_file')
       .values(values)
       .onConflict((oc) =>
-        oc.columns(['assetId', 'type', 'isEdited']).doUpdateSet((eb) => ({
+        oc.columns(['assetId', 'type']).doUpdateSet((eb) => ({
           path: eb.ref('excluded.path'),
         })),
       )

server/src/schema/migrations/1768828334807-AddIsEditedToAssetFile.ts

@@ -1,13 +0,0 @@
-import { Kysely, sql } from 'kysely';
-
-export async function up(db: Kysely<any>): Promise<void> {
-  await sql`ALTER TABLE "asset_file" DROP CONSTRAINT "asset_file_assetId_type_uq";`.execute(db);
-  await sql`ALTER TABLE "asset_file" ADD "isEdited" boolean NOT NULL DEFAULT false;`.execute(db);
-  await sql`ALTER TABLE "asset_file" ADD CONSTRAINT "asset_file_assetId_type_isEdited_uq" UNIQUE ("assetId", "type", "isEdited");`.execute(db);
-}
-
-export async function down(db: Kysely<any>): Promise<void> {
-  await sql`ALTER TABLE "asset_file" DROP CONSTRAINT "asset_file_assetId_type_isEdited_uq";`.execute(db);
-  await sql`ALTER TABLE "asset_file" ADD CONSTRAINT "asset_file_assetId_type_uq" UNIQUE ("assetId", "type");`.execute(db);
-  await sql`ALTER TABLE "asset_file" DROP COLUMN "isEdited";`.execute(db);
-}

server/src/schema/migrations/1768847456553-AddTagsToExif.ts

@@ -1,9 +0,0 @@
-import { Kysely, sql } from 'kysely';
-
-export async function up(db: Kysely<any>): Promise<void> {
-  await sql`ALTER TABLE "asset_exif" ADD "tags" character varying[];`.execute(db);
-}
-
-export async function down(db: Kysely<any>): Promise<void> {
-  await sql`ALTER TABLE "asset_exif" DROP COLUMN "tags";`.execute(db);
-}

server/src/schema/migrations/1769105700133-AddAssetEditSequence.ts

@@ -1,14 +0,0 @@
-import { Kysely, sql } from 'kysely';
-
-export async function up(db: Kysely<any>): Promise<void> {
-  await sql`DELETE FROM "asset_edit";`.execute(db);
-  await sql`ALTER TABLE "asset_edit" ADD "sequence" integer NOT NULL;`.execute(db);
-  await sql`ALTER TABLE "asset_edit" ADD CONSTRAINT "asset_edit_assetId_sequence_uq" UNIQUE ("assetId", "sequence");`.execute(
-    db,
-  );
-}
-
-export async function down(db: Kysely<any>): Promise<void> {
-  await sql`ALTER TABLE "asset_edit" DROP CONSTRAINT "asset_edit_assetId_sequence_uq";`.execute(db);
-  await sql`ALTER TABLE "asset_edit" DROP COLUMN "sequence";`.execute(db);
-}

server/src/schema/tables/asset-edit.table.ts

@@ -9,7 +9,6 @@ import {
   Generated,
   PrimaryGeneratedColumn,
   Table,
-  Unique,
 } from 'src/sql-tools';
 
 @Table('asset_edit')
@@ -20,7 +19,6 @@ import {
   referencingOldTableAs: 'deleted_edit',
   when: 'pg_trigger_depth() = 0',
 })
-@Unique({ columns: ['assetId', 'sequence'] })
 export class AssetEditTable<T extends AssetEditAction = AssetEditAction> {
   @PrimaryGeneratedColumn()
   id!: Generated<string>;
@@ -33,7 +31,4 @@ export class AssetEditTable<T extends AssetEditAction = AssetEditAction> {
 
   @Column({ type: 'jsonb' })
   parameters!: AssetEditActionParameter[T];
-
-  @Column({ type: 'integer' })
-  sequence!: number;
 }

server/src/schema/tables/asset-exif.table.ts

@@ -93,9 +93,6 @@ export class AssetExifTable {
   @Column({ type: 'integer', nullable: true })
   rating!: number | null;
 
-  @Column({ type: 'character varying', array: true, nullable: true })
-  tags!: string[] | null;
-
   @UpdateDateColumn({ default: () => 'clock_timestamp()' })
   updatedAt!: Generated<Date>;
 

server/src/schema/tables/asset-file.table.ts

@@ -14,7 +14,7 @@ import {
 } from 'src/sql-tools';
 
 @Table('asset_file')
-@Unique({ columns: ['assetId', 'type', 'isEdited'] })
+@Unique({ columns: ['assetId', 'type'] })
 @UpdatedAtTrigger('asset_file_updatedAt')
 export class AssetFileTable {
   @PrimaryGeneratedColumn()
@@ -37,7 +37,4 @@ export class AssetFileTable {
 
   @UpdateIdColumn({ index: true })
   updateId!: Generated<string>;
-
-  @Column({ type: 'boolean', default: false })
-  isEdited!: Generated<boolean>;
 }

server/src/services/asset-media.service.spec.ts

@@ -529,10 +529,9 @@ describe(AssetMediaService.name, () => {
           ...assetStub.withCropEdit.files,
           {
             id: 'edited-file',
-            type: AssetFileType.FullSize,
+            type: AssetFileType.FullSizeEdited,
             path: '/uploads/user-id/fullsize/edited.jpg',
-            isEdited: true,
-          },
+          } as AssetFile,
         ],
       };
       mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1']));
@@ -555,10 +554,9 @@ describe(AssetMediaService.name, () => {
           ...assetStub.withCropEdit.files,
           {
             id: 'edited-file',
-            type: AssetFileType.FullSize,
+            type: AssetFileType.FullSizeEdited,
             path: '/uploads/user-id/fullsize/edited.jpg',
-            isEdited: true,
-          },
+          } as AssetFile,
         ],
       };
       mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1']));
@@ -581,10 +579,9 @@ describe(AssetMediaService.name, () => {
           ...assetStub.withCropEdit.files,
           {
             id: 'edited-file',
-            type: AssetFileType.FullSize,
+            type: AssetFileType.FullSizeEdited,
             path: '/uploads/user-id/fullsize/edited.jpg',
-            isEdited: true,
-          },
+          } as AssetFile,
         ],
       };
       mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1']));
@@ -659,7 +656,6 @@ describe(AssetMediaService.name, () => {
             id: '42',
             path: '/path/to/preview',
             type: AssetFileType.Thumbnail,
-            isEdited: false,
           },
         ],
       });
@@ -677,7 +673,6 @@ describe(AssetMediaService.name, () => {
             id: '42',
             path: '/path/to/preview.jpg',
             type: AssetFileType.Preview,
-            isEdited: false,
           },
         ],
       });

server/src/services/asset.service.ts

@@ -4,7 +4,7 @@ import { DateTime, Duration } from 'luxon';
 import { JOBS_ASSET_PAGINATION_SIZE } from 'src/constants';
 import { AssetFile } from 'src/database';
 import { OnJob } from 'src/decorators';
-import { AssetResponseDto, SanitizedAssetResponseDto, mapAsset } from 'src/dtos/asset-response.dto';
+import { AssetResponseDto, MapAsset, SanitizedAssetResponseDto, mapAsset } from 'src/dtos/asset-response.dto';
 import {
   AssetBulkDeleteDto,
   AssetBulkUpdateDto,
@@ -112,7 +112,7 @@ export class AssetService extends BaseService {
     const { description, dateTimeOriginal, latitude, longitude, rating, ...rest } = dto;
     const repos = { asset: this.assetRepository, event: this.eventRepository };
 
-    let previousMotion: { id: string } | null = null;
+    let previousMotion: MapAsset | null = null;
     if (rest.livePhotoVideoId) {
       await onBeforeLink(repos, { userId: auth.user.id, livePhotoVideoId: rest.livePhotoVideoId });
     } else if (rest.livePhotoVideoId === null) {

server/src/services/media.service.spec.ts

@@ -241,21 +241,21 @@ describe(MediaService.name, () => {
       await expect(sut.handleAssetMigration({ id: assetStub.image.id })).resolves.toBe(JobStatus.Success);
       expect(mocks.move.create).toHaveBeenCalledWith({
         entityId: assetStub.image.id,
-        pathType: AssetFileType.FullSize,
+        pathType: AssetPathType.FullSize,
         oldPath: '/uploads/user-id/fullsize/path.webp',
-        newPath: expect.stringContaining('/data/thumbs/user-id/as/se/asset-id_fullsize.jpeg'),
+        newPath: expect.stringContaining('/data/thumbs/user-id/as/se/asset-id-fullsize.jpeg'),
       });
       expect(mocks.move.create).toHaveBeenCalledWith({
         entityId: assetStub.image.id,
-        pathType: AssetFileType.Preview,
+        pathType: AssetPathType.Preview,
         oldPath: '/uploads/user-id/thumbs/path.jpg',
-        newPath: expect.stringContaining('/data/thumbs/user-id/as/se/asset-id_preview.jpeg'),
+        newPath: expect.stringContaining('/data/thumbs/user-id/as/se/asset-id-preview.jpeg'),
       });
       expect(mocks.move.create).toHaveBeenCalledWith({
         entityId: assetStub.image.id,
-        pathType: AssetFileType.Thumbnail,
+        pathType: AssetPathType.Thumbnail,
         oldPath: '/uploads/user-id/webp/path.ext',
-        newPath: expect.stringContaining('/data/thumbs/user-id/as/se/asset-id_thumbnail.webp'),
+        newPath: expect.stringContaining('/data/thumbs/user-id/as/se/asset-id-thumbnail.webp'),
       });
       expect(mocks.move.create).toHaveBeenCalledTimes(3);
     });
@@ -385,13 +385,11 @@ describe(MediaService.name, () => {
           assetId: 'asset-id',
           type: AssetFileType.Preview,
           path: expect.any(String),
-          isEdited: false,
         },
         {
           assetId: 'asset-id',
           type: AssetFileType.Thumbnail,
           path: expect.any(String),
-          isEdited: false,
         },
       ]);
       expect(mocks.asset.update).toHaveBeenCalledWith({ id: 'asset-id', thumbhash: thumbhashBuffer });
@@ -423,13 +421,11 @@ describe(MediaService.name, () => {
           assetId: 'asset-id',
           type: AssetFileType.Preview,
           path: expect.any(String),
-          isEdited: false,
         },
         {
           assetId: 'asset-id',
           type: AssetFileType.Thumbnail,
           path: expect.any(String),
-          isEdited: false,
         },
       ]);
     });
@@ -460,13 +456,11 @@ describe(MediaService.name, () => {
           assetId: 'asset-id',
           type: AssetFileType.Preview,
           path: expect.any(String),
-          isEdited: false,
         },
         {
           assetId: 'asset-id',
           type: AssetFileType.Thumbnail,
           path: expect.any(String),
-          isEdited: false,
         },
       ]);
     });
@@ -554,8 +548,8 @@ describe(MediaService.name, () => {
       mocks.assetJob.getForGenerateThumbnailJob.mockResolvedValue(assetStub.image);
       const thumbhashBuffer = Buffer.from('a thumbhash', 'utf8');
       mocks.media.generateThumbhash.mockResolvedValue(thumbhashBuffer);
-      const previewPath = `/data/thumbs/user-id/as/se/asset-id_preview.${format}`;
-      const thumbnailPath = `/data/thumbs/user-id/as/se/asset-id_thumbnail.webp`;
+      const previewPath = `/data/thumbs/user-id/as/se/asset-id-preview.${format}`;
+      const thumbnailPath = `/data/thumbs/user-id/as/se/asset-id-thumbnail.webp`;
 
       await sut.handleGenerateThumbnails({ id: assetStub.image.id });
 
@@ -601,8 +595,8 @@ describe(MediaService.name, () => {
       mocks.assetJob.getForGenerateThumbnailJob.mockResolvedValue(assetStub.image);
       const thumbhashBuffer = Buffer.from('a thumbhash', 'utf8');
       mocks.media.generateThumbhash.mockResolvedValue(thumbhashBuffer);
-      const previewPath = expect.stringContaining(`/data/thumbs/user-id/as/se/asset-id_preview.jpeg`);
-      const thumbnailPath = expect.stringContaining(`/data/thumbs/user-id/as/se/asset-id_thumbnail.${format}`);
+      const previewPath = expect.stringContaining(`/data/thumbs/user-id/as/se/asset-id-preview.jpeg`);
+      const thumbnailPath = expect.stringContaining(`/data/thumbs/user-id/as/se/asset-id-thumbnail.${format}`);
 
       await sut.handleGenerateThumbnails({ id: assetStub.image.id });
 
@@ -1032,9 +1026,9 @@ describe(MediaService.name, () => {
 
       expect(mocks.asset.upsertFiles).toHaveBeenCalledWith(
         expect.arrayContaining([
-          expect.objectContaining({ type: AssetFileType.FullSize, isEdited: true }),
-          expect.objectContaining({ type: AssetFileType.Preview, isEdited: true }),
-          expect.objectContaining({ type: AssetFileType.Thumbnail, isEdited: true }),
+          expect.objectContaining({ type: AssetFileType.FullSizeEdited }),
+          expect.objectContaining({ type: AssetFileType.PreviewEdited }),
+          expect.objectContaining({ type: AssetFileType.ThumbnailEdited }),
         ]),
       );
     });
@@ -1104,17 +1098,17 @@ describe(MediaService.name, () => {
       expect(mocks.media.generateThumbnail).toHaveBeenCalledWith(
         rawBuffer,
         expect.anything(),
-        expect.stringContaining('preview_edited.jpeg'),
+        expect.stringContaining('edited_preview.jpeg'),
       );
       expect(mocks.media.generateThumbnail).toHaveBeenCalledWith(
         rawBuffer,
         expect.anything(),
-        expect.stringContaining('thumbnail_edited.webp'),
+        expect.stringContaining('edited_thumbnail.webp'),
       );
       expect(mocks.media.generateThumbnail).toHaveBeenCalledWith(
         rawBuffer,
         expect.anything(),
-        expect.stringContaining('fullsize_edited.jpeg'),
+        expect.stringContaining('edited_fullsize.jpeg'),
       );
     });
 
@@ -3260,13 +3254,13 @@ describe(MediaService.name, () => {
       };
 
       await sut['syncFiles'](asset, [
-        { type: AssetFileType.Preview, newPath: '/new/preview.jpg', isEdited: false },
-        { type: AssetFileType.Thumbnail, newPath: '/new/thumbnail.jpg', isEdited: false },
+        { type: AssetFileType.Preview, newPath: '/new/preview.jpg' },
+        { type: AssetFileType.Thumbnail, newPath: '/new/thumbnail.jpg' },
       ]);
 
       expect(mocks.asset.upsertFiles).toHaveBeenCalledWith([
-        { assetId: 'asset-id', path: '/new/preview.jpg', type: AssetFileType.Preview, isEdited: false },
-        { assetId: 'asset-id', path: '/new/thumbnail.jpg', type: AssetFileType.Thumbnail, isEdited: false },
+        { assetId: 'asset-id', path: '/new/preview.jpg', type: AssetFileType.Preview },
+        { assetId: 'asset-id', path: '/new/thumbnail.jpg', type: AssetFileType.Thumbnail },
       ]);
       expect(mocks.asset.deleteFiles).not.toHaveBeenCalled();
       expect(mocks.job.queue).not.toHaveBeenCalled();
@@ -3276,31 +3270,19 @@ describe(MediaService.name, () => {
       const asset = {
         id: 'asset-id',
         files: [
-          {
-            id: 'file-1',
-            assetId: 'asset-id',
-            type: AssetFileType.Preview,
-            path: '/old/preview.jpg',
-            isEdited: false,
-          },
-          {
-            id: 'file-2',
-            assetId: 'asset-id',
-            type: AssetFileType.Thumbnail,
-            path: '/old/thumbnail.jpg',
-            isEdited: false,
-          },
+          { id: 'file-1', assetId: 'asset-id', type: AssetFileType.Preview, path: '/old/preview.jpg' },
+          { id: 'file-2', assetId: 'asset-id', type: AssetFileType.Thumbnail, path: '/old/thumbnail.jpg' },
         ],
       };
 
       await sut['syncFiles'](asset, [
-        { type: AssetFileType.Preview, newPath: '/new/preview.jpg', isEdited: false },
-        { type: AssetFileType.Thumbnail, newPath: '/new/thumbnail.jpg', isEdited: false },
+        { type: AssetFileType.Preview, newPath: '/new/preview.jpg' },
+        { type: AssetFileType.Thumbnail, newPath: '/new/thumbnail.jpg' },
       ]);
 
       expect(mocks.asset.upsertFiles).toHaveBeenCalledWith([
-        { assetId: 'asset-id', path: '/new/preview.jpg', type: AssetFileType.Preview, isEdited: false },
-        { assetId: 'asset-id', path: '/new/thumbnail.jpg', type: AssetFileType.Thumbnail, isEdited: false },
+        { assetId: 'asset-id', path: '/new/preview.jpg', type: AssetFileType.Preview },
+        { assetId: 'asset-id', path: '/new/thumbnail.jpg', type: AssetFileType.Thumbnail },
       ]);
       expect(mocks.asset.deleteFiles).not.toHaveBeenCalled();
       expect(mocks.job.queue).toHaveBeenCalledWith({
@@ -3313,38 +3295,17 @@ describe(MediaService.name, () => {
       const asset = {
         id: 'asset-id',
         files: [
-          {
-            id: 'file-1',
-            assetId: 'asset-id',
-            type: AssetFileType.Preview,
-            path: '/old/preview.jpg',
-            isEdited: false,
-          },
-          {
-            id: 'file-2',
-            assetId: 'asset-id',
-            type: AssetFileType.Thumbnail,
-            path: '/old/thumbnail.jpg',
-            isEdited: false,
-          },
+          { id: 'file-1', assetId: 'asset-id', type: AssetFileType.Preview, path: '/old/preview.jpg' },
+          { id: 'file-2', assetId: 'asset-id', type: AssetFileType.Thumbnail, path: '/old/thumbnail.jpg' },
         ],
       };
 
-      await sut['syncFiles'](asset, [
-        { type: AssetFileType.Preview, isEdited: false },
-        { type: AssetFileType.Thumbnail, isEdited: false },
-      ]);
+      await sut['syncFiles'](asset, [{ type: AssetFileType.Preview }, { type: AssetFileType.Thumbnail }]);
 
       expect(mocks.asset.upsertFiles).not.toHaveBeenCalled();
       expect(mocks.asset.deleteFiles).toHaveBeenCalledWith([
-        { id: 'file-1', assetId: 'asset-id', type: AssetFileType.Preview, path: '/old/preview.jpg', isEdited: false },
-        {
-          id: 'file-2',
-          assetId: 'asset-id',
-          type: AssetFileType.Thumbnail,
-          path: '/old/thumbnail.jpg',
-          isEdited: false,
-        },
+        { id: 'file-1', assetId: 'asset-id', type: AssetFileType.Preview, path: '/old/preview.jpg' },
+        { id: 'file-2', assetId: 'asset-id', type: AssetFileType.Thumbnail, path: '/old/thumbnail.jpg' },
       ]);
       expect(mocks.job.queue).toHaveBeenCalledWith({
         name: JobName.FileDelete,
@@ -3356,26 +3317,14 @@ describe(MediaService.name, () => {
       const asset = {
         id: 'asset-id',
         files: [
-          {
-            id: 'file-1',
-            assetId: 'asset-id',
-            type: AssetFileType.Preview,
-            path: '/same/preview.jpg',
-            isEdited: false,
-          },
-          {
-            id: 'file-2',
-            assetId: 'asset-id',
-            type: AssetFileType.Thumbnail,
-            path: '/same/thumbnail.jpg',
-            isEdited: false,
-          },
+          { id: 'file-1', assetId: 'asset-id', type: AssetFileType.Preview, path: '/same/preview.jpg' },
+          { id: 'file-2', assetId: 'asset-id', type: AssetFileType.Thumbnail, path: '/same/thumbnail.jpg' },
         ],
       };
 
       await sut['syncFiles'](asset, [
-        { type: AssetFileType.Preview, newPath: '/same/preview.jpg', isEdited: false },
-        { type: AssetFileType.Thumbnail, newPath: '/same/thumbnail.jpg', isEdited: false },
+        { type: AssetFileType.Preview, newPath: '/same/preview.jpg' },
+        { type: AssetFileType.Thumbnail, newPath: '/same/thumbnail.jpg' },
       ]);
 
       expect(mocks.asset.upsertFiles).not.toHaveBeenCalled();
@@ -3387,41 +3336,23 @@ describe(MediaService.name, () => {
       const asset = {
         id: 'asset-id',
         files: [
-          {
-            id: 'file-1',
-            assetId: 'asset-id',
-            type: AssetFileType.Preview,
-            path: '/old/preview.jpg',
-            isEdited: false,
-          },
-          {
-            id: 'file-2',
-            assetId: 'asset-id',
-            type: AssetFileType.Thumbnail,
-            path: '/old/thumbnail.jpg',
-            isEdited: false,
-          },
+          { id: 'file-1', assetId: 'asset-id', type: AssetFileType.Preview, path: '/old/preview.jpg' },
+          { id: 'file-2', assetId: 'asset-id', type: AssetFileType.Thumbnail, path: '/old/thumbnail.jpg' },
         ],
       };
 
       await sut['syncFiles'](asset, [
-        { type: AssetFileType.Preview, newPath: '/new/preview.jpg', isEdited: false }, // replace
-        { type: AssetFileType.Thumbnail, isEdited: false }, // delete
-        { type: AssetFileType.FullSize, newPath: '/new/fullsize.jpg', isEdited: false }, // new
+        { type: AssetFileType.Preview, newPath: '/new/preview.jpg' }, // replace
+        { type: AssetFileType.Thumbnail }, // delete
+        { type: AssetFileType.FullSize, newPath: '/new/fullsize.jpg' }, // new
       ]);
 
       expect(mocks.asset.upsertFiles).toHaveBeenCalledWith([
-        { assetId: 'asset-id', path: '/new/preview.jpg', type: AssetFileType.Preview, isEdited: false },
-        { assetId: 'asset-id', path: '/new/fullsize.jpg', type: AssetFileType.FullSize, isEdited: false },
+        { assetId: 'asset-id', path: '/new/preview.jpg', type: AssetFileType.Preview },
+        { assetId: 'asset-id', path: '/new/fullsize.jpg', type: AssetFileType.FullSize },
       ]);
       expect(mocks.asset.deleteFiles).toHaveBeenCalledWith([
-        {
-          id: 'file-2',
-          assetId: 'asset-id',
-          type: AssetFileType.Thumbnail,
-          path: '/old/thumbnail.jpg',
-          isEdited: false,
-        },
+        { id: 'file-2', assetId: 'asset-id', type: AssetFileType.Thumbnail, path: '/old/thumbnail.jpg' },
       ]);
       expect(mocks.job.queue).toHaveBeenCalledWith({
         name: JobName.FileDelete,
@@ -3445,19 +3376,11 @@ describe(MediaService.name, () => {
     it('should delete non-existent file types when newPath is not provided', async () => {
       const asset = {
         id: 'asset-id',
-        files: [
-          {
-            id: 'file-1',
-            assetId: 'asset-id',
-            type: AssetFileType.Preview,
-            path: '/old/preview.jpg',
-            isEdited: false,
-          },
-        ],
+        files: [{ id: 'file-1', assetId: 'asset-id', type: AssetFileType.Preview, path: '/old/preview.jpg' }],
       };
 
       await sut['syncFiles'](asset, [
-        { type: AssetFileType.Thumbnail, isEdited: false }, // file doesn't exist, newPath not provided
+        { type: AssetFileType.Thumbnail }, // file doesn't exist, newPath not provided
       ]);
 
       expect(mocks.asset.upsertFiles).not.toHaveBeenCalled();

server/src/services/media.service.ts

@@ -8,6 +8,7 @@ import { AssetEditAction, CropParameters } from 'src/dtos/editing.dto';
 import { SystemConfigFFmpegDto } from 'src/dtos/system-config.dto';
 import {
   AssetFileType,
+  AssetPathType,
   AssetType,
   AssetVisibility,
   AudioCodec,
@@ -49,7 +50,6 @@ interface UpsertFileOptions {
   assetId: string;
   type: AssetFileType;
   path: string;
-  isEdited: boolean;
 }
 
 type ThumbnailAsset = NonNullable<Awaited<ReturnType<AssetJobRepository['getForGenerateThumbnailJob']>>>;
@@ -160,9 +160,9 @@ export class MediaService extends BaseService {
       return JobStatus.Failed;
     }
 
-    await this.storageCore.moveAssetImage(asset, AssetFileType.FullSize, image.fullsize.format);
-    await this.storageCore.moveAssetImage(asset, AssetFileType.Preview, image.preview.format);
-    await this.storageCore.moveAssetImage(asset, AssetFileType.Thumbnail, image.thumbnail.format);
+    await this.storageCore.moveAssetImage(asset, AssetPathType.FullSize, image.fullsize.format);
+    await this.storageCore.moveAssetImage(asset, AssetPathType.Preview, image.preview.format);
+    await this.storageCore.moveAssetImage(asset, AssetPathType.Thumbnail, image.thumbnail.format);
     await this.storageCore.moveAssetVideo(asset);
 
     return JobStatus.Success;
@@ -236,9 +236,9 @@ export class MediaService extends BaseService {
     }
 
     await this.syncFiles(asset, [
-      { type: AssetFileType.Preview, newPath: generated.previewPath, isEdited: false },
-      { type: AssetFileType.Thumbnail, newPath: generated.thumbnailPath, isEdited: false },
-      { type: AssetFileType.FullSize, newPath: generated.fullsizePath, isEdited: false },
+      { type: AssetFileType.Preview, newPath: generated.previewPath },
+      { type: AssetFileType.Thumbnail, newPath: generated.thumbnailPath },
+      { type: AssetFileType.FullSize, newPath: generated.fullsizePath },
     ]);
 
     const editiedGenerated = await this.generateEditedThumbnails(asset);
@@ -307,16 +307,16 @@ export class MediaService extends BaseService {
 
   private async generateImageThumbnails(asset: ThumbnailAsset, useEdits: boolean = false) {
     const { image } = await this.getConfig({ withCache: true });
-    const previewPath = StorageCore.getImagePath(asset, {
-      fileType: AssetFileType.Preview,
-      isEdited: useEdits,
-      format: image.preview.format,
-    });
-    const thumbnailPath = StorageCore.getImagePath(asset, {
-      fileType: AssetFileType.Thumbnail,
-      isEdited: useEdits,
-      format: image.thumbnail.format,
-    });
+    const previewPath = StorageCore.getImagePath(
+      asset,
+      useEdits ? AssetPathType.EditedPreview : AssetPathType.Preview,
+      image.preview.format,
+    );
+    const thumbnailPath = StorageCore.getImagePath(
+      asset,
+      useEdits ? AssetPathType.EditedThumbnail : AssetPathType.Thumbnail,
+      image.thumbnail.format,
+    );
     this.storageCore.ensureFolders(previewPath);
 
     // Handle embedded preview extraction for RAW files
@@ -343,11 +343,11 @@ export class MediaService extends BaseService {
 
     if (convertFullsize) {
       // convert a new fullsize image from the same source as the thumbnail
-      fullsizePath = StorageCore.getImagePath(asset, {
-        fileType: AssetFileType.FullSize,
-        isEdited: useEdits,
-        format: image.fullsize.format,
-      });
+      fullsizePath = StorageCore.getImagePath(
+        asset,
+        useEdits ? AssetPathType.EditedFullSize : AssetPathType.FullSize,
+        image.fullsize.format,
+      );
       const fullsizeOptions = {
         format: image.fullsize.format,
         quality: image.fullsize.quality,
@@ -355,11 +355,7 @@ export class MediaService extends BaseService {
       };
       promises.push(this.mediaRepository.generateThumbnail(data, fullsizeOptions, fullsizePath));
     } else if (generateFullsize && extracted && extracted.format === RawExtractedFormat.Jpeg) {
-      fullsizePath = StorageCore.getImagePath(asset, {
-        fileType: AssetFileType.FullSize,
-        format: extracted.format,
-        isEdited: false,
-      });
+      fullsizePath = StorageCore.getImagePath(asset, AssetPathType.FullSize, extracted.format);
       this.storageCore.ensureFolders(fullsizePath);
 
       // Write the buffer to disk with essential EXIF data
@@ -493,16 +489,8 @@ export class MediaService extends BaseService {
 
   private async generateVideoThumbnails(asset: ThumbnailPathEntity & { originalPath: string }) {
     const { image, ffmpeg } = await this.getConfig({ withCache: true });
-    const previewPath = StorageCore.getImagePath(asset, {
-      fileType: AssetFileType.Preview,
-      format: image.preview.format,
-      isEdited: false,
-    });
-    const thumbnailPath = StorageCore.getImagePath(asset, {
-      fileType: AssetFileType.Thumbnail,
-      format: image.thumbnail.format,
-      isEdited: false,
-    });
+    const previewPath = StorageCore.getImagePath(asset, AssetPathType.Preview, image.preview.format);
+    const thumbnailPath = StorageCore.getImagePath(asset, AssetPathType.Thumbnail, image.thumbnail.format);
     this.storageCore.ensureFolders(previewPath);
 
     const { format, audioStreams, videoStreams } = await this.mediaRepository.probe(asset.originalPath);
@@ -791,18 +779,18 @@ export class MediaService extends BaseService {
 
   private async syncFiles(
     asset: { id: string; files: AssetFile[] },
-    files: { type: AssetFileType; newPath?: string; isEdited: boolean }[],
+    files: { type: AssetFileType; newPath?: string }[],
   ) {
     const toUpsert: UpsertFileOptions[] = [];
     const pathsToDelete: string[] = [];
     const toDelete: AssetFile[] = [];
 
-    for (const { type, newPath, isEdited } of files) {
-      const existingFile = asset.files.find((file) => file.type === type && file.isEdited === isEdited);
+    for (const { type, newPath } of files) {
+      const existingFile = asset.files.find((file) => file.type === type);
 
       // upsert new file path
       if (newPath && existingFile?.path !== newPath) {
-        toUpsert.push({ assetId: asset.id, path: newPath, type, isEdited });
+        toUpsert.push({ assetId: asset.id, path: newPath, type });
 
         // delete old file from disk
         if (existingFile) {
@@ -841,9 +829,9 @@ export class MediaService extends BaseService {
     const generated = asset.edits.length > 0 ? await this.generateImageThumbnails(asset, true) : undefined;
 
     await this.syncFiles(asset, [
-      { type: AssetFileType.Preview, newPath: generated?.previewPath, isEdited: true },
-      { type: AssetFileType.Thumbnail, newPath: generated?.thumbnailPath, isEdited: true },
-      { type: AssetFileType.FullSize, newPath: generated?.fullsizePath, isEdited: true },
+      { type: AssetFileType.PreviewEdited, newPath: generated?.previewPath },
+      { type: AssetFileType.ThumbnailEdited, newPath: generated?.thumbnailPath },
+      { type: AssetFileType.FullSizeEdited, newPath: generated?.fullsizePath },
     ]);
 
     const crop = asset.edits.find((e) => e.action === AssetEditAction.Crop);

server/src/services/metadata.service.spec.ts

@@ -35,7 +35,7 @@ const forSidecarJob = (
   asset: {
     id?: string;
     originalPath?: string;
-    files?: { id: string; type: AssetFileType; path: string; isEdited: boolean }[];
+    files?: { id: string; type: AssetFileType; path: string }[];
   } = {},
 ) => {
   return {
@@ -387,7 +387,6 @@ describe(MetadataService.name, () => {
 
     it('should extract tags from TagsList', async () => {
       mocks.assetJob.getForMetadataExtraction.mockResolvedValue(removeNonSidecarFiles(assetStub.image));
-      mocks.asset.getById.mockResolvedValue({ ...factory.asset(), exifInfo: factory.exif({ tags: ['Parent'] }) });
       mockReadTags({ TagsList: ['Parent'] });
       mocks.tag.upsertValue.mockResolvedValue(tagStub.parentUpsert);
 
@@ -398,7 +397,6 @@ describe(MetadataService.name, () => {
 
     it('should extract hierarchy from TagsList', async () => {
       mocks.assetJob.getForMetadataExtraction.mockResolvedValue(removeNonSidecarFiles(assetStub.image));
-      mocks.asset.getById.mockResolvedValue({ ...factory.asset(), exifInfo: factory.exif({ tags: ['Parent/Child'] }) });
       mockReadTags({ TagsList: ['Parent/Child'] });
       mocks.tag.upsertValue.mockResolvedValueOnce(tagStub.parentUpsert);
       mocks.tag.upsertValue.mockResolvedValueOnce(tagStub.childUpsert);
@@ -419,7 +417,6 @@ describe(MetadataService.name, () => {
 
     it('should extract tags from Keywords as a string', async () => {
       mocks.assetJob.getForMetadataExtraction.mockResolvedValue(removeNonSidecarFiles(assetStub.image));
-      mocks.asset.getById.mockResolvedValue({ ...factory.asset(), exifInfo: factory.exif({ tags: ['Parent'] }) });
       mockReadTags({ Keywords: 'Parent' });
       mocks.tag.upsertValue.mockResolvedValue(tagStub.parentUpsert);
 
@@ -430,7 +427,6 @@ describe(MetadataService.name, () => {
 
     it('should extract tags from Keywords as a list', async () => {
       mocks.assetJob.getForMetadataExtraction.mockResolvedValue(removeNonSidecarFiles(assetStub.image));
-      mocks.asset.getById.mockResolvedValue({ ...factory.asset(), exifInfo: factory.exif({ tags: ['Parent'] }) });
       mockReadTags({ Keywords: ['Parent'] });
       mocks.tag.upsertValue.mockResolvedValue(tagStub.parentUpsert);
 
@@ -441,10 +437,6 @@ describe(MetadataService.name, () => {
 
     it('should extract tags from Keywords as a list with a number', async () => {
       mocks.assetJob.getForMetadataExtraction.mockResolvedValue(removeNonSidecarFiles(assetStub.image));
-      mocks.asset.getById.mockResolvedValue({
-        ...factory.asset(),
-        exifInfo: factory.exif({ tags: ['Parent', '2024'] }),
-      });
       mockReadTags({ Keywords: ['Parent', 2024] });
       mocks.tag.upsertValue.mockResolvedValue(tagStub.parentUpsert);
 
@@ -456,7 +448,6 @@ describe(MetadataService.name, () => {
 
     it('should extract hierarchal tags from Keywords', async () => {
       mocks.assetJob.getForMetadataExtraction.mockResolvedValue(removeNonSidecarFiles(assetStub.image));
-      mocks.asset.getById.mockResolvedValue({ ...factory.asset(), exifInfo: factory.exif({ tags: ['Parent/Child'] }) });
       mockReadTags({ Keywords: 'Parent/Child' });
       mocks.tag.upsertValue.mockResolvedValue(tagStub.parentUpsert);
 
@@ -476,10 +467,6 @@ describe(MetadataService.name, () => {
 
     it('should ignore Keywords when TagsList is present', async () => {
       mocks.assetJob.getForMetadataExtraction.mockResolvedValue(removeNonSidecarFiles(assetStub.image));
-      mocks.asset.getById.mockResolvedValue({
-        ...factory.asset(),
-        exifInfo: factory.exif({ tags: ['Parent/Child', 'Child'] }),
-      });
       mockReadTags({ Keywords: 'Child', TagsList: ['Parent/Child'] });
       mocks.tag.upsertValue.mockResolvedValue(tagStub.parentUpsert);
 
@@ -499,10 +486,6 @@ describe(MetadataService.name, () => {
 
     it('should extract hierarchy from HierarchicalSubject', async () => {
       mocks.assetJob.getForMetadataExtraction.mockResolvedValue(removeNonSidecarFiles(assetStub.image));
-      mocks.asset.getById.mockResolvedValue({
-        ...factory.asset(),
-        exifInfo: factory.exif({ tags: ['Parent/Child', 'TagA'] }),
-      });
       mockReadTags({ HierarchicalSubject: ['Parent|Child', 'TagA'] });
       mocks.tag.upsertValue.mockResolvedValueOnce(tagStub.parentUpsert);
       mocks.tag.upsertValue.mockResolvedValueOnce(tagStub.childUpsert);
@@ -524,10 +507,6 @@ describe(MetadataService.name, () => {
 
     it('should extract tags from HierarchicalSubject as a list with a number', async () => {
       mocks.assetJob.getForMetadataExtraction.mockResolvedValue(removeNonSidecarFiles(assetStub.image));
-      mocks.asset.getById.mockResolvedValue({
-        ...factory.asset(),
-        exifInfo: factory.exif({ tags: ['Parent', '2024'] }),
-      });
       mockReadTags({ HierarchicalSubject: ['Parent', 2024] });
       mocks.tag.upsertValue.mockResolvedValue(tagStub.parentUpsert);
 
@@ -539,7 +518,6 @@ describe(MetadataService.name, () => {
 
     it('should extract ignore / characters in a HierarchicalSubject tag', async () => {
       mocks.assetJob.getForMetadataExtraction.mockResolvedValue(assetStub.image);
-      mocks.asset.getById.mockResolvedValue({ ...factory.asset(), exifInfo: factory.exif({ tags: ['Mom|Dad'] }) });
       mockReadTags({ HierarchicalSubject: ['Mom/Dad'] });
       mocks.tag.upsertValue.mockResolvedValueOnce(tagStub.parentUpsert);
 
@@ -554,10 +532,6 @@ describe(MetadataService.name, () => {
 
     it('should ignore HierarchicalSubject when TagsList is present', async () => {
       mocks.assetJob.getForMetadataExtraction.mockResolvedValue(assetStub.image);
-      mocks.asset.getById.mockResolvedValue({
-        ...factory.asset(),
-        exifInfo: factory.exif({ tags: ['Parent/Child', 'Parent2/Child2'] }),
-      });
       mockReadTags({ HierarchicalSubject: ['Parent2|Child2'], TagsList: ['Parent/Child'] });
       mocks.tag.upsertValue.mockResolvedValue(tagStub.parentUpsert);
 
@@ -922,7 +896,6 @@ describe(MetadataService.name, () => {
         ProfileDescription: 'extensive description',
         ProjectionType: 'equirectangular',
         tz: 'UTC-11:30',
-        TagsList: ['parent/child'],
         Rating: 3,
       };
 
@@ -962,7 +935,6 @@ describe(MetadataService.name, () => {
           country: null,
           state: null,
           city: null,
-          tags: ['parent/child'],
         },
         { lockedPropertiesBehavior: 'skip' },
       );
@@ -1112,7 +1084,6 @@ describe(MetadataService.name, () => {
             id: 'some-id',
             type: AssetFileType.Sidecar,
             path: '/path/to/something',
-            isEdited: false,
           },
         ],
       });
@@ -1720,7 +1691,7 @@ describe(MetadataService.name, () => {
     it('should unset sidecar path if file no longer exist', async () => {
       const asset = forSidecarJob({
         originalPath: '/path/to/IMG_123.jpg',
-        files: [{ id: 'sidecar', path: '/path/to/IMG_123.jpg.xmp', type: AssetFileType.Sidecar, isEdited: false }],
+        files: [{ id: 'sidecar', path: '/path/to/IMG_123.jpg.xmp', type: AssetFileType.Sidecar }],
       });
       mocks.assetJob.getForSidecarCheckJob.mockResolvedValue(asset);
       mocks.storage.checkFileExists.mockResolvedValue(false);
@@ -1733,7 +1704,7 @@ describe(MetadataService.name, () => {
     it('should do nothing if the sidecar file still exists', async () => {
       const asset = forSidecarJob({
         originalPath: '/path/to/IMG_123.jpg',
-        files: [{ id: 'sidecar', path: '/path/to/IMG_123.jpg.xmp', type: AssetFileType.Sidecar, isEdited: false }],
+        files: [{ id: 'sidecar', path: '/path/to/IMG_123.jpg.xmp', type: AssetFileType.Sidecar }],
       });
 
       mocks.assetJob.getForSidecarCheckJob.mockResolvedValue(asset);

server/src/services/metadata.service.ts

@@ -254,8 +254,6 @@ export class MetadataService extends BaseService {
       }
     }
 
-    const tags = this.getTagList(exifTags);
-
     const exifData: Insertable<AssetExifTable> = {
       assetId: asset.id,
 
@@ -298,8 +296,6 @@ export class MetadataService extends BaseService {
       // grouping
       livePhotoCID: (exifTags.ContentIdentifier || exifTags.MediaGroupUUID) ?? null,
       autoStackId: this.getAutoStackId(exifTags),
-
-      tags: tags.length > 0 ? tags : null,
     };
 
     const isSidewards = exifTags.Orientation && this.isOrientationSidewards(exifTags.Orientation);
@@ -320,10 +316,9 @@ export class MetadataService extends BaseService {
         width: asset.width == null ? assetWidth : undefined,
         height: asset.height == null ? assetHeight : undefined,
       }),
+      this.applyTagList(asset, exifTags),
     ];
 
-    await this.applyTagList(asset);
-
     if (this.isMotionPhoto(asset, exifTags)) {
       promises.push(this.applyMotionPhotos(asset, exifTags, dates, stats));
     }
@@ -410,35 +405,35 @@ export class MetadataService extends BaseService {
 
   @OnEvent({ name: 'AssetTag' })
   async handleTagAsset({ assetId }: ArgOf<'AssetTag'>) {
-    await this.jobRepository.queue({ name: JobName.SidecarWrite, data: { id: assetId } });
+    await this.jobRepository.queue({ name: JobName.SidecarWrite, data: { id: assetId, tags: true } });
   }
 
   @OnEvent({ name: 'AssetUntag' })
   async handleUntagAsset({ assetId }: ArgOf<'AssetUntag'>) {
-    await this.jobRepository.queue({ name: JobName.SidecarWrite, data: { id: assetId } });
+    await this.jobRepository.queue({ name: JobName.SidecarWrite, data: { id: assetId, tags: true } });
   }
 
   @OnJob({ name: JobName.SidecarWrite, queue: QueueName.Sidecar })
   async handleSidecarWrite(job: JobOf<JobName.SidecarWrite>): Promise<JobStatus> {
-    const { id } = job;
+    const { id, tags } = job;
     const asset = await this.assetJobRepository.getForSidecarWriteJob(id);
     if (!asset) {
       return JobStatus.Failed;
     }
 
     const lockedProperties = await this.assetJobRepository.getLockedPropertiesForMetadataExtraction(id);
+    const tagsList = (asset.tags || []).map((tag) => tag.value);
 
     const { sidecarFile } = getAssetFiles(asset.files);
     const sidecarPath = sidecarFile?.path || `${asset.originalPath}.xmp`;
 
-    const { description, dateTimeOriginal, latitude, longitude, rating, tags } = _.pick(
+    const { description, dateTimeOriginal, latitude, longitude, rating } = _.pick(
       {
         description: asset.exifInfo.description,
         dateTimeOriginal: asset.exifInfo.dateTimeOriginal,
         latitude: asset.exifInfo.latitude,
         longitude: asset.exifInfo.longitude,
         rating: asset.exifInfo.rating,
-        tags: asset.exifInfo.tags,
       },
       lockedProperties,
     );
@@ -451,7 +446,7 @@ export class MetadataService extends BaseService {
         GPSLatitude: latitude,
         GPSLongitude: longitude,
         Rating: rating,
-        TagsList: tags?.length ? tags : undefined,
+        TagsList: tags ? tagsList : undefined,
       },
       _.isUndefined,
     );
@@ -565,14 +560,11 @@ export class MetadataService extends BaseService {
     return tags;
   }
 
-  private async applyTagList({ id, ownerId }: { id: string; ownerId: string }) {
-    const asset = await this.assetRepository.getById(id, { exifInfo: true });
-    const results = await upsertTags(this.tagRepository, {
-      userId: ownerId,
-      tags: asset?.exifInfo?.tags ?? [],
-    });
+  private async applyTagList(asset: { id: string; ownerId: string }, exifTags: ImmichTags) {
+    const tags = this.getTagList(exifTags);
+    const results = await upsertTags(this.tagRepository, { userId: asset.ownerId, tags });
     await this.tagRepository.replaceAssetTags(
-      id,
+      asset.id,
       results.map((tag) => tag.id),
     );
   }

server/src/services/notification.service.spec.ts

@@ -372,7 +372,7 @@ describe(NotificationService.name, () => {
       mocks.notification.create.mockResolvedValue(notificationStub.albumEvent);
       mocks.email.renderEmail.mockResolvedValue({ html: '', text: '' });
       mocks.assetJob.getAlbumThumbnailFiles.mockResolvedValue([
-        { id: '1', type: AssetFileType.Thumbnail, path: 'path-to-thumb.jpg', isEdited: false },
+        { id: '1', type: AssetFileType.Thumbnail, path: 'path-to-thumb.jpg' },
       ]);
 
       await expect(sut.handleAlbumInvite({ id: '', recipientId: '' })).resolves.toBe(JobStatus.Success);
@@ -403,7 +403,7 @@ describe(NotificationService.name, () => {
       mocks.systemMetadata.get.mockResolvedValue({ server: {} });
       mocks.notification.create.mockResolvedValue(notificationStub.albumEvent);
       mocks.email.renderEmail.mockResolvedValue({ html: '', text: '' });
-      mocks.assetJob.getAlbumThumbnailFiles.mockResolvedValue([{ ...assetStub.image.files[2], isEdited: false }]);
+      mocks.assetJob.getAlbumThumbnailFiles.mockResolvedValue([assetStub.image.files[2]]);
 
       await expect(sut.handleAlbumInvite({ id: '', recipientId: '' })).resolves.toBe(JobStatus.Success);
       expect(mocks.assetJob.getAlbumThumbnailFiles).toHaveBeenCalledWith(

server/src/services/storage-template.service.ts

@@ -240,11 +240,11 @@ export class StorageTemplateService extends BaseService {
           assetInfo: { sizeInBytes: fileSizeInByte, checksum },
         });
 
-        const sidecarPath = getAssetFile(asset.files, AssetFileType.Sidecar, { isEdited: false })?.path;
+        const sidecarPath = getAssetFile(asset.files, AssetFileType.Sidecar)?.path;
         if (sidecarPath) {
           await this.storageCore.moveFile({
             entityId: id,
-            pathType: AssetFileType.Sidecar,
+            pathType: AssetPathType.Sidecar,
             oldPath: sidecarPath,
             newPath: `${newPath}.xmp`,
           });

server/src/services/tag.service.spec.ts

@@ -4,7 +4,6 @@ import { JobStatus } from 'src/enum';
 import { TagService } from 'src/services/tag.service';
 import { authStub } from 'test/fixtures/auth.stub';
 import { tagResponseStub, tagStub } from 'test/fixtures/tag.stub';
-import { factory } from 'test/small.factory';
 import { newTestService, ServiceMocks } from 'test/utils';
 
 describe(TagService.name, () => {
@@ -192,10 +191,6 @@ describe(TagService.name, () => {
     it('should upsert records', async () => {
       mocks.access.tag.checkOwnerAccess.mockResolvedValue(new Set(['tag-1', 'tag-2']));
       mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-1', 'asset-2', 'asset-3']));
-      mocks.asset.getById.mockResolvedValue({
-        ...factory.asset(),
-        tags: [factory.tag({ value: 'tag-1' }), factory.tag({ value: 'tag-2' })],
-      });
       mocks.tag.upsertAssetIds.mockResolvedValue([
         { tagId: 'tag-1', assetId: 'asset-1' },
         { tagId: 'tag-1', assetId: 'asset-2' },
@@ -209,18 +204,6 @@ describe(TagService.name, () => {
       ).resolves.toEqual({
         count: 6,
       });
-      expect(mocks.asset.upsertExif).toHaveBeenCalledWith(
-        { assetId: 'asset-1', lockedProperties: ['tags'], tags: ['tag-1', 'tag-2'] },
-        { lockedPropertiesBehavior: 'append' },
-      );
-      expect(mocks.asset.upsertExif).toHaveBeenCalledWith(
-        { assetId: 'asset-2', lockedProperties: ['tags'], tags: ['tag-1', 'tag-2'] },
-        { lockedPropertiesBehavior: 'append' },
-      );
-      expect(mocks.asset.upsertExif).toHaveBeenCalledWith(
-        { assetId: 'asset-3', lockedProperties: ['tags'], tags: ['tag-1', 'tag-2'] },
-        { lockedPropertiesBehavior: 'append' },
-      );
       expect(mocks.tag.upsertAssetIds).toHaveBeenCalledWith([
         { tagId: 'tag-1', assetId: 'asset-1' },
         { tagId: 'tag-1', assetId: 'asset-2' },
@@ -246,10 +229,6 @@ describe(TagService.name, () => {
       mocks.tag.get.mockResolvedValue(tagStub.tag);
       mocks.tag.getAssetIds.mockResolvedValue(new Set(['asset-1']));
       mocks.tag.addAssetIds.mockResolvedValue();
-      mocks.asset.getById.mockResolvedValue({
-        ...factory.asset(),
-        tags: [factory.tag({ value: 'tag-1' })],
-      });
       mocks.access.asset.checkOwnerAccess.mockResolvedValue(new Set(['asset-2']));
 
       await expect(
@@ -261,14 +240,6 @@ describe(TagService.name, () => {
         { id: 'asset-2', success: true },
       ]);
 
-      expect(mocks.asset.upsertExif).not.toHaveBeenCalledWith(
-        { assetId: 'asset-1', lockedProperties: ['tags'], tags: ['tag-1'] },
-        { lockedPropertiesBehavior: 'append' },
-      );
-      expect(mocks.asset.upsertExif).toHaveBeenCalledWith(
-        { assetId: 'asset-2', lockedProperties: ['tags'], tags: ['tag-1'] },
-        { lockedPropertiesBehavior: 'append' },
-      );
       expect(mocks.tag.getAssetIds).toHaveBeenCalledWith('tag-1', ['asset-1', 'asset-2']);
       expect(mocks.tag.addAssetIds).toHaveBeenCalledWith('tag-1', ['asset-2']);
     });

server/src/services/tag.service.ts

@@ -16,7 +16,6 @@ import { JobName, JobStatus, Permission, QueueName } from 'src/enum';
 import { TagAssetTable } from 'src/schema/tables/tag-asset.table';
 import { BaseService } from 'src/services/base.service';
 import { addAssets, removeAssets } from 'src/utils/asset.util';
-import { updateLockedColumns } from 'src/utils/database';
 import { upsertTags } from 'src/utils/tag';
 
 @Injectable()
@@ -91,7 +90,6 @@ export class TagService extends BaseService {
 
     const results = await this.tagRepository.upsertAssetIds(items);
     for (const assetId of new Set(results.map((item) => item.assetId))) {
-      await this.updateTags(assetId);
       await this.eventRepository.emit('AssetTag', { assetId });
     }
 
@@ -109,7 +107,6 @@ export class TagService extends BaseService {
 
     for (const { id: assetId, success } of results) {
       if (success) {
-        await this.updateTags(assetId);
         await this.eventRepository.emit('AssetTag', { assetId });
       }
     }
@@ -128,7 +125,6 @@ export class TagService extends BaseService {
 
     for (const { id: assetId, success } of results) {
       if (success) {
-        await this.updateTags(assetId);
         await this.eventRepository.emit('AssetUntag', { assetId });
       }
     }
@@ -149,12 +145,4 @@ export class TagService extends BaseService {
     }
     return tag;
   }
-
-  private async updateTags(assetId: string) {
-    const asset = await this.assetRepository.getById(assetId, { tags: true });
-    await this.assetRepository.upsertExif(
-      updateLockedColumns({ assetId, tags: asset?.tags?.map(({ value }) => value) ?? [] }),
-      { lockedPropertiesBehavior: 'append' },
-    );
-  }
 }

server/src/types.ts

@@ -23,39 +23,34 @@ import {
   VideoCodec,
 } from 'src/enum';
 
-export type DeepPartial<T> =
-  T extends Record<string, unknown>
-    ? { [K in keyof T]?: DeepPartial<T[K]> }
-    : T extends Array<infer R>
-      ? DeepPartial<R>[]
-      : T;
+export type DeepPartial<T> = T extends object ? { [K in keyof T]?: DeepPartial<T[K]> } : T;
 
 export type RepositoryInterface<T extends object> = Pick<T, keyof T>;
 
-export type FullsizeImageOptions = {
+export interface FullsizeImageOptions {
   format: ImageFormat;
   quality: number;
   enabled: boolean;
-};
+}
 
-export type ImageOptions = {
+export interface ImageOptions {
   format: ImageFormat;
   quality: number;
   size: number;
-};
+}
 
-export type RawImageInfo = {
+export interface RawImageInfo {
   width: number;
   height: number;
   channels: 1 | 2 | 3 | 4;
-};
+}
 
-type DecodeImageOptions = {
+interface DecodeImageOptions {
   colorspace: string;
   processInvalidImages: boolean;
   raw?: RawImageInfo;
   edits?: AssetEditActionItem[];
-};
+}
 
 export interface DecodeToBufferOptions extends DecodeImageOptions {
   size?: number;
@@ -323,7 +318,7 @@ export type JobItem =
   // Sidecar Scanning
   | { name: JobName.SidecarQueueAll; data: IBaseJob }
   | { name: JobName.SidecarCheck; data: IEntityJob }
-  | { name: JobName.SidecarWrite; data: IEntityJob }
+  | { name: JobName.SidecarWrite; data: ISidecarWriteJob }
 
   // Facial Recognition
   | { name: JobName.AssetDetectFacesQueueAll; data: IBaseJob }
@@ -509,7 +504,7 @@ export interface SystemMetadata extends Record<SystemMetadataKey, Record<string,
   [SystemMetadataKey.MemoriesState]: MemoriesState;
 }
 
-export type UserPreferences = {
+export interface UserPreferences {
   albums: {
     defaultAssetOrder: AssetOrder;
   };
@@ -552,7 +547,7 @@ export type UserPreferences = {
   cast: {
     gCastEnabled: boolean;
   };
-};
+}
 
 export type UserMetadataItem<T extends keyof UserMetadata = UserMetadataKey> = {
   key: T;

server/src/utils/asset.util.ts

@@ -1,5 +1,5 @@
 import { BadRequestException } from '@nestjs/common';
-import { StorageCore } from 'src/cores/storage.core';
+import { GeneratedImageType, StorageCore } from 'src/cores/storage.core';
 import { AssetFile, Exif } from 'src/database';
 import { BulkIdErrorReason, BulkIdResponseDto } from 'src/dtos/asset-ids.response.dto';
 import { UploadFieldName } from 'src/dtos/asset-media.dto';
@@ -14,19 +14,19 @@ import { PartnerRepository } from 'src/repositories/partner.repository';
 import { IBulkAsset, ImmichFile, UploadFile, UploadRequest } from 'src/types';
 import { checkAccess } from 'src/utils/access';
 
-export const getAssetFile = (files: AssetFile[], type: AssetFileType, { isEdited }: { isEdited: boolean }) => {
-  return files.find((file) => file.type === type && file.isEdited === isEdited);
+export const getAssetFile = (files: AssetFile[], type: AssetFileType | GeneratedImageType) => {
+  return files.find((file) => file.type === type);
 };
 
 export const getAssetFiles = (files: AssetFile[]) => ({
-  fullsizeFile: getAssetFile(files, AssetFileType.FullSize, { isEdited: false }),
-  previewFile: getAssetFile(files, AssetFileType.Preview, { isEdited: false }),
-  thumbnailFile: getAssetFile(files, AssetFileType.Thumbnail, { isEdited: false }),
-  sidecarFile: getAssetFile(files, AssetFileType.Sidecar, { isEdited: false }),
+  fullsizeFile: getAssetFile(files, AssetFileType.FullSize),
+  previewFile: getAssetFile(files, AssetFileType.Preview),
+  thumbnailFile: getAssetFile(files, AssetFileType.Thumbnail),
+  sidecarFile: getAssetFile(files, AssetFileType.Sidecar),
 
-  editedFullsizeFile: getAssetFile(files, AssetFileType.FullSize, { isEdited: true }),
-  editedPreviewFile: getAssetFile(files, AssetFileType.Preview, { isEdited: true }),
-  editedThumbnailFile: getAssetFile(files, AssetFileType.Preview, { isEdited: true }),
+  editedFullsizeFile: getAssetFile(files, AssetFileType.FullSizeEdited),
+  editedPreviewFile: getAssetFile(files, AssetFileType.PreviewEdited),
+  editedThumbnailFile: getAssetFile(files, AssetFileType.ThumbnailEdited),
 });
 
 export const addAssets = async (

server/test/fixtures/asset.stub.ts

@@ -31,21 +31,18 @@ const sidecarFileWithoutExt = factory.assetFile({
 });
 
 const editedPreviewFile = factory.assetFile({
-  type: AssetFileType.Preview,
+  type: AssetFileType.PreviewEdited,
   path: '/uploads/user-id/preview/path_edited.jpg',
-  isEdited: true,
 });
 
 const editedThumbnailFile = factory.assetFile({
-  type: AssetFileType.Thumbnail,
+  type: AssetFileType.ThumbnailEdited,
   path: '/uploads/user-id/thumbnail/path_edited.jpg',
-  isEdited: true,
 });
 
 const editedFullsizeFile = factory.assetFile({
-  type: AssetFileType.FullSize,
+  type: AssetFileType.FullSizeEdited,
   path: '/uploads/user-id/fullsize/path_edited.jpg',
-  isEdited: true,
 });
 
 const files: AssetFile[] = [fullsizeFile, previewFile, thumbnailFile];

server/test/fixtures/shared-link.stub.ts

@@ -147,7 +147,6 @@ export const sharedLinkStub = {
           visibility: AssetVisibility.Timeline,
           width: 500,
           height: 500,
-          tags: [],
         },
         sharedLinks: [],
         faces: [],