refactor: change location

2026-03-24 02:54:22 -07:00 · 2026-03-23 14:45:50 -04:00
44 changed files with 429 additions and 820 deletions
--- a/cli/package.json
+++ b/cli/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@immich/cli",
-  "version": "2.6.2",
+  "version": "2.6.1",
  "description": "Command Line Interface (CLI) for Immich",
  "type": "module",
  "exports": "./dist/index.js",
@@ -35,7 +35,8 @@
    "prettier-plugin-organize-imports": "^4.0.0",
    "typescript": "^5.3.3",
    "typescript-eslint": "^8.28.0",
-    "vite": "^8.0.0",
+    "vite": "^7.0.0",
+    "vite-tsconfig-paths": "^6.0.0",
    "vitest": "^4.0.0",
    "vitest-fetch-mock": "^0.4.0",
    "yaml": "^2.3.1"
--- a/cli/vite.config.ts
+++ b/cli/vite.config.ts
@@ -1,12 +1,10 @@
 import { defineConfig, UserConfig } from 'vite';
+import tsconfigPaths from 'vite-tsconfig-paths';

 export default defineConfig({
-  resolve: {
-    alias: { src: '/src' },
-    tsconfigPaths: true,
-  },
+  resolve: { alias: { src: '/src' } },
  build: {
-    rolldownOptions: {
+    rollupOptions: {
      input: 'src/index.ts',
      output: {
        dir: 'dist',
@@ -18,6 +16,7 @@ export default defineConfig({
    // bundle everything except for Node built-ins
    noExternal: /^(?!node:).*$/,
  },
+  plugins: [tsconfigPaths()],
  test: {
    name: 'cli:unit',
    globals: true,
--- a/docs/docs/install/requirements.md
+++ b/docs/docs/install/requirements.md
@@ -8,7 +8,7 @@ Hardware and software requirements for Immich:

 ## Hardware

- **OS**: Recommended Linux or \*nix 64-bit operating system (Ubuntu, Debian, etc).
+- **OS**: Recommended Linux or \*nix operating system (Ubuntu, Debian, etc).
  - Non-Linux OSes tend to provide a poor Docker experience and are strongly discouraged.
    Our ability to assist with setup or troubleshooting on non-Linux OSes will be severely reduced.
    If you still want to try to use a non-Linux OS, you can set it up as follows:
@@ -19,10 +19,6 @@ Hardware and software requirements for Immich:
    If you have issues, we recommend that you switch to a supported VM deployment.
 - **RAM**: Minimum 6GB, recommended 8GB.
 - **CPU**: Minimum 2 cores, recommended 4 cores.
-  - Immich runs on the `amd64` and `arm64` platforms.
-    Since `v2.6`, the machine learning container on `amd64` requires the `>= x86-64-v2` [microarchitecture level](https://en.wikipedia.org/wiki/X86-64#Microarchitecture_levels).
-    Most CPUs released since ~2012 support this microarchitecture.
-    If you are using a virtual machine, ensure you have selected a [supported microarchitecture](https://pve.proxmox.com/pve-docs/chapter-qm.html#_qemu_cpu_types).
 - **Storage**: Recommended Unix-compatible filesystem (EXT4, ZFS, APFS, etc.) with support for user/group ownership and permissions.
  - The generation of thumbnails and transcoded video can increase the size of the photo library by 10-20% on average.

--- a/docs/static/archived-versions.json
+++ b/docs/static/archived-versions.json
@@ -1,7 +1,7 @@
 [
  {
-    "label": "v2.6.2",
-    "url": "https://docs.v2.6.2.archive.immich.app"
+    "label": "v2.6.1",
+    "url": "https://docs.v2.6.1.archive.immich.app"
  },
  {
    "label": "v2.5.6",
--- a/e2e/package.json
+++ b/e2e/package.json
@@ -1,6 +1,6 @@
 {
  "name": "immich-e2e",
-  "version": "2.6.2",
+  "version": "2.6.1",
  "description": "",
  "main": "index.js",
  "type": "module",
--- a/e2e/src/specs/server/api/album.e2e-spec.ts
+++ b/e2e/src/specs/server/api/album.e2e-spec.ts
@@ -524,19 +524,14 @@ describe('/albums', () => {
      expect(body).toEqual(errorDto.badRequest('Not found or no album.update access'));
    });

-    it('should be able to update as an editor', async () => {
+    it('should not be able to update as an editor', async () => {
      const { status, body } = await request(app)
        .patch(`/albums/${user1Albums[0].id}`)
        .set('Authorization', `Bearer ${user2.accessToken}`)
        .send({ albumName: 'New album name' });

-      expect(status).toBe(200);
-      expect(body).toEqual(
-        expect.objectContaining({
-          id: user1Albums[0].id,
-          albumName: 'New album name',
-        }),
-      );
+      expect(status).toBe(400);
+      expect(body).toEqual(errorDto.badRequest('Not found or no album.update access'));
    });
  });

--- a/e2e/src/specs/web/duplicates.e2e-spec.ts
+++ b/e2e/src/specs/web/duplicates.e2e-spec.ts
@@ -1,51 +0,0 @@
-import { AssetMediaResponseDto, LoginResponseDto, updateAssets } from '@immich/sdk';
-import { expect, test } from '@playwright/test';
-import crypto from 'node:crypto';
-import { asBearerAuth, utils } from 'src/utils';
-
-test.describe('Duplicates Utility', () => {
-  let admin: LoginResponseDto;
-  let firstAsset: AssetMediaResponseDto;
-  let secondAsset: AssetMediaResponseDto;
-
-  test.beforeAll(async () => {
-    utils.initSdk();
-    await utils.resetDatabase();
-    admin = await utils.adminSetup();
-  });
-
-  test.beforeEach(async ({ context }) => {
-    [firstAsset, secondAsset] = await Promise.all([
-      utils.createAsset(admin.accessToken, { deviceAssetId: 'duplicate-a' }),
-      utils.createAsset(admin.accessToken, { deviceAssetId: 'duplicate-b' }),
-    ]);
-
-    await updateAssets(
-      {
-        assetBulkUpdateDto: {
-          ids: [firstAsset.id, secondAsset.id],
-          duplicateId: crypto.randomUUID(),
-        },
-      },
-      { headers: asBearerAuth(admin.accessToken) },
-    );
-
-    await utils.setAuthCookies(context, admin.accessToken);
-  });
-
-  test('navigates with arrow keys between duplicate preview assets', async ({ page }) => {
-    await page.goto('/utilities/duplicates');
-    await page.getByRole('button', { name: 'View' }).first().click();
-    await page.waitForSelector('#immich-asset-viewer');
-
-    const getViewedAssetId = () => new URL(page.url()).pathname.split('/').at(-1) ?? '';
-    const initialAssetId = getViewedAssetId();
-    expect([firstAsset.id, secondAsset.id]).toContain(initialAssetId);
-
-    await page.keyboard.press('ArrowRight');
-    await expect.poll(getViewedAssetId).not.toBe(initialAssetId);
-
-    await page.keyboard.press('ArrowLeft');
-    await expect.poll(getViewedAssetId).toBe(initialAssetId);
-  });
-});
--- a/i18n/package.json
+++ b/i18n/package.json
@@ -1,6 +1,6 @@
 {
  "name": "immich-i18n",
-  "version": "2.6.2",
+  "version": "2.6.1",
  "private": true,
  "scripts": {
    "format": "prettier --cache --check .",
--- a/machine-learning/pyproject.toml
+++ b/machine-learning/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "immich-ml"
-version = "2.6.2"
+version = "2.6.1"
 description = ""
 authors = [{ name = "Hau Tran", email = "alex.tran1502@gmail.com" }]
 requires-python = ">=3.11,<4.0"
--- a/machine-learning/uv.lock
+++ b/machine-learning/uv.lock
@@ -898,7 +898,7 @@ wheels = [

 [[package]]
 name = "immich-ml"
-version = "2.6.2"
+version = "2.6.1"
 source = { editable = "." }
 dependencies = [
    { name = "aiocache" },
--- a/mobile/android/fastlane/Fastfile
+++ b/mobile/android/fastlane/Fastfile
@@ -35,8 +35,8 @@ platform :android do
      task: 'bundle', 
      build_type: 'Release',
      properties: {
-        "android.injected.version.code" => 3040,
-        "android.injected.version.name" => "2.6.2",
+        "android.injected.version.code" => 3039,
+        "android.injected.version.name" => "2.6.1",
      }
    )
    upload_to_play_store(skip_upload_apk: true, skip_upload_images: true, skip_upload_screenshots: true, aab: '../build/app/outputs/bundle/release/app-release.aab')
--- a/mobile/ios/Runner/Info.plist
+++ b/mobile/ios/Runner/Info.plist
@@ -80,7 +80,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.6.2</string>
+	<string>2.6.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
--- a/mobile/lib/presentation/pages/drift_people_collection.page.dart
+++ b/mobile/lib/presentation/pages/drift_people_collection.page.dart
@@ -79,7 +79,6 @@ class _DriftPeopleCollectionPageState extends ConsumerState<DriftPeopleCollectio
                    final person = people[index];

                    return Column(
-                      key: ValueKey(person.id),
                      children: [
                        GestureDetector(
                          onTap: () {
@@ -89,7 +88,6 @@ class _DriftPeopleCollectionPageState extends ConsumerState<DriftPeopleCollectio
                            shape: const CircleBorder(side: BorderSide.none),
                            elevation: 3,
                            child: CircleAvatar(
-                              key: ValueKey('avatar-${person.id}'),
                              maxRadius: isTablet ? 100 / 2 : 96 / 2,
                              backgroundImage: RemoteImageProvider(url: getFaceThumbnailUrl(person.id)),
                            ),
--- a/mobile/lib/presentation/pages/search/drift_search.page.dart
+++ b/mobile/lib/presentation/pages/search/drift_search.page.dart
@@ -69,7 +69,6 @@ class DriftSearchPage extends HookConsumerWidget {
    );

    final previousFilter = useState<SearchFilter?>(null);
-    final hasRequestedSearch = useState<bool>(false);
    final dateInputFilter = useState<DateFilterInputModel?>(null);

    final peopleCurrentFilterWidget = useState<Widget?>(null);
@@ -92,11 +91,9 @@ class DriftSearchPage extends HookConsumerWidget {

      if (filter.isEmpty) {
        previousFilter.value = null;
-        hasRequestedSearch.value = false;
        return;
      }

-      hasRequestedSearch.value = true;
      unawaited(ref.read(paginatedSearchProvider.notifier).search(filter));
      previousFilter.value = filter;
    }
@@ -110,8 +107,6 @@ class DriftSearchPage extends HookConsumerWidget {
    searchPreFilter() {
      if (preFilter != null) {
        Future.delayed(Duration.zero, () {
-          filter.value = preFilter;
-          textSearchController.clear();
          searchFilter(preFilter);

          if (preFilter.location.city != null) {
@@ -724,7 +719,7 @@ class DriftSearchPage extends HookConsumerWidget {
              ),
            ),
          ),
-          if (!hasRequestedSearch.value)
+          if (filter.value.isEmpty)
            const _SearchSuggestions()
          else
            _SearchResultGrid(onScrollEnd: loadMoreSearchResults),
--- a/mobile/lib/presentation/widgets/action_buttons/similar_photos_action_button.widget.dart
+++ b/mobile/lib/presentation/widgets/action_buttons/similar_photos_action_button.widget.dart
@@ -24,22 +24,20 @@ class SimilarPhotosActionButton extends ConsumerWidget {
    }

    ref.invalidate(assetViewerProvider);
-    ref.invalidate(paginatedSearchProvider);
-
-    ref.read(searchPreFilterProvider.notifier)
-      ..clear()
-      ..setFilter(
-        SearchFilter(
-          assetId: assetId,
-          people: {},
-          location: SearchLocationFilter(),
-          camera: SearchCameraFilter(),
-          date: SearchDateFilter(),
-          display: SearchDisplayFilters(isNotInAlbum: false, isArchive: false, isFavorite: false),
-          rating: SearchRatingFilter(),
-          mediaType: AssetType.image,
-        ),
-      );
+    ref
+        .read(searchPreFilterProvider.notifier)
+        .setFilter(
+          SearchFilter(
+            assetId: assetId,
+            people: {},
+            location: SearchLocationFilter(),
+            camera: SearchCameraFilter(),
+            date: SearchDateFilter(),
+            display: SearchDisplayFilters(isNotInAlbum: false, isArchive: false, isFavorite: false),
+            rating: SearchRatingFilter(),
+            mediaType: AssetType.image,
+          ),
+        );

    unawaited(context.navigateTo(const DriftSearchRoute()));
  }
--- a/mobile/lib/presentation/widgets/asset_viewer/rating_bar.widget.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/rating_bar.widget.dart
@@ -39,16 +39,6 @@ class _RatingBarState extends State<RatingBar> {
    _currentRating = widget.initialRating;
  }

-  @override
-  void didUpdateWidget(covariant RatingBar oldWidget) {
-    super.didUpdateWidget(oldWidget);
-    if (oldWidget.initialRating != widget.initialRating && _currentRating != widget.initialRating) {
-      setState(() {
-        _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;
--- a/mobile/lib/services/auth.service.dart
+++ b/mobile/lib/services/auth.service.dart
@@ -67,9 +67,6 @@ class AuthService {
    bool isValid = false;

    try {
-      final urls = ApiService.getServerUrls();
-      urls.add(url);
-      await NetworkRepository.setHeaders(ApiService.getRequestHeaders(), urls);
      final uri = Uri.parse('$url/users/me');
      final response = await NetworkRepository.client.get(uri);
      if (response.statusCode == 200) {
--- a/mobile/lib/utils/action_button.utils.dart
+++ b/mobile/lib/utils/action_button.utils.dart
@@ -143,7 +143,8 @@ enum ActionButtonType {
            !context.isInLockedView && //
            context.currentAlbum != null,
      ActionButtonType.setAlbumCover =>
-        !context.isInLockedView && //
+        context.isOwner && //
+            !context.isInLockedView && //
            context.currentAlbum != null && //
            context.selectedCount == 1,
      ActionButtonType.unstack =>
--- a/mobile/lib/widgets/search/search_filter/common/dropdown.dart
+++ b/mobile/lib/widgets/search/search_filter/common/dropdown.dart
@@ -16,15 +16,9 @@ class SearchDropdown<T> extends StatelessWidget {
  final Widget? label;
  final Widget? leadingIcon;

-  static const WidgetStatePropertyAll<EdgeInsetsGeometry> _optionPadding = WidgetStatePropertyAll<EdgeInsetsGeometry>(
-    EdgeInsetsDirectional.fromSTEB(16, 0, 16, 0),
-  );
-
  @override
  Widget build(BuildContext context) {
-    final mediaQuery = MediaQuery.of(context);
-    final maxMenuHeight = mediaQuery.size.height * 0.5 - mediaQuery.viewPadding.bottom;
-    const menuStyle = MenuStyle(
+    final menuStyle = const MenuStyle(
      shape: WidgetStatePropertyAll<OutlinedBorder>(
        RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(15))),
      ),
@@ -32,26 +26,11 @@ class SearchDropdown<T> extends StatelessWidget {

    return LayoutBuilder(
      builder: (context, constraints) {
-        final styledEntries = dropdownMenuEntries
-            .map(
-              (entry) => DropdownMenuEntry<T>(
-                value: entry.value,
-                label: entry.label,
-                labelWidget: entry.labelWidget,
-                enabled: entry.enabled,
-                leadingIcon: entry.leadingIcon,
-                trailingIcon: entry.trailingIcon,
-                style: (entry.style ?? const ButtonStyle()).copyWith(padding: _optionPadding),
-              ),
-            )
-            .toList(growable: false);
-
        return DropdownMenu(
          controller: controller,
          leadingIcon: leadingIcon,
          width: constraints.maxWidth,
-          menuHeight: maxMenuHeight,
-          dropdownMenuEntries: styledEntries,
+          dropdownMenuEntries: dropdownMenuEntries,
          label: label,
          menuStyle: menuStyle,
          trailingIcon: const Icon(Icons.arrow_drop_down_rounded),
--- a/mobile/openapi/README.md
+++ b/mobile/openapi/README.md
@@ -3,7 +3,7 @@ Immich API

 This Dart package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:

- API version: 2.6.2
+- API version: 2.6.1
 - Generator version: 7.8.0
 - Build package: org.openapitools.codegen.languages.DartClientCodegen

--- a/mobile/pubspec.yaml
+++ b/mobile/pubspec.yaml
@@ -2,7 +2,7 @@ name: immich_mobile
 description: Immich - selfhosted backup media file on mobile phone

 publish_to: 'none'
-version: 2.6.2+3040
+version: 2.6.1+3039

 environment:
  sdk: '>=3.8.0 <4.0.0'
--- a/mobile/test/utils/action_button_utils_test.dart
+++ b/mobile/test/utils/action_button_utils_test.dart
@@ -727,7 +727,7 @@ void main() {
        expect(ActionButtonType.setAlbumCover.shouldShow(context), isTrue);
      });

-      test('should show when not owner', () {
+      test('should not show when not owner', () {
        final album = createRemoteAlbum();
        final context = ActionButtonContext(
          asset: mergedAsset,
@@ -742,7 +742,7 @@ void main() {
          selectedCount: 1,
        );

-        expect(ActionButtonType.setAlbumCover.shouldShow(context), isTrue);
+        expect(ActionButtonType.setAlbumCover.shouldShow(context), isFalse);
      });

      test('should not show when in locked view', () {
--- a/open-api/immich-openapi-specs.json
+++ b/open-api/immich-openapi-specs.json
@@ -15166,7 +15166,7 @@
  "info": {
    "title": "Immich",
    "description": "Immich API",
-    "version": "2.6.2",
+    "version": "2.6.1",
    "contact": {}
  },
  "tags": [
--- a/open-api/typescript-sdk/package.json
+++ b/open-api/typescript-sdk/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@immich/sdk",
-  "version": "2.6.2",
+  "version": "2.6.1",
  "description": "Auto-generated TypeScript SDK for the Immich API",
  "type": "module",
  "main": "./build/index.js",
--- a/open-api/typescript-sdk/src/fetch-client.ts
+++ b/open-api/typescript-sdk/src/fetch-client.ts
@@ -1,6 +1,6 @@
 /**
 * Immich
- * 2.6.2
+ * 2.6.1
 * DO NOT MODIFY - This file has been generated using oazapfts.
 * See https://www.npmjs.com/package/oazapfts
 */
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "immich-monorepo",
-  "version": "2.6.2",
+  "version": "2.6.1",
  "description": "Monorepo for Immich",
  "private": true,
  "packageManager": "pnpm@10.30.3+sha512.c961d1e0a2d8e354ecaa5166b822516668b7f44cb5bd95122d590dd81922f606f5473b6d23ec4a5be05e7fcd18e8488d47d978bbe981872f1145d06e9a740017",
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
--- a/server/package.json
+++ b/server/package.json
@@ -1,6 +1,6 @@
 {
  "name": "immich",
-  "version": "2.6.2",
+  "version": "2.6.1",
  "description": "",
  "author": "",
  "private": true,
--- a/server/src/utils/access.ts
+++ b/server/src/utils/access.ts
@@ -190,13 +190,7 @@ const checkOtherAccess = async (access: AccessRepository, request: OtherAccessRe
    }

    case Permission.AlbumUpdate: {
-      const isOwner = await access.album.checkOwnerAccess(auth.user.id, ids);
-      const isShared = await access.album.checkSharedAlbumAccess(
-        auth.user.id,
-        setDifference(ids, isOwner),
-        AlbumUserRole.Editor,
-      );
-      return setUnion(isOwner, isShared);
+      return await access.album.checkOwnerAccess(auth.user.id, ids);
    }

    case Permission.AlbumDelete: {
@@ -204,13 +198,7 @@ const checkOtherAccess = async (access: AccessRepository, request: OtherAccessRe
    }

    case Permission.AlbumShare: {
-      const isOwner = await access.album.checkOwnerAccess(auth.user.id, ids);
-      const isShared = await access.album.checkSharedAlbumAccess(
-        auth.user.id,
-        setDifference(ids, isOwner),
-        AlbumUserRole.Editor,
-      );
-      return setUnion(isOwner, isShared);
+      return await access.album.checkOwnerAccess(auth.user.id, ids);
    }

    case Permission.AlbumDownload: {
--- a/web/package.json
+++ b/web/package.json
@@ -1,6 +1,6 @@
 {
  "name": "immich-web",
-  "version": "2.6.2",
+  "version": "2.6.1",
  "license": "GNU Affero General Public License version 3",
  "type": "module",
  "scripts": {
@@ -72,10 +72,10 @@
    "@koddsson/eslint-plugin-tscompat": "^0.2.0",
    "@socket.io/component-emitter": "^3.1.0",
    "@sveltejs/adapter-static": "^3.0.8",
-    "@sveltejs/enhanced-img": "^0.10.4",
+    "@sveltejs/enhanced-img": "^0.10.0",
    "@sveltejs/kit": "^2.27.1",
-    "@sveltejs/vite-plugin-svelte": "7.0.0",
-    "@tailwindcss/vite": "^4.2.2",
+    "@sveltejs/vite-plugin-svelte": "6.2.4",
+    "@tailwindcss/vite": "^4.1.7",
    "@testing-library/jest-dom": "^6.4.2",
    "@testing-library/svelte": "^5.2.8",
    "@testing-library/user-event": "^14.5.2",
@@ -103,10 +103,10 @@
    "svelte": "5.53.13",
    "svelte-check": "^4.1.5",
    "svelte-eslint-parser": "^1.3.3",
-    "tailwindcss": "^4.2.2",
+    "tailwindcss": "^4.1.7",
    "typescript": "^5.8.3",
    "typescript-eslint": "^8.45.0",
-    "vite": "^8.0.0",
+    "vite": "^7.1.2",
    "vitest": "^4.0.0"
  },
  "volta": {
--- a/web/src/lib/components/asset-viewer/detail-panel-location.svelte
+++ b/web/src/lib/components/asset-viewer/detail-panel-location.svelte
@@ -1,24 +1,20 @@
 <script lang="ts">
-  import ChangeLocation from '$lib/components/shared-components/change-location.svelte';
-  import Portal from '$lib/elements/Portal.svelte';
+  import GeolocationPointPickerModal from '$lib/modals/GeolocationPointPickerModal.svelte';
  import { handleError } from '$lib/utils/handle-error';
  import { updateAsset, type AssetResponseDto } from '@immich/sdk';
-  import { Icon } from '@immich/ui';
+  import { Icon, modalManager } from '@immich/ui';
  import { mdiMapMarkerOutline, mdiPencil } from '@mdi/js';
  import { t } from 'svelte-i18n';

-  interface Props {
+  type Props = {
    isOwner: boolean;
    asset: AssetResponseDto;
-  }
+  };

  let { isOwner, asset = $bindable() }: Props = $props();

-  let isShowChangeLocation = $state(false);
-
-  const onClose = async (point?: { lng: number; lat: number }) => {
-    isShowChangeLocation = false;
-
+  const onAction = async () => {
+    const point = await modalManager.show(GeolocationPointPickerModal, { asset });
    if (!point) {
      return;
    }
@@ -38,7 +34,7 @@
  <button
    type="button"
    class="flex w-full text-start justify-between place-items-start gap-4 py-4"
-    onclick={() => (isOwner ? (isShowChangeLocation = true) : null)}
+    onclick={isOwner ? onAction : undefined}
    title={isOwner ? $t('edit_location') : ''}
    class:hover:text-primary={isOwner}
  >
@@ -72,12 +68,11 @@
  <button
    type="button"
    class="flex w-full text-start justify-between place-items-start gap-4 py-4 rounded-lg hover:text-primary"
-    onclick={() => (isShowChangeLocation = true)}
+    onclick={onAction}
    title={$t('add_location')}
  >
    <div class="flex gap-4">
      <div><Icon icon={mdiMapMarkerOutline} size="24" /></div>
-
      <p>{$t('add_a_location')}</p>
    </div>
    <div class="focus:outline-none p-1">
@@ -85,9 +80,3 @@
    </div>
  </button>
 {/if}
-
-{#if isShowChangeLocation}
-  <Portal>
-    <ChangeLocation {asset} {onClose} />
-  </Portal>
-{/if}
--- a/web/src/lib/components/timeline/actions/ChangeLocationAction.svelte
+++ b/web/src/lib/components/timeline/actions/ChangeLocationAction.svelte
@@ -1,26 +1,24 @@
 <script lang="ts">
-  import ChangeLocation from '$lib/components/shared-components/change-location.svelte';
+  import MenuOption from '$lib/components/shared-components/context-menu/menu-option.svelte';
+  import GeolocationPointPickerModal from '$lib/modals/GeolocationPointPickerModal.svelte';
  import { user } from '$lib/stores/user.store';
  import { getOwnedAssetsWithWarning } from '$lib/utils/asset-utils';
  import { getAssetControlContext } from '$lib/utils/context';
  import { handleError } from '$lib/utils/handle-error';
  import { updateAssets } from '@immich/sdk';
+  import { modalManager, toastManager } from '@immich/ui';
  import { mdiMapMarkerMultipleOutline } from '@mdi/js';
  import { t } from 'svelte-i18n';
-  import MenuOption from '../../shared-components/context-menu/menu-option.svelte';

-  interface Props {
+  type Props = {
    menuItem?: boolean;
-  }
+  };

  let { menuItem = false }: Props = $props();
  const { clearSelect, getOwnedAssets } = getAssetControlContext();

-  let isShowChangeLocation = $state(false);
-
-  async function handleConfirm(point?: { lng: number; lat: number }) {
-    isShowChangeLocation = false;
-
+  const onAction = async () => {
+    const point = await modalManager.show(GeolocationPointPickerModal, {});
    if (!point) {
      return;
    }
@@ -29,20 +27,14 @@

    try {
      await updateAssets({ assetBulkUpdateDto: { ids, latitude: point.lat, longitude: point.lng } });
+      toastManager.primary();
      clearSelect();
    } catch (error) {
      handleError(error, $t('errors.unable_to_update_location'));
    }
-  }
+  };
 </script>

 {#if menuItem}
-  <MenuOption
-    text={$t('change_location')}
-    icon={mdiMapMarkerMultipleOutline}
-    onClick={() => (isShowChangeLocation = true)}
-  />
-{/if}
-{#if isShowChangeLocation}
-  <ChangeLocation onClose={handleConfirm} />
+  <MenuOption text={$t('change_location')} icon={mdiMapMarkerMultipleOutline} onClick={onAction} />
 {/if}
--- a/web/src/lib/index.spec.ts
+++ b/web/src/lib/index.spec.ts
@@ -1,4 +1,4 @@
-import { cleanClass } from '$lib';
+import { cleanClass, isDefined } from '$lib';

 describe('cleanClass', () => {
  it('should return a string of class names', () => {
@@ -13,3 +13,19 @@ describe('cleanClass', () => {
    expect(cleanClass('class1', ['class2', 'class3'])).toBe('class1 class2 class3');
  });
 });
+
+describe('isDefined', () => {
+  it('should return false for null', () => {
+    expect(isDefined(null)).toBe(false);
+  });
+
+  it('should return false for undefined', () => {
+    expect(isDefined(undefined)).toBe(false);
+  });
+
+  it('should return true for everything else', () => {
+    for (const value of [0, 1, 2, true, false, {}, 'foo', 'bar', []]) {
+      expect(isDefined(value)).toBe(true);
+    }
+  });
+});
--- a/web/src/lib/index.ts
+++ b/web/src/lib/index.ts
@@ -14,3 +14,5 @@ export const cleanClass = (...classNames: unknown[]) => {
      .join(' '),
  );
 };
+
+export const isDefined = <T>(value: T): value is NonNullable<T> => value !== null && value !== undefined;
--- a/web/src/lib/managers/geolocation.manager.svelte.ts
+++ b/web/src/lib/managers/geolocation.manager.svelte.ts
@@ -0,0 +1,15 @@
+import type { LatLng } from '$lib/types';
+
+class GeolocationManager {
+  #lastPoint = $state<LatLng>();
+
+  get lastPoint() {
+    return this.#lastPoint;
+  }
+
+  onSelected(point: LatLng) {
+    this.#lastPoint = point;
+  }
+}
+
+export const geolocationManager = new GeolocationManager();
--- a/web/src/lib/modals/AlbumPickerModal.svelte
+++ b/web/src/lib/modals/AlbumPickerModal.svelte
@@ -28,10 +28,7 @@
  let { onClose }: Props = $props();

  onMount(async () => {
-    // TODO the server should *really* just return all albums (paginated ideally)
-    const ownedAlbums = await getAllAlbums({ shared: false });
-    ownedAlbums.push.apply(ownedAlbums, await getAllAlbums({ shared: true }));
-    albums = ownedAlbums;
+    albums = await getAllAlbums({});
    recentAlbums = albums.sort((a, b) => (new Date(a.updatedAt) > new Date(b.updatedAt) ? -1 : 1)).slice(0, 3);
    loading = false;
  });
--- a/web/src/lib/components/shared-components/change-location.svelte
+++ b/web/src/lib/components/shared-components/change-location.svelte
@@ -1,30 +1,27 @@
 <script lang="ts">
+  import { isDefined } from '$lib';
  import { clickOutside } from '$lib/actions/click-outside';
  import { listNavigation } from '$lib/actions/list-navigation';
  import CoordinatesInput from '$lib/components/shared-components/coordinates-input.svelte';
  import type Map from '$lib/components/shared-components/map/map.svelte';
  import { timeDebounceOnSearch, timeToLoadTheMap } from '$lib/constants';
  import SearchBar from '$lib/elements/SearchBar.svelte';
-  import { lastChosenLocation } from '$lib/stores/asset-editor.store';
+  import { geolocationManager } from '$lib/managers/geolocation.manager.svelte';
+  import type { LatLng } from '$lib/types';
  import { delay } from '$lib/utils/asset-utils';
  import { handleError } from '$lib/utils/handle-error';
  import { searchPlaces, type AssetResponseDto, type PlacesResponseDto } from '@immich/sdk';
  import { ConfirmModal, LoadingSpinner } from '@immich/ui';
  import { mdiMapMarkerMultipleOutline } from '@mdi/js';
  import { t } from 'svelte-i18n';
-  import { get } from 'svelte/store';
-  interface Point {
-    lng: number;
-    lat: number;
-  }

-  interface Props {
-    asset?: AssetResponseDto | undefined;
-    point?: Point;
-    onClose: (point?: Point) => void;
-  }
+  type Props = {
+    asset?: AssetResponseDto;
+    point?: LatLng;
+    onClose: (point?: LatLng) => void;
+  };

-  let { asset = undefined, point: initialPoint, onClose }: Props = $props();
+  let { asset, point: initialPoint, onClose }: Props = $props();

  let places: PlacesResponseDto[] = $state([]);
  let suggestedPlaces: PlacesResponseDto[] = $derived(places.slice(0, 5));
@@ -35,15 +32,22 @@
  let hideSuggestion = $state(false);
  let mapElement = $state<ReturnType<typeof Map>>();

-  let previousLocation = get(lastChosenLocation);
+  let assetPoint = $derived.by<LatLng | undefined>(() => {
+    if (!asset || !asset.exifInfo) {
+      return;
+    }

-  let assetLat = $derived(initialPoint?.lat ?? asset?.exifInfo?.latitude ?? undefined);
-  let assetLng = $derived(initialPoint?.lng ?? asset?.exifInfo?.longitude ?? undefined);
+    const { latitude, longitude } = asset.exifInfo;
+    if (!isDefined(latitude) || !isDefined(longitude)) {
+      return;
+    }

-  let mapLat = $derived(assetLat ?? previousLocation?.lat ?? undefined);
-  let mapLng = $derived(assetLng ?? previousLocation?.lng ?? undefined);
+    return { lat: latitude, lng: longitude };
+  });

-  let zoom = $derived(mapLat && mapLng ? 12.5 : 1);
+  let point = $state<LatLng | undefined>(initialPoint ?? assetPoint);
+  let zoom = $state(point ? 12.5 : 1);
+  let center = $state(point ?? geolocationManager.lastPoint);

  $effect(() => {
    if (mapElement && initialPoint) {
@@ -57,11 +61,9 @@
    }
  });

-  let point: Point | null = $state(initialPoint ?? null);
-
  const handleConfirm = (confirmed?: boolean) => {
    if (point && confirmed) {
-      lastChosenLocation.set(point);
+      geolocationManager.onSelected(point);
      onClose(point);
    } else {
      onClose();
@@ -201,12 +203,12 @@
        {:then { default: Map }}
          <Map
            bind:this={mapElement}
-            mapMarkers={assetLat !== undefined && assetLng !== undefined && asset
+            mapMarkers={asset && assetPoint
              ? [
                  {
                    id: asset.id,
-                    lat: assetLat,
-                    lon: assetLng,
+                    lat: assetPoint.lat,
+                    lon: assetPoint.lng,
                    city: asset.exifInfo?.city ?? null,
                    state: asset.exifInfo?.state ?? null,
                    country: asset.exifInfo?.country ?? null,
@@ -214,7 +216,7 @@
                ]
              : []}
            {zoom}
-            center={mapLat && mapLng ? { lat: mapLat, lng: mapLng } : undefined}
+            {center}
            simplified={true}
            clickable={true}
            onClickPoint={(selected) => (point = selected)}
@@ -225,7 +227,7 @@
      </div>

      <div class="grid sm:grid-cols-2 gap-4 text-sm text-start mt-4">
-        <CoordinatesInput lat={point ? point.lat : assetLat} lng={point ? point.lng : assetLng} {onUpdate} />
+        <CoordinatesInput lat={point?.lat} lng={point?.lng} {onUpdate} />
      </div>
    </div>
  {/snippet}
--- a/web/src/lib/services/asset.service.ts
+++ b/web/src/lib/services/asset.service.ts
@@ -8,16 +8,17 @@ import SharedLinkCreateModal from '$lib/modals/SharedLinkCreateModal.svelte';
 import { isFaceEditMode } from '$lib/stores/face-edit.svelte';
 import { user as authUser, preferences } from '$lib/stores/user.store';
 import type { AssetControlContext } from '$lib/types';
-import { getAssetMediaUrl, getSharedLink, sleep } from '$lib/utils';
+import { getSharedLink, sleep } from '$lib/utils';
 import { downloadUrl } from '$lib/utils/asset-utils';
 import { handleError } from '$lib/utils/handle-error';
 import { getFormatter } from '$lib/utils/i18n';
+import { asQueryString } from '$lib/utils/shared-links';
 import {
  AssetJobName,
-  AssetMediaSize,
  AssetTypeEnum,
  AssetVisibility,
  getAssetInfo,
+  getBaseUrl,
  runAssetJobs,
  updateAsset,
  type AssetJobsDto,
@@ -307,7 +308,6 @@ export const handleDownloadAsset = async (asset: AssetResponseDto, { edited }: {
    {
      filename: asset.originalFileName,
      id: asset.id,
-      cacheKey: asset.thumbhash,
    },
  ];

@@ -321,12 +321,13 @@ export const handleDownloadAsset = async (asset: AssetResponseDto, { edited }: {
      assets.push({
        filename: motionAsset.originalFileName,
        id: asset.livePhotoVideoId,
-        cacheKey: motionAsset.thumbhash,
      });
    }
  }

-  for (const [i, { filename, id, cacheKey }] of assets.entries()) {
+  const queryParams = asQueryString(authManager.params);
+
+  for (const [i, { filename, id }] of assets.entries()) {
    if (i !== 0) {
      // play nice with Safari
      await sleep(500);
@@ -334,7 +335,12 @@ export const handleDownloadAsset = async (asset: AssetResponseDto, { edited }: {

    try {
      toastManager.primary($t('downloading_asset_filename', { values: { filename } }));
-      downloadUrl(getAssetMediaUrl({ id, size: AssetMediaSize.Original, edited, cacheKey }), filename);
+      downloadUrl(
+        getBaseUrl() +
+          `/assets/${id}/original` +
+          (queryParams ? `?${queryParams}&edited=${edited}` : `?edited=${edited}`),
+        filename,
+      );
    } catch (error) {
      handleError(error, $t('errors.error_downloading', { values: { filename } }));
    }
--- a/web/src/lib/stores/asset-editor.store.ts
+++ b/web/src/lib/stores/asset-editor.store.ts
@@ -1,4 +0,0 @@
-import { writable } from 'svelte/store';
-
-//-----other
-export const lastChosenLocation = writable<{ lng: number; lat: number } | null>(null);
--- a/web/src/lib/stores/upload.ts
+++ b/web/src/lib/stores/upload.ts
@@ -80,34 +80,7 @@ function createUploadStore() {
  };

  const removeItem = (id: string) => {
-    uploadAssets.update((uploadingAsset) => {
-      const assetToRemove = uploadingAsset.find((a) => a.id === id);
-      if (assetToRemove) {
-        stats.update((stats) => {
-          switch (assetToRemove.state) {
-            case UploadState.DONE: {
-              stats.success--;
-              break;
-            }
-
-            case UploadState.DUPLICATED: {
-              stats.duplicates--;
-              break;
-            }
-
-            case UploadState.ERROR: {
-              stats.errors--;
-              break;
-            }
-          }
-
-          stats.total--;
-          return stats;
-        });
-      }
-
-      return uploadingAsset.filter((a) => a.id != id);
-    });
+    uploadAssets.update((uploadingAsset) => uploadingAsset.filter((a) => a.id != id));
  };

  const dismissErrors = () =>
--- a/web/src/lib/types.ts
+++ b/web/src/lib/types.ts
@@ -5,6 +5,8 @@ import type { ActionItem } from '@immich/ui';
 import type { DateTime } from 'luxon';
 import type { SvelteSet } from 'svelte/reactivity';

+export type LatLng = { lng: number; lat: number };
+
 export interface ReleaseEvent {
  isAvailable: boolean;
  /** ISO8601 */
--- a/web/src/routes/(user)/albums/[albumId=id]/[[photos=photos]]/[[assetId=id]]/+page.svelte
+++ b/web/src/routes/(user)/albums/[albumId=id]/[[photos=photos]]/[[assetId=id]]/+page.svelte
@@ -476,6 +476,13 @@
            <ChangeDate menuItem />
            <ChangeDescription menuItem />
            <ChangeLocation menuItem />
+            {#if assetInteraction.selectedAssets.length === 1}
+              <MenuOption
+                text={$t('set_as_album_cover')}
+                icon={mdiImageOutline}
+                onClick={() => updateThumbnailUsingCurrentSelection()}
+              />
+            {/if}
            <ArchiveAction
              menuItem
              unarchive={assetInteraction.isAllArchived}
@@ -483,13 +490,6 @@
            />
            <SetVisibilityAction menuItem onVisibilitySet={handleSetVisibility} />
          {/if}
-          {#if assetInteraction.selectedAssets.length === 1}
-            <MenuOption
-              text={$t('set_as_album_cover')}
-              icon={mdiImageOutline}
-              onClick={() => updateThumbnailUsingCurrentSelection()}
-            />
-          {/if}

          {#if $preferences.tags.enabled && assetInteraction.isAllUserOwned}
            <TagAction menuItem />
--- a/web/src/routes/(user)/utilities/duplicates/[[photos=photos]]/[[assetId=id]]/+page.svelte
+++ b/web/src/routes/(user)/utilities/duplicates/[[photos=photos]]/[[assetId=id]]/+page.svelte
@@ -178,7 +178,19 @@

  const handleFirst = () => navigateToIndex(0);
  const handlePrevious = () => navigateToIndex(Math.max(duplicatesIndex - 1, 0));
+  const handlePreviousShortcut = async () => {
+    if ($showAssetViewer) {
+      return;
+    }
+    await handlePrevious();
+  };
  const handleNext = async () => navigateToIndex(Math.min(duplicatesIndex + 1, duplicates.length - 1));
+  const handleNextShortcut = async () => {
+    if ($showAssetViewer) {
+      return;
+    }
+    await handleNext();
+  };
  const handleLast = () => navigateToIndex(duplicates.length - 1);

  const navigateToIndex = async (index: number) =>
@@ -186,12 +198,10 @@
 </script>

 <svelte:document
-  use:shortcuts={$showAssetViewer
-    ? []
-    : [
-        { shortcut: { key: 'ArrowLeft' }, onShortcut: handlePrevious },
-        { shortcut: { key: 'ArrowRight' }, onShortcut: handleNext },
-      ]}
+  use:shortcuts={[
+    { shortcut: { key: 'ArrowLeft' }, onShortcut: handlePreviousShortcut },
+    { shortcut: { key: 'ArrowRight' }, onShortcut: handleNextShortcut },
+  ]}
 />

 <UserPageLayout title={data.meta.title + ` (${duplicates.length.toLocaleString($locale)})`} scrollbar={true}>
--- a/web/src/routes/(user)/utilities/geolocation/+page.svelte
+++ b/web/src/routes/(user)/utilities/geolocation/+page.svelte
@@ -1,6 +1,5 @@
 <script lang="ts">
  import UserPageLayout from '$lib/components/layouts/user-page-layout.svelte';
-  import ChangeLocation from '$lib/components/shared-components/change-location.svelte';
  import EmptyPlaceholder from '$lib/components/shared-components/empty-placeholder.svelte';
  import Timeline from '$lib/components/timeline/Timeline.svelte';
  import { AssetAction } from '$lib/constants';
@@ -8,6 +7,7 @@
  import type { DayGroup } from '$lib/managers/timeline-manager/day-group.svelte';
  import { TimelineManager } from '$lib/managers/timeline-manager/timeline-manager.svelte';
  import type { TimelineAsset } from '$lib/managers/timeline-manager/types';
+  import GeolocationPointPickerModal from '$lib/modals/GeolocationPointPickerModal.svelte';
  import GeolocationUpdateConfirmModal from '$lib/modals/GeolocationUpdateConfirmModal.svelte';
  import { AssetInteraction } from '$lib/stores/asset-interaction.svelte';
  import { cancelMultiselect } from '$lib/utils/asset-utils';
@@ -19,9 +19,9 @@
  import { t } from 'svelte-i18n';
  import type { PageData } from './$types';

-  interface Props {
+  type Props = {
    data: PageData;
-  }
+  };

  let { data }: Props = $props();

@@ -87,7 +87,7 @@
  };

  const handlePickOnMap = async () => {
-    const point = await modalManager.show(ChangeLocation, {
+    const point = await modalManager.show(GeolocationPointPickerModal, {
      point: {
        lat: location.latitude,
        lng: location.longitude,