From 3531856d1c27629a8d18ccec73fd863620d93a46 Mon Sep 17 00:00:00 2001
From: Daniel Dietzler <36593685+danieldietzler@users.noreply.github.com>
Date: Fri, 31 Oct 2025 13:58:52 +0100
Subject: [PATCH 01/84] refactor: api key modals (#23420)

---
 .../components/ApiKeyPermissionsPicker.svelte |  78 ++++++++++
 .../user-api-key-list.svelte                  |  44 ++----
 web/src/lib/modals/ApiKeyCreateModal.svelte   |  60 ++++++++
 web/src/lib/modals/ApiKeyModal.svelte         | 140 ------------------
 web/src/lib/modals/ApiKeyUpdateModal.svelte   |  69 +++++++++
 5 files changed, 216 insertions(+), 175 deletions(-)
 create mode 100644 web/src/lib/components/ApiKeyPermissionsPicker.svelte
 create mode 100644 web/src/lib/modals/ApiKeyCreateModal.svelte
 delete mode 100644 web/src/lib/modals/ApiKeyModal.svelte
 create mode 100644 web/src/lib/modals/ApiKeyUpdateModal.svelte

diff --git a/web/src/lib/components/ApiKeyPermissionsPicker.svelte b/web/src/lib/components/ApiKeyPermissionsPicker.svelte
new file mode 100644
index 0000000000..ecdb68b038
--- /dev/null
+++ b/web/src/lib/components/ApiKeyPermissionsPicker.svelte
@@ -0,0 +1,78 @@
+<script lang="ts">
+  import ApiKeyGrid from '$lib/components/user-settings-page/user-api-key-grid.svelte';
+  import { Permission } from '@immich/sdk';
+  import { Checkbox, IconButton, Input, Label } from '@immich/ui';
+  import { mdiClose } from '@mdi/js';
+  import { t } from 'svelte-i18n';
+
+  type Props = {
+    selectedPermissions: Permission[];
+  };
+
+  let { selectedPermissions = $bindable([]) }: Props = $props();
+
+  const permissions: Record<string, Permission[]> = {};
+  for (const permission of Object.values(Permission)) {
+    if (permission === Permission.All) {
+      continue;
+    }
+
+    const [group] = permission.split('.');
+    if (!permissions[group]) {
+      permissions[group] = [];
+    }
+    permissions[group].push(permission);
+  }
+
+  let searchValue = $state('');
+  let allItemsSelected = $derived(selectedPermissions.length === Object.keys(Permission).length - 1);
+
+  const matchFilter = (search: string) => {
+    search = search.toLowerCase();
+
+    return ([title, items]: [string, Permission[]]) =>
+      title.toLowerCase().includes(search) || items.some((item) => item.toLowerCase().includes(search));
+  };
+
+  const onCheckedAllChange = (checked: boolean) => {
+    selectedPermissions = checked
+      ? Object.values(Permission).filter((permission) => permission !== Permission.All)
+      : [];
+  };
+
+  const filteredResults = $derived(Object.entries(permissions).filter(matchFilter(searchValue)));
+
+  const handleSelectItems = (items: Permission[]) =>
+    (selectedPermissions = Array.from(new Set([...selectedPermissions, ...items])));
+
+  const handleDeselectItems = (items: Permission[]) =>
+    (selectedPermissions = selectedPermissions.filter((item) => !items.includes(item)));
+</script>
+
+<Label label={$t('permission')} for="permission-container" />
+<div class="flex items-center gap-2 m-4" id="permission-container">
+  <Checkbox id="input-select-all" size="tiny" checked={allItemsSelected} onCheckedChange={onCheckedAllChange} />
+  <Label label={$t('select_all')} for="input-select-all" />
+</div>
+
+<div class="ms-4 flex flex-col gap-2">
+  <Input bind:value={searchValue} placeholder={$t('search')}>
+    {#snippet trailingIcon()}
+      {#if searchValue}
+        <IconButton
+          icon={mdiClose}
+          size="small"
+          variant="ghost"
+          shape="round"
+          color="secondary"
+          class="me-1"
+          onclick={() => (searchValue = '')}
+          aria-label={$t('clear')}
+        />
+      {/if}
+    {/snippet}
+  </Input>
+  {#each filteredResults as [title, subItems] (title)}
+    <ApiKeyGrid {title} {subItems} selectedItems={selectedPermissions} {handleSelectItems} {handleDeselectItems} />
+  {/each}
+</div>
diff --git a/web/src/lib/components/user-settings-page/user-api-key-list.svelte b/web/src/lib/components/user-settings-page/user-api-key-list.svelte
index 2e37a83269..96e159459a 100644
--- a/web/src/lib/components/user-settings-page/user-api-key-list.svelte
+++ b/web/src/lib/components/user-settings-page/user-api-key-list.svelte
@@ -1,10 +1,11 @@
 <script lang="ts">
   import { dateFormats } from '$lib/constants';
-  import ApiKeyModal from '$lib/modals/ApiKeyModal.svelte';
+  import ApiKeyCreateModal from '$lib/modals/ApiKeyCreateModal.svelte';
   import ApiKeySecretModal from '$lib/modals/ApiKeySecretModal.svelte';
+  import ApiKeyUpdateModal from '$lib/modals/ApiKeyUpdateModal.svelte';
   import { locale } from '$lib/stores/preferences.store';
   import { handleError } from '$lib/utils/handle-error';
-  import { createApiKey, deleteApiKey, getApiKeys, updateApiKey, type ApiKeyResponseDto } from '@immich/sdk';
+  import { deleteApiKey, getApiKeys, type ApiKeyResponseDto } from '@immich/sdk';
   import { Button, IconButton, modalManager, toastManager } from '@immich/ui';
   import { mdiPencilOutline, mdiTrashCanOutline } from '@mdi/js';
   import { t } from 'svelte-i18n';
@@ -21,49 +22,22 @@
   }
 
   const handleCreate = async () => {
-    const result = await modalManager.show(ApiKeyModal, {
-      title: $t('new_api_key'),
-      apiKey: { name: 'API Key', permissions: [] },
-      submitText: $t('create'),
-    });
+    const secret = await modalManager.show(ApiKeyCreateModal);
 
-    if (!result) {
+    if (!secret) {
       return;
     }
 
-    try {
-      const { secret } = await createApiKey({
-        apiKeyCreateDto: {
-          name: result.name,
-          permissions: result.permissions,
-        },
-      });
-
-      await modalManager.show(ApiKeySecretModal, { secret });
-    } catch (error) {
-      handleError(error, $t('errors.unable_to_create_api_key'));
-    } finally {
-      await refreshKeys();
-    }
+    await modalManager.show(ApiKeySecretModal, { secret });
+    await refreshKeys();
   };
 
   const handleUpdate = async (key: ApiKeyResponseDto) => {
-    const result = await modalManager.show(ApiKeyModal, {
-      title: $t('api_key'),
-      submitText: $t('save'),
+    const success = await modalManager.show(ApiKeyUpdateModal, {
       apiKey: key,
     });
 
-    if (!result) {
-      return;
-    }
-
-    try {
-      await updateApiKey({ id: key.id, apiKeyUpdateDto: { name: result.name, permissions: result.permissions } });
-      toastManager.success($t('saved_api_key'));
-    } catch (error) {
-      handleError(error, $t('errors.unable_to_save_api_key'));
-    } finally {
+    if (success) {
       await refreshKeys();
     }
   };
diff --git a/web/src/lib/modals/ApiKeyCreateModal.svelte b/web/src/lib/modals/ApiKeyCreateModal.svelte
new file mode 100644
index 0000000000..72019eb58a
--- /dev/null
+++ b/web/src/lib/modals/ApiKeyCreateModal.svelte
@@ -0,0 +1,60 @@
+<script lang="ts">
+  import ApiKeyPermissionsPicker from '$lib/components/ApiKeyPermissionsPicker.svelte';
+  import { handleError } from '$lib/utils/handle-error';
+  import { createApiKey, Permission } from '@immich/sdk';
+  import { Button, Field, HStack, Input, Modal, ModalBody, ModalFooter, toastManager } from '@immich/ui';
+  import { mdiKeyVariant } from '@mdi/js';
+  import { t } from 'svelte-i18n';
+
+  type Props = { onClose: (secret?: string) => void };
+
+  const { onClose }: Props = $props();
+
+  let name = $state('API Key');
+  let selectedPermissions = $state<Permission[]>([]);
+  const isAllPermissions = $derived(selectedPermissions.length === Object.keys(Permission).length - 1);
+
+  const onsubmit = async () => {
+    if (!name) {
+      toastManager.warning($t('api_key_empty'));
+      return;
+    }
+
+    if (selectedPermissions.length === 0) {
+      toastManager.warning($t('permission_empty'));
+      return;
+    }
+
+    try {
+      const { secret } = await createApiKey({
+        apiKeyCreateDto: {
+          name,
+          permissions: isAllPermissions ? [Permission.All] : selectedPermissions,
+        },
+      });
+      onClose(secret);
+    } catch (error) {
+      handleError(error, $t('errors.unable_to_create_api_key'));
+    }
+  };
+</script>
+
+<Modal title={$t('new_api_key')} icon={mdiKeyVariant} {onClose} size="giant">
+  <ModalBody>
+    <form {onsubmit} autocomplete="off" id="api-key-form">
+      <div class="mb-4 flex flex-col gap-2">
+        <Field label={$t('name')}>
+          <Input bind:value={name} />
+        </Field>
+      </div>
+      <ApiKeyPermissionsPicker bind:selectedPermissions />
+    </form>
+  </ModalBody>
+
+  <ModalFooter>
+    <HStack fullWidth>
+      <Button shape="round" color="secondary" fullWidth onclick={() => onClose()}>{$t('cancel')}</Button>
+      <Button shape="round" type="submit" fullWidth form="api-key-form">{$t('create')}</Button>
+    </HStack>
+  </ModalFooter>
+</Modal>
diff --git a/web/src/lib/modals/ApiKeyModal.svelte b/web/src/lib/modals/ApiKeyModal.svelte
deleted file mode 100644
index a461c18cc8..0000000000
--- a/web/src/lib/modals/ApiKeyModal.svelte
+++ /dev/null
@@ -1,140 +0,0 @@
-<script lang="ts">
-  import ApiKeyGrid from '$lib/components/user-settings-page/user-api-key-grid.svelte';
-  import { Permission } from '@immich/sdk';
-  import {
-    Button,
-    Checkbox,
-    Field,
-    HStack,
-    IconButton,
-    Input,
-    Label,
-    Modal,
-    ModalBody,
-    ModalFooter,
-    toastManager,
-  } from '@immich/ui';
-  import { mdiClose, mdiKeyVariant } from '@mdi/js';
-  import { onMount } from 'svelte';
-  import { t } from 'svelte-i18n';
-
-  const matches = (value: string) => {
-    value = value.toLowerCase();
-    return ([title, items]: [string, Permission[]]) => {
-      return title.toLowerCase().includes(value) || items.some((item) => item.toLowerCase().includes(value));
-    };
-  };
-
-  interface Props {
-    apiKey: { name: string; permissions: Permission[] };
-    title: string;
-    cancelText?: string;
-    submitText?: string;
-    onClose: (apiKey?: { name: string; permissions: Permission[] }) => void;
-  }
-
-  let { apiKey = $bindable(), title, cancelText = $t('cancel'), submitText = $t('save'), onClose }: Props = $props();
-  let name = $derived(apiKey.name);
-
-  let selectedItems: Permission[] = $state(apiKey.permissions);
-  let selectAllItems = $derived(selectedItems.length === Object.keys(Permission).length - 1);
-
-  const permissions: Record<string, Permission[]> = {};
-  for (const permission of Object.values(Permission)) {
-    if (permission === Permission.All) {
-      continue;
-    }
-
-    const [group] = permission.split('.');
-    if (!permissions[group]) {
-      permissions[group] = [];
-    }
-    permissions[group].push(permission);
-  }
-
-  let searchValue = $state('');
-  let filteredResults = $derived(Object.entries(permissions).filter(matches(searchValue)));
-
-  const handleSelectItems = (permissions: Permission[]) => {
-    selectedItems = Array.from(new Set([...selectedItems, ...permissions]));
-  };
-
-  const handleDeselectItems = (permissions: Permission[]) => {
-    selectedItems = selectedItems.filter((item) => !permissions.includes(item));
-  };
-
-  const handleSelectAllItems = () => {
-    selectedItems = selectAllItems ? [] : Object.values(Permission).filter((item) => item !== Permission.All);
-  };
-
-  const handleSubmit = () => {
-    if (!name) {
-      toastManager.warning($t('api_key_empty'));
-    } else if (selectedItems.length === 0) {
-      toastManager.warning($t('permission_empty'));
-    } else {
-      if (selectAllItems) {
-        onClose({ name, permissions: [Permission.All] });
-      } else {
-        onClose({ name, permissions: selectedItems });
-      }
-    }
-  };
-
-  const onsubmit = (event: Event) => {
-    event.preventDefault();
-    handleSubmit();
-  };
-
-  onMount(() => {
-    if (apiKey.permissions.includes(Permission.All)) {
-      handleSelectAllItems();
-    }
-  });
-</script>
-
-<Modal {title} icon={mdiKeyVariant} {onClose} size="giant">
-  <ModalBody>
-    <form {onsubmit} autocomplete="off" id="api-key-form">
-      <div class="mb-4 flex flex-col gap-2">
-        <Field label={$t('name')}>
-          <Input bind:value={name} />
-        </Field>
-      </div>
-      <Label label={$t('permission')} for="permission-container" />
-      <div class="flex items-center gap-2 m-4" id="permission-container">
-        <Checkbox id="input-select-all" size="tiny" checked={selectAllItems} onCheckedChange={handleSelectAllItems} />
-        <Label label={$t('select_all')} for="input-select-all" />
-      </div>
-
-      <div class="ms-4 flex flex-col gap-2">
-        <Input bind:value={searchValue} placeholder={$t('search')}>
-          {#snippet trailingIcon()}
-            {#if searchValue}
-              <IconButton
-                icon={mdiClose}
-                size="small"
-                variant="ghost"
-                shape="round"
-                color="secondary"
-                class="me-1"
-                onclick={() => (searchValue = '')}
-                aria-label={$t('clear')}
-              />
-            {/if}
-          {/snippet}
-        </Input>
-        {#each filteredResults as [title, subItems] (title)}
-          <ApiKeyGrid {title} {subItems} {selectedItems} {handleSelectItems} {handleDeselectItems} />
-        {/each}
-      </div>
-    </form>
-  </ModalBody>
-
-  <ModalFooter>
-    <HStack fullWidth>
-      <Button shape="round" color="secondary" fullWidth onclick={() => onClose()}>{cancelText}</Button>
-      <Button shape="round" type="submit" fullWidth form="api-key-form">{submitText}</Button>
-    </HStack>
-  </ModalFooter>
-</Modal>
diff --git a/web/src/lib/modals/ApiKeyUpdateModal.svelte b/web/src/lib/modals/ApiKeyUpdateModal.svelte
new file mode 100644
index 0000000000..a380c72a06
--- /dev/null
+++ b/web/src/lib/modals/ApiKeyUpdateModal.svelte
@@ -0,0 +1,69 @@
+<script lang="ts">
+  import ApiKeyPermissionsPicker from '$lib/components/ApiKeyPermissionsPicker.svelte';
+  import { handleError } from '$lib/utils/handle-error';
+  import { Permission, updateApiKey } from '@immich/sdk';
+  import { Button, Field, HStack, Input, Modal, ModalBody, ModalFooter, toastManager } from '@immich/ui';
+  import { mdiKeyVariant } from '@mdi/js';
+  import { t } from 'svelte-i18n';
+
+  interface Props {
+    apiKey: { id: string; name: string; permissions: Permission[] };
+    onClose: (success?: true) => void;
+  }
+
+  let { apiKey, onClose }: Props = $props();
+
+  const mapPermissions = (permissions: Permission[]) =>
+    permissions.includes(Permission.All)
+      ? Object.values(Permission).filter((permission) => permission !== Permission.All)
+      : permissions;
+  const isAllPermissions = (permissions: Permission[]) => permissions.length === Object.keys(Permission).length - 1;
+
+  let name = $state(apiKey.name);
+  let selectedPermissions = $state<Permission[]>(mapPermissions(apiKey.permissions));
+
+  const onsubmit = async () => {
+    if (!name) {
+      toastManager.warning($t('api_key_empty'));
+      return;
+    }
+    if (selectedPermissions.length === 0) {
+      toastManager.warning($t('permission_empty'));
+      return;
+    }
+
+    try {
+      await updateApiKey({
+        id: apiKey.id,
+        apiKeyUpdateDto: {
+          name,
+          permissions: isAllPermissions(selectedPermissions) ? [Permission.All] : selectedPermissions,
+        },
+      });
+      toastManager.success($t('saved_api_key'));
+      onClose(true);
+    } catch (error) {
+      handleError(error, $t('errors.unable_to_save_api_key'));
+    }
+  };
+</script>
+
+<Modal title={$t('api_key')} icon={mdiKeyVariant} {onClose} size="giant">
+  <ModalBody>
+    <form {onsubmit} autocomplete="off" id="api-key-form">
+      <div class="mb-4 flex flex-col gap-2">
+        <Field label={$t('name')}>
+          <Input bind:value={name} />
+        </Field>
+      </div>
+      <ApiKeyPermissionsPicker bind:selectedPermissions />
+    </form>
+  </ModalBody>
+
+  <ModalFooter>
+    <HStack fullWidth>
+      <Button shape="round" color="secondary" fullWidth onclick={() => onClose()}>{$t('cancel')}</Button>
+      <Button shape="round" type="submit" fullWidth form="api-key-form">{$t('save')}</Button>
+    </HStack>
+  </ModalFooter>
+</Modal>

From 5c7d5539eab3390397177bf86d3bb5a24300659d Mon Sep 17 00:00:00 2001
From: Mert <101130780+mertalev@users.noreply.github.com>
Date: Fri, 31 Oct 2025 09:41:09 -0400
Subject: [PATCH 02/84] fix(mobile): video seeking on android (#23405)

use int for seeking
---
 mobile/pubspec.lock | 4 ++--
 mobile/pubspec.yaml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mobile/pubspec.lock b/mobile/pubspec.lock
index ec2742f980..0b10384621 100644
--- a/mobile/pubspec.lock
+++ b/mobile/pubspec.lock
@@ -1233,8 +1233,8 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: d921ae2
-      resolved-ref: d921ae210e294d2821954009ec2cc8aeae918725
+      ref: e132bc3
+      resolved-ref: e132bc3ecc6a6d8fc2089d96f849c8a13129500e
       url: "https://github.com/immich-app/native_video_player"
     source: git
     version: "1.3.1"
diff --git a/mobile/pubspec.yaml b/mobile/pubspec.yaml
index aea97a25b3..da8a5f3b81 100644
--- a/mobile/pubspec.yaml
+++ b/mobile/pubspec.yaml
@@ -57,7 +57,7 @@ dependencies:
   native_video_player:
     git:
       url: https://github.com/immich-app/native_video_player
-      ref: 'd921ae2'
+      ref: 'e132bc3'
   network_info_plus: ^6.1.3
   octo_image: ^2.1.0
   openapi:

From c69786b0395b59e9b2849a71ff430eb26309cfa0 Mon Sep 17 00:00:00 2001
From: Alex <alex.tran1502@gmail.com>
Date: Fri, 31 Oct 2025 08:42:01 -0500
Subject: [PATCH 03/84] fix: button condition rendering (#23400)

---
 .../asset_viewer/bottom_sheet.widget.dart     | 22 +++++++++++++++----
 mobile/lib/utils/action_button.utils.dart     |  2 +-
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet.widget.dart b/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet.widget.dart
index 00e16fa870..9271c99ae9 100644
--- a/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet.widget.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet.widget.dart
@@ -141,14 +141,28 @@ class _AssetDetailBottomSheet extends ConsumerWidget {
   }
 
   Widget _buildAppearsInList(WidgetRef ref, BuildContext context) {
-    final isRemote = ref.watch(currentAssetNotifier)?.hasRemote ?? false;
-    if (!isRemote) {
+    final aseet = ref.watch(currentAssetNotifier);
+    if (aseet == null) {
+      return const SizedBox.shrink();
+    }
+
+    if (!aseet.hasRemote) {
+      return const SizedBox.shrink();
+    }
+
+    String? remoteAssetId;
+    if (aseet is RemoteAsset) {
+      remoteAssetId = aseet.id;
+    } else if (aseet is LocalAsset) {
+      remoteAssetId = aseet.remoteAssetId;
+    }
+
+    if (remoteAssetId == null) {
       return const SizedBox.shrink();
     }
 
-    final remoteAsset = ref.watch(currentAssetNotifier) as RemoteAsset;
     final userId = ref.watch(currentUserProvider)?.id;
-    final assetAlbums = ref.watch(albumsContainingAssetProvider(remoteAsset.id));
+    final assetAlbums = ref.watch(albumsContainingAssetProvider(remoteAssetId));
 
     return assetAlbums.when(
       data: (albums) {
diff --git a/mobile/lib/utils/action_button.utils.dart b/mobile/lib/utils/action_button.utils.dart
index de606c83d3..42729becc9 100644
--- a/mobile/lib/utils/action_button.utils.dart
+++ b/mobile/lib/utils/action_button.utils.dart
@@ -127,7 +127,7 @@ enum ActionButtonType {
             context.currentAlbum!.isShared,
       ActionButtonType.similarPhotos =>
         !context.isInLockedView && //
-            context.asset.hasRemote,
+            context.asset is RemoteAsset,
     };
   }
 

From 7ea443b3a9500baa7bbafe873816b67904ec375d Mon Sep 17 00:00:00 2001
From: Alex <alex.tran1502@gmail.com>
Date: Fri, 31 Oct 2025 09:05:03 -0500
Subject: [PATCH 04/84] chore: gha ios release | take 5 (#23203)

* chore: gha ios release | take 5

* code signing

* code signing 2

* manual signing for extensions

* chore(ios): add explicit code signing identity and debug output

* dev appbundle

* Deployment flow for development app

* skip waiting for change log

* refactor

* fix: ruby version

* fix: manual release lane

* build on main
---
 .github/workflows/build-mobile.yml          |  74 +++++++--
 mobile/ios/Gemfile                          |   3 +-
 mobile/ios/Runner.xcodeproj/project.pbxproj |  14 +-
 mobile/ios/fastlane/Fastfile                | 165 ++++++++++++++++----
 mobile/ios/fastlane/README.md               |  22 ++-
 5 files changed, 221 insertions(+), 57 deletions(-)

diff --git a/.github/workflows/build-mobile.yml b/.github/workflows/build-mobile.yml
index 1286b45409..5781276e4f 100644
--- a/.github/workflows/build-mobile.yml
+++ b/.github/workflows/build-mobile.yml
@@ -2,6 +2,15 @@ name: Build Mobile
 
 on:
   workflow_dispatch:
+    inputs:
+      environment:
+        description: 'Target environment'
+        required: true
+        default: 'development'
+        type: choice
+        options:
+          - production
+          - development
   workflow_call:
     inputs:
       ref:
@@ -193,17 +202,22 @@ jobs:
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '3.4.7'
+          ruby-version: '3.3'
           working-directory: ./mobile/ios
 
-      - name: Install Fastlane
+      - name: Install CocoaPods dependencies
+        working-directory: ./mobile/ios
+        run: |
+          pod install
+
+      - name: Install Fastlane
+        working-directory: ./mobile/ios
         run: |
-          cd mobile/ios
           gem install bundler
           bundle config set --local path 'vendor/bundle'
           bundle install
 
-      - name: Create API Key JSON
+      - name: Create API Key
         env:
           API_KEY_ID: ${{ secrets.APP_STORE_CONNECT_API_KEY_ID }}
           API_KEY_ISSUER_ID: ${{ secrets.APP_STORE_CONNECT_API_KEY_ISSUER_ID }}
@@ -212,35 +226,55 @@ jobs:
         run: |
           mkdir -p ~/.appstoreconnect/private_keys
           echo "$API_KEY_CONTENT" | base64 --decode > ~/.appstoreconnect/private_keys/AuthKey_${API_KEY_ID}.p8
-          cat > api_key.json << EOF
-          {
-            "key_id": "${API_KEY_ID}",
-            "issuer_id": "${API_KEY_ISSUER_ID}",
-            "key": "$(cat ~/.appstoreconnect/private_keys/AuthKey_${API_KEY_ID}.p8)",
-            "duration": 1200,
-            "in_house": false
-          }
-          EOF
 
-      - name: Import Certificate and Provisioning Profile
+      - name: Import Certificate and Provisioning Profiles
         env:
           IOS_CERTIFICATE_P12: ${{ secrets.IOS_CERTIFICATE_P12 }}
           IOS_CERTIFICATE_PASSWORD: ${{ secrets.IOS_CERTIFICATE_PASSWORD }}
           IOS_PROVISIONING_PROFILE: ${{ secrets.IOS_PROVISIONING_PROFILE }}
+          IOS_PROVISIONING_PROFILE_SHARE_EXTENSION: ${{ secrets.IOS_PROVISIONING_PROFILE_SHARE_EXTENSION }}
+          IOS_PROVISIONING_PROFILE_WIDGET_EXTENSION: ${{ secrets.IOS_PROVISIONING_PROFILE_WIDGET_EXTENSION }}
+          IOS_DEVELOPMENT_PROVISIONING_PROFILE: ${{ secrets.IOS_DEVELOPMENT_PROVISIONING_PROFILE }}
+          IOS_DEVELOPMENT_PROVISIONING_PROFILE_SHARE_EXTENSION: ${{ secrets.IOS_DEVELOPMENT_PROVISIONING_PROFILE_SHARE_EXTENSION }}
+          IOS_DEVELOPMENT_PROVISIONING_PROFILE_WIDGET_EXTENSION: ${{ secrets.IOS_DEVELOPMENT_PROVISIONING_PROFILE_WIDGET_EXTENSION }}
+          ENVIRONMENT: ${{ inputs.environment || 'development' }}
         working-directory: ./mobile/ios
         run: |
+          # Decode certificate
           echo "$IOS_CERTIFICATE_P12" | base64 --decode > certificate.p12
-          echo "$IOS_PROVISIONING_PROFILE" | base64 --decode > profile.mobileprovision
 
-      - name: Create keychain
+          # Decode provisioning profiles based on environment
+          if [[ "$ENVIRONMENT" == "development" ]]; then
+            echo "$IOS_DEVELOPMENT_PROVISIONING_PROFILE" | base64 --decode > profile_dev.mobileprovision
+            echo "$IOS_DEVELOPMENT_PROVISIONING_PROFILE_SHARE_EXTENSION" | base64 --decode > profile_dev_share.mobileprovision
+            echo "$IOS_DEVELOPMENT_PROVISIONING_PROFILE_WIDGET_EXTENSION" | base64 --decode > profile_dev_widget.mobileprovision
+            ls -lh profile_dev*.mobileprovision
+          else
+            echo "$IOS_PROVISIONING_PROFILE" | base64 --decode > profile.mobileprovision
+            echo "$IOS_PROVISIONING_PROFILE_SHARE_EXTENSION" | base64 --decode > profile_share.mobileprovision
+            echo "$IOS_PROVISIONING_PROFILE_WIDGET_EXTENSION" | base64 --decode > profile_widget.mobileprovision
+            ls -lh profile*.mobileprovision
+          fi
+
+      - name: Create keychain and import certificate
         env:
           KEYCHAIN_PASSWORD: ${{ secrets.IOS_CERTIFICATE_PASSWORD }}
+          CERTIFICATE_PASSWORD: ${{ secrets.IOS_CERTIFICATE_PASSWORD }}
+        working-directory: ./mobile/ios
         run: |
+          # Create keychain
           security create-keychain -p "$KEYCHAIN_PASSWORD" build.keychain
           security default-keychain -s build.keychain
           security unlock-keychain -p "$KEYCHAIN_PASSWORD" build.keychain
           security set-keychain-settings -t 3600 -u build.keychain
 
+          # Import certificate
+          security import certificate.p12 -k build.keychain -P "$CERTIFICATE_PASSWORD" -T /usr/bin/codesign -T /usr/bin/security
+          security set-key-partition-list -S apple-tool:,apple: -s -k "$KEYCHAIN_PASSWORD" build.keychain
+
+          # Verify certificate was imported
+          security find-identity -v -p codesigning build.keychain
+
       - name: Build and deploy to TestFlight
         env:
           FASTLANE_TEAM_ID: ${{ secrets.FASTLANE_TEAM_ID }}
@@ -249,8 +283,14 @@ jobs:
           KEYCHAIN_PASSWORD: ${{ secrets.IOS_CERTIFICATE_PASSWORD }}
           APP_STORE_CONNECT_API_KEY_ID: ${{ secrets.APP_STORE_CONNECT_API_KEY_ID }}
           APP_STORE_CONNECT_API_KEY_ISSUER_ID: ${{ secrets.APP_STORE_CONNECT_API_KEY_ISSUER_ID }}
+          ENVIRONMENT: ${{ inputs.environment || 'development' }}
         working-directory: ./mobile/ios
-        run: bundle exec fastlane release_ci
+        run: |
+          if [[ "$ENVIRONMENT" == "development" ]]; then
+            bundle exec fastlane release_dev
+          else
+            bundle exec fastlane release_ci
+          fi
 
       - name: Clean up keychain
         if: always()
diff --git a/mobile/ios/Gemfile b/mobile/ios/Gemfile
index bb94aef518..3b6771ad35 100644
--- a/mobile/ios/Gemfile
+++ b/mobile/ios/Gemfile
@@ -1,4 +1,5 @@
 source "https://rubygems.org"
 
 gem "fastlane"
-gem "cocoapods"
\ No newline at end of file
+gem "cocoapods"
+gem "abbrev" # Required for Ruby 3.4+
\ No newline at end of file
diff --git a/mobile/ios/Runner.xcodeproj/project.pbxproj b/mobile/ios/Runner.xcodeproj/project.pbxproj
index 3f00b6c6aa..1b86a0b787 100644
--- a/mobile/ios/Runner.xcodeproj/project.pbxproj
+++ b/mobile/ios/Runner.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 54;
+	objectVersion = 77;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -133,15 +133,11 @@
 /* Begin PBXFileSystemSynchronizedRootGroup section */
 		B231F52D2E93A44A00BC45D1 /* Core */ = {
 			isa = PBXFileSystemSynchronizedRootGroup;
-			exceptions = (
-			);
 			path = Core;
 			sourceTree = "<group>";
 		};
 		B2CF7F8C2DDE4EBB00744BF6 /* Sync */ = {
 			isa = PBXFileSystemSynchronizedRootGroup;
-			exceptions = (
-			);
 			path = Sync;
 			sourceTree = "<group>";
 		};
@@ -530,10 +526,14 @@
 			inputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
 			);
+			inputPaths = (
+			);
 			name = "[CP] Copy Pods Resources";
 			outputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
 			);
+			outputPaths = (
+			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
@@ -562,10 +562,14 @@
 			inputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
 			);
+			inputPaths = (
+			);
 			name = "[CP] Embed Pods Frameworks";
 			outputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
 			);
+			outputPaths = (
+			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
diff --git a/mobile/ios/fastlane/Fastfile b/mobile/ios/fastlane/Fastfile
index 260b729579..5637745954 100644
--- a/mobile/ios/fastlane/Fastfile
+++ b/mobile/ios/fastlane/Fastfile
@@ -16,42 +16,81 @@
 default_platform(:ios)
 
 platform :ios do
-  desc "iOS Release to TestFlight"
-  lane :release_ci do
-    # Setup CI environment
-    setup_ci
-    
-    # Load App Store Connect API Key
-    api_key = app_store_connect_api_key(
+  # Constants
+  TEAM_ID = "2F67MQ8R79"
+  CODE_SIGN_IDENTITY = "Apple Distribution: Hau Tran (#{TEAM_ID})"
+  BASE_BUNDLE_ID = "app.alextran.immich"
+  
+  # Helper method to get App Store Connect API key
+  def get_api_key
+    app_store_connect_api_key(
       key_id: ENV["APP_STORE_CONNECT_API_KEY_ID"],
       issuer_id: ENV["APP_STORE_CONNECT_API_KEY_ISSUER_ID"],
-      key_filepath: "api_key.json"
+      key_filepath: "#{Dir.home}/.appstoreconnect/private_keys/AuthKey_#{ENV['APP_STORE_CONNECT_API_KEY_ID']}.p8",
+      duration: 1200,
+      in_house: false
     )
+  end
+  
+  # Helper method to configure code signing for all targets
+  def configure_code_signing(bundle_id_suffix: "")
+    bundle_suffix = bundle_id_suffix.empty? ? "" : ".#{bundle_id_suffix}"
     
-    # Import certificate and provisioning profile
-    import_certificate(
-      certificate_path: "certificate.p12",
-      certificate_password: ENV["IOS_CERTIFICATE_PASSWORD"],
-      keychain_name: ENV["KEYCHAIN_NAME"],
-      keychain_password: ENV["KEYCHAIN_PASSWORD"]
-    )
-    
-    # Install provisioning profile
-    install_provisioning_profile(path: "profile.mobileprovision")
-    
-    # Configure code signing
+    # Runner (main app)
     update_code_signing_settings(
       use_automatic_signing: false,
       path: "./Runner.xcodeproj",
-      team_id: ENV["FASTLANE_TEAM_ID"],
-      profile_name: "app.alextran.immich AppStore"
+      team_id: ENV["FASTLANE_TEAM_ID"] || TEAM_ID,
+      code_sign_identity: CODE_SIGN_IDENTITY,
+      bundle_identifier: "#{BASE_BUNDLE_ID}#{bundle_suffix}",
+      profile_name: "#{BASE_BUNDLE_ID}#{bundle_suffix} AppStore",
+      targets: ["Runner"]
     )
     
+    # ShareExtension
+    update_code_signing_settings(
+      use_automatic_signing: false,
+      path: "./Runner.xcodeproj",
+      team_id: ENV["FASTLANE_TEAM_ID"] || TEAM_ID,
+      code_sign_identity: CODE_SIGN_IDENTITY,
+      bundle_identifier: "#{BASE_BUNDLE_ID}#{bundle_suffix}.ShareExtension",
+      profile_name: "#{BASE_BUNDLE_ID}#{bundle_suffix}.ShareExtension AppStore",
+      targets: ["ShareExtension"]
+    )
+    
+    # WidgetExtension
+    update_code_signing_settings(
+      use_automatic_signing: false,
+      path: "./Runner.xcodeproj",
+      team_id: ENV["FASTLANE_TEAM_ID"] || TEAM_ID,
+      code_sign_identity: CODE_SIGN_IDENTITY,
+      bundle_identifier: "#{BASE_BUNDLE_ID}#{bundle_suffix}.Widget",
+      profile_name: "#{BASE_BUNDLE_ID}#{bundle_suffix}.Widget AppStore",
+      targets: ["WidgetExtension"]
+    )
+  end
+  
+  # Helper method to build and upload to TestFlight
+  def build_and_upload(
+    api_key:,
+    bundle_id_suffix: "",
+    configuration: "Release",
+    distribute_external: true,
+    version_number: nil
+  )
+    bundle_suffix = bundle_id_suffix.empty? ? "" : ".#{bundle_id_suffix}"
+    app_identifier = "#{BASE_BUNDLE_ID}#{bundle_suffix}"
+    
+    # Set version number if provided
+    if version_number
+      increment_version_number(version_number: version_number)
+    end
+    
     # Increment build number
     increment_build_number(
       build_number: latest_testflight_build_number(
         api_key: api_key,
-        app_identifier: "app.alextran.immich"
+        app_identifier: app_identifier
       ) + 1,
       xcodeproj: "./Runner.xcodeproj"
     )
@@ -60,25 +99,74 @@ platform :ios do
     build_app(
       scheme: "Runner",
       workspace: "Runner.xcworkspace",
+      configuration: configuration,
       export_method: "app-store",
+      xcargs: "CODE_SIGN_IDENTITY='#{CODE_SIGN_IDENTITY}' CODE_SIGN_STYLE=Manual",
       export_options: {
         provisioningProfiles: {
-          "app.alextran.immich" => "app.alextran.immich AppStore"
-        }
+          "#{app_identifier}" => "#{app_identifier} AppStore",
+          "#{app_identifier}.ShareExtension" => "#{app_identifier}.ShareExtension AppStore",
+          "#{app_identifier}.Widget" => "#{app_identifier}.Widget AppStore"
+        },
+        signingStyle: "manual",
+        signingCertificate: CODE_SIGN_IDENTITY
       }
     )
     
     # Upload to TestFlight
     upload_to_testflight(
       api_key: api_key,
-      skip_waiting_for_build_processing: true
+      skip_waiting_for_build_processing: true,
+      distribute_external: distribute_external
+    )
+  end
+  
+  desc "iOS Development Build to TestFlight (requires separate bundle ID)"
+  lane :release_dev do
+    api_key = get_api_key
+    
+    # Install development provisioning profiles
+    install_provisioning_profile(path: "profile_dev.mobileprovision")
+    install_provisioning_profile(path: "profile_dev_share.mobileprovision")
+    install_provisioning_profile(path: "profile_dev_widget.mobileprovision")
+    
+    # Configure code signing for dev bundle IDs
+    configure_code_signing(bundle_id_suffix: "development")
+    
+    # Build and upload
+    build_and_upload(
+      api_key: api_key,
+      bundle_id_suffix: "development",
+      configuration: "Profile",
+      distribute_external: false
     )
   end
 
-  desc "iOS Release"
-  lane :release do
+  desc "iOS Release to TestFlight"
+  lane :release_ci do
+    api_key = get_api_key
+    
+    # Install provisioning profiles
+    install_provisioning_profile(path: "profile.mobileprovision")
+    install_provisioning_profile(path: "profile_share.mobileprovision")
+    install_provisioning_profile(path: "profile_widget.mobileprovision")
+    
+    
+    # Configure code signing for production bundle IDs
+    configure_code_signing
+
+    # Build and upload with version number
+    build_and_upload(
+      api_key: api_key,
+      version_number: "2.1.0"
+    )
+  end
+
+  desc "iOS Manual Release"
+  lane :release_manual do
     enable_automatic_code_signing(
       path: "./Runner.xcodeproj",
+      targets: ["Runner", "ShareExtension", "WidgetExtension"]
     )
     increment_version_number(
       version_number: "2.2.0"
@@ -86,9 +174,24 @@ platform :ios do
     increment_build_number(
       build_number: latest_testflight_build_number + 1,
     )
-    build_app(scheme: "Runner",
-              workspace: "Runner.xcworkspace",
-              xcargs: "-allowProvisioningUpdates")
+    
+    # Build archive with automatic signing
+    gym(
+      scheme: "Runner",
+      workspace: "Runner.xcworkspace",
+      configuration: "Release",
+      export_method: "app-store",
+      skip_package_ipa: false,
+      xcargs: "-allowProvisioningUpdates",
+      export_options: {
+        method: "app-store",
+        signingStyle: "automatic",
+        uploadBitcode: false,
+        uploadSymbols: true,
+        compileBitcode: false
+      }
+    )
+    
     upload_to_testflight(
       skip_waiting_for_build_processing: true
     )
diff --git a/mobile/ios/fastlane/README.md b/mobile/ios/fastlane/README.md
index 2999821730..2bea622b18 100644
--- a/mobile/ios/fastlane/README.md
+++ b/mobile/ios/fastlane/README.md
@@ -15,13 +15,29 @@ For _fastlane_ installation instructions, see [Installing _fastlane_](https://do
 
 ## iOS
 
-### ios release
+### ios release_dev
 
 ```sh
-[bundle exec] fastlane ios release
+[bundle exec] fastlane ios release_dev
 ```
 
-iOS Release
+iOS Development Build to TestFlight (requires separate bundle ID)
+
+### ios release_ci
+
+```sh
+[bundle exec] fastlane ios release_ci
+```
+
+iOS Release to TestFlight
+
+### ios release_manual
+
+```sh
+[bundle exec] fastlane ios release_manual
+```
+
+iOS Manual Release
 
 ----
 

From 32791e98c23ce5bb924d048495b5a79bcc8ce8a6 Mon Sep 17 00:00:00 2001
From: Alex <alex.tran1502@gmail.com>
Date: Fri, 31 Oct 2025 09:26:03 -0500
Subject: [PATCH 05/84] chore: trigger prod build on prepare-release (#23424)

* chore: trigger prod build on prepare-release

* clean up
---
 .github/workflows/build-mobile.yml    | 19 +++++++------------
 .github/workflows/prepare-release.yml |  1 +
 mobile/ios/fastlane/Fastfile          |  4 ++--
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/build-mobile.yml b/.github/workflows/build-mobile.yml
index 5781276e4f..f6f9a047b1 100644
--- a/.github/workflows/build-mobile.yml
+++ b/.github/workflows/build-mobile.yml
@@ -1,21 +1,16 @@
 name: Build Mobile
 
 on:
-  workflow_dispatch:
-    inputs:
-      environment:
-        description: 'Target environment'
-        required: true
-        default: 'development'
-        type: choice
-        options:
-          - production
-          - development
   workflow_call:
     inputs:
       ref:
         required: false
         type: string
+      environment:
+        description: 'Target environment'
+        required: true
+        default: 'development'
+        type: string
     secrets:
       KEY_JKS:
         required: true
@@ -287,9 +282,9 @@ jobs:
         working-directory: ./mobile/ios
         run: |
           if [[ "$ENVIRONMENT" == "development" ]]; then
-            bundle exec fastlane release_dev
+            bundle exec fastlane gha_testflight_dev
           else
-            bundle exec fastlane release_ci
+            bundle exec fastlane gha_release_prod
           fi
 
       - name: Clean up keychain
diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml
index 4aa78ee13a..8058ea7c94 100644
--- a/.github/workflows/prepare-release.yml
+++ b/.github/workflows/prepare-release.yml
@@ -101,6 +101,7 @@ jobs:
       ANDROID_STORE_PASSWORD: ${{ secrets.ANDROID_STORE_PASSWORD }}
     with:
       ref: ${{ needs.bump_version.outputs.ref }}
+      environment: production
 
   prepare_release:
     runs-on: ubuntu-latest
diff --git a/mobile/ios/fastlane/Fastfile b/mobile/ios/fastlane/Fastfile
index 5637745954..1b1b22b67f 100644
--- a/mobile/ios/fastlane/Fastfile
+++ b/mobile/ios/fastlane/Fastfile
@@ -122,7 +122,7 @@ platform :ios do
   end
   
   desc "iOS Development Build to TestFlight (requires separate bundle ID)"
-  lane :release_dev do
+  lane :gha_testflight_dev do
     api_key = get_api_key
     
     # Install development provisioning profiles
@@ -143,7 +143,7 @@ platform :ios do
   end
 
   desc "iOS Release to TestFlight"
-  lane :release_ci do
+  lane :gha_release_prod do
     api_key = get_api_key
     
     # Install provisioning profiles

From be15a84f9bfd6b8d5376fc8d35042720ac41ca5d Mon Sep 17 00:00:00 2001
From: luneth <48867138+luneth@users.noreply.github.com>
Date: Fri, 31 Oct 2025 15:40:53 +0100
Subject: [PATCH 06/84] chore: update android signing fingerprints to docs
 (#23361)

* Update mobile-app.mdx

Add certificate fingerprint for android releases.

* chore: formatting

* Chore: Typo

---------

Co-authored-by: Daniel Dietzler <mail@ddietzler.dev>
---
 docs/docs/features/mobile-app.mdx | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/docs/docs/features/mobile-app.mdx b/docs/docs/features/mobile-app.mdx
index 2d34507a26..8b9a204741 100644
--- a/docs/docs/features/mobile-app.mdx
+++ b/docs/docs/features/mobile-app.mdx
@@ -10,6 +10,16 @@ import MobileAppBackup from '/docs/partials/_mobile-app-backup.md';
 
 <MobileAppDownload />
 
+:::info Android verification
+Below are the SHA-256 fingerprints for the certificates signing the android applications.
+
+- Playstore / Github releases:
+  `86:C5:C4:55:DF:AF:49:85:92:3A:8F:35:AD:B3:1D:0C:9E:0B:95:7D:7F:94:C2:D2:AF:6A:24:38:AA:96:00:20`
+- F-Droid releases:
+  `FA:8B:43:95:F4:A6:47:71:A0:53:D1:C7:57:73:5F:A2:30:13:74:F5:3D:58:0D:D1:75:AA:F7:A1:35:72:9C:BF`
+
+:::
+
 :::info Beta Program
 The beta release channel allows users to test upcoming changes before they are officially released. To join the channel use the links below.
 

From f5d7e5acca50847fa96fd196f99241ff1978ba39 Mon Sep 17 00:00:00 2001
From: Daniel Dietzler <36593685+danieldietzler@users.noreply.github.com>
Date: Fri, 31 Oct 2025 16:38:17 +0100
Subject: [PATCH 07/84] chore: cannonical tailwind classes (#23427)

---
 .../admin-settings/SupportedDatetimePanel.svelte     |  2 +-
 .../admin-settings/SupportedVariablesPanel.svelte    |  2 +-
 .../components/album-page/albums-table-row.svelte    |  2 +-
 .../components/asset-viewer/activity-viewer.svelte   | 10 +++++-----
 .../lib/components/asset-viewer/asset-viewer.svelte  |  2 +-
 .../asset-viewer/detail-panel-description.svelte     |  4 ++--
 .../lib/components/asset-viewer/detail-panel.svelte  |  6 +++---
 .../components/asset-viewer/download-panel.svelte    | 10 +++++-----
 .../asset-viewer/face-editor/face-editor.svelte      |  2 +-
 .../lib/components/asset-viewer/photo-viewer.svelte  |  2 +-
 .../assets/thumbnail/image-thumbnail.svelte          |  2 +-
 .../lib/components/assets/thumbnail/thumbnail.svelte |  2 +-
 .../faces-page/assign-face-side-panel.svelte         |  4 ++--
 .../components/faces-page/merge-face-selector.svelte |  4 ++--
 .../components/faces-page/person-side-panel.svelte   | 12 ++++++------
 .../faces-page/unmerge-face-selector.svelte          |  4 ++--
 .../forms/library-import-paths-form.svelte           |  4 ++--
 .../forms/library-scan-settings-form.svelte          |  4 ++--
 web/src/lib/components/jobs/JobTile.svelte           |  4 +---
 web/src/lib/components/layouts/ErrorLayout.svelte    |  6 +++---
 .../lib/components/memory-page/memory-viewer.svelte  | 10 +++++-----
 .../onboarding-page/onboarding-hello.svelte          |  2 +-
 .../lib/components/photos-page/memory-lane.svelte    | 12 +++---------
 .../components/places-page/places-card-group.svelte  |  4 ++--
 .../server-statistics/ServerStatisticsCard.svelte    |  2 +-
 .../server-statistics/ServerStatisticsPanel.svelte   |  4 ++--
 .../share-page/individual-shared-viewer.svelte       |  2 +-
 .../shared-components/change-location.svelte         |  2 +-
 .../context-menu/context-menu.svelte                 |  2 +-
 .../shared-components/immich-logo-small-link.svelte  |  2 +-
 .../lib/components/shared-components/map/map.svelte  |  4 ++--
 .../navigation-bar/account-info-panel.svelte         |  2 +-
 .../navigation-bar/navigation-bar.svelte             |  2 +-
 .../navigation-bar/notification-item.svelte          |  2 +-
 .../navigation-bar/notification-panel.svelte         |  4 ++--
 .../individual-purchase-option-card.svelte           |  2 +-
 .../purchasing/server-purchase-option-card.svelte    |  2 +-
 .../shared-components/search-bar/search-bar.svelte   |  2 +-
 .../search-bar/search-people-section.svelte          |  2 +-
 .../settings/setting-checkboxes.svelte               |  2 +-
 .../settings/setting-combobox.svelte                 |  2 +-
 .../settings/setting-dropdown.svelte                 |  2 +-
 .../shared-components/settings/setting-select.svelte |  2 +-
 .../shared-components/settings/setting-switch.svelte |  2 +-
 .../settings/setting-textarea.svelte                 |  2 +-
 .../settings/settings-language-selector.svelte       |  2 +-
 .../shared-components/side-bar/purchase-info.svelte  |  6 +++---
 .../shared-components/upload-asset-preview.svelte    |  4 ++--
 .../components/shared-components/upload-panel.svelte |  6 +++---
 web/src/lib/components/sidebar/sidebar.spec.ts       |  2 +-
 web/src/lib/components/sidebar/sidebar.svelte        |  2 +-
 web/src/lib/components/timeline/Scrubber.svelte      | 12 ++++++------
 .../user-settings-page/user-api-key-list.svelte      |  2 +-
 web/src/lib/elements/Dropdown.svelte                 |  2 +-
 web/src/lib/modals/AlbumEditModal.svelte             |  2 +-
 web/src/lib/modals/AlbumPickerModal.svelte           |  2 +-
 web/src/lib/modals/AlbumShareModal.svelte            |  2 +-
 web/src/lib/modals/AlbumUsersModal.svelte            |  2 +-
 web/src/lib/modals/AppDownloadModal.svelte           |  6 +++---
 web/src/lib/modals/ObtainiumConfigModal.svelte       |  2 +-
 web/src/lib/modals/PartnerSelectionModal.svelte      |  2 +-
 web/src/lib/modals/ProfileImageCropperModal.svelte   |  2 +-
 .../[[photos=photos]]/[[assetId=id]]/+page.svelte    |  6 +++---
 web/src/routes/admin/jobs-status/+page.svelte        |  2 +-
 web/src/routes/admin/library-management/+page.svelte |  2 +-
 web/src/routes/admin/server-status/+page.svelte      |  2 +-
 web/src/routes/admin/system-settings/+page.svelte    |  2 +-
 web/src/routes/admin/users/+page.svelte              |  4 ++--
 web/src/routes/auth/onboarding/+page.svelte          |  2 +-
 69 files changed, 117 insertions(+), 125 deletions(-)

diff --git a/web/src/lib/components/admin-settings/SupportedDatetimePanel.svelte b/web/src/lib/components/admin-settings/SupportedDatetimePanel.svelte
index 82588d3be6..8d0307af11 100644
--- a/web/src/lib/components/admin-settings/SupportedDatetimePanel.svelte
+++ b/web/src/lib/components/admin-settings/SupportedDatetimePanel.svelte
@@ -25,7 +25,7 @@
     <p>{$t('admin.storage_template_date_time_description')}</p>
     <p>{$t('admin.storage_template_date_time_sample', { values: { date: '2022-02-03T20:03:05.250' } })}</p>
   </div>
-  <div class="flex gap-[40px]">
+  <div class="flex gap-10">
     <div>
       <p class="uppercase font-medium text-primary">{$t('year')}</p>
       <ul>
diff --git a/web/src/lib/components/admin-settings/SupportedVariablesPanel.svelte b/web/src/lib/components/admin-settings/SupportedVariablesPanel.svelte
index e39f0da771..74a05b553f 100644
--- a/web/src/lib/components/admin-settings/SupportedVariablesPanel.svelte
+++ b/web/src/lib/components/admin-settings/SupportedVariablesPanel.svelte
@@ -7,7 +7,7 @@
 </div>
 
 <div class="p-4 mt-2 text-xs bg-gray-200 rounded-lg dark:bg-gray-700 dark:text-immich-dark-fg">
-  <div class="flex gap-[50px]">
+  <div class="flex gap-12">
     <div>
       <p class="uppercase font-medium text-primary">{$t('filename')}</p>
       <ul>
diff --git a/web/src/lib/components/album-page/albums-table-row.svelte b/web/src/lib/components/album-page/albums-table-row.svelte
index 7cb30c8a8b..865eac8366 100644
--- a/web/src/lib/components/album-page/albums-table-row.svelte
+++ b/web/src/lib/components/album-page/albums-table-row.svelte
@@ -32,7 +32,7 @@
 </script>
 
 <tr
-  class="flex h-[50px] w-full place-items-center border-[3px] border-transparent p-2 text-center even:bg-subtle/20 odd:bg-subtle/80 hover:cursor-pointer hover:border-immich-primary/75 odd:dark:bg-immich-dark-gray/75 even:dark:bg-immich-dark-gray/50 dark:hover:border-immich-dark-primary/75 md:p-5"
+  class="flex h-12 w-full place-items-center border-3 border-transparent p-2 text-center even:bg-subtle/20 odd:bg-subtle/80 hover:cursor-pointer hover:border-immich-primary/75 odd:dark:bg-immich-dark-gray/75 even:dark:bg-immich-dark-gray/50 dark:hover:border-immich-dark-primary/75 md:p-5"
   onclick={() => goto(resolve(`${AppRoute.ALBUMS}/${album.id}`))}
   {oncontextmenu}
 >
diff --git a/web/src/lib/components/asset-viewer/activity-viewer.svelte b/web/src/lib/components/asset-viewer/activity-viewer.svelte
index d6508bbb6f..73b311769a 100644
--- a/web/src/lib/components/asset-viewer/activity-viewer.svelte
+++ b/web/src/lib/components/asset-viewer/activity-viewer.svelte
@@ -141,14 +141,14 @@
                 <UserAvatar user={reaction.user} size="sm" />
               </div>
 
-              <div class="w-full leading-4 overflow-hidden self-center break-words text-sm">{reaction.comment}</div>
+              <div class="w-full leading-4 overflow-hidden self-center wrap-break-word text-sm">{reaction.comment}</div>
               {#if assetId === undefined && reaction.assetId}
                 <a
-                  class="aspect-square w-[75px] h-[75px]"
+                  class="aspect-square w-19 h-19"
                   href={resolve(`${AppRoute.ALBUMS}/${albumId}/photos/${reaction.assetId}`)}
                 >
                   <img
-                    class="rounded-lg w-[75px] h-[75px] object-cover"
+                    class="rounded-lg w-19 h-19 object-cover"
                     src={getAssetThumbnailUrl(reaction.assetId)}
                     alt="Profile picture of {reaction.user.name}, who commented on this asset"
                   />
@@ -197,11 +197,11 @@
                 </div>
                 {#if assetId === undefined && reaction.assetId}
                   <a
-                    class="aspect-square w-[75px] h-[75px]"
+                    class="aspect-square w-19 h-19"
                     href={resolve(`${AppRoute.ALBUMS}/${albumId}/photos/${reaction.assetId}`)}
                   >
                     <img
-                      class="rounded-lg w-[75px] h-[75px] object-cover"
+                      class="rounded-lg w-19 h-19 object-cover"
                       src={getAssetThumbnailUrl(reaction.assetId)}
                       alt="Profile picture of {reaction.user.name}, who liked this asset"
                     />
diff --git a/web/src/lib/components/asset-viewer/asset-viewer.svelte b/web/src/lib/components/asset-viewer/asset-viewer.svelte
index 7bc7f6e000..8ff7a00710 100644
--- a/web/src/lib/components/asset-viewer/asset-viewer.svelte
+++ b/web/src/lib/components/asset-viewer/asset-viewer.svelte
@@ -593,7 +593,7 @@
 
             {#if stackedAsset.id === asset.id}
               <div class="w-full flex place-items-center place-content-center">
-                <div class="w-2 h-2 bg-white rounded-full flex mt-[2px]"></div>
+                <div class="w-2 h-2 bg-white rounded-full flex mt-0.5"></div>
               </div>
             {/if}
           </div>
diff --git a/web/src/lib/components/asset-viewer/detail-panel-description.svelte b/web/src/lib/components/asset-viewer/detail-panel-description.svelte
index cb6e47985a..ad793bd475 100644
--- a/web/src/lib/components/asset-viewer/detail-panel-description.svelte
+++ b/web/src/lib/components/asset-viewer/detail-panel-description.svelte
@@ -31,13 +31,13 @@
   <section class="px-4 mt-10">
     <AutogrowTextarea
       content={description}
-      class="max-h-[500px] w-full border-b border-gray-500 bg-transparent text-base text-black outline-none transition-all focus:border-b-2 focus:border-immich-primary disabled:border-none dark:text-white dark:focus:border-immich-dark-primary immich-scrollbar"
+      class="max-h-125 w-full border-b border-gray-500 bg-transparent text-base text-black outline-none transition-all focus:border-b-2 focus:border-immich-primary disabled:border-none dark:text-white dark:focus:border-immich-dark-primary immich-scrollbar"
       onContentUpdate={handleFocusOut}
       placeholder={$t('add_a_description')}
     />
   </section>
 {:else if description}
   <section class="px-4 mt-6">
-    <p class="break-words whitespace-pre-line w-full text-black dark:text-white text-base">{description}</p>
+    <p class="wrap-break-word whitespace-pre-line w-full text-black dark:text-white text-base">{description}</p>
   </section>
 {/if}
diff --git a/web/src/lib/components/asset-viewer/detail-panel.svelte b/web/src/lib/components/asset-viewer/detail-panel.svelte
index ccb84af041..6d4f6a97c1 100644
--- a/web/src/lib/components/asset-viewer/detail-panel.svelte
+++ b/web/src/lib/components/asset-viewer/detail-panel.svelte
@@ -199,7 +199,7 @@
         {#each people as person, index (person.id)}
           {#if showingHiddenPeople || !person.isHidden}
             <a
-              class="w-[90px]"
+              class="w-22"
               href={resolve(
                 `${AppRoute.PEOPLE}/${person.id}?${QueryParameter.PREVIOUS_ROUTE}=${
                   currentAlbum?.id ? `${AppRoute.ALBUMS}/${currentAlbum?.id}` : AppRoute.PHOTOS
@@ -439,7 +439,7 @@
 </section>
 
 {#if latlng && $featureFlags.loaded && $featureFlags.map}
-  <div class="h-[360px]">
+  <div class="h-90">
     {#await import('$lib/components/shared-components/map/map.svelte')}
       {#await delay(timeToLoadTheMap) then}
         <!-- show the loading spinner only if loading the map takes too much time -->
@@ -511,7 +511,7 @@
           <div>
             <img
               alt={album.albumName}
-              class="h-[50px] w-[50px] rounded object-cover"
+              class="h-12.5 w-12.5 rounded object-cover"
               src={album.albumThumbnailAssetId &&
                 getAssetThumbnailUrl({ id: album.albumThumbnailAssetId, size: AssetMediaSize.Preview })}
               draggable="false"
diff --git a/web/src/lib/components/asset-viewer/download-panel.svelte b/web/src/lib/components/asset-viewer/download-panel.svelte
index 00e8a1b5e2..b1232f3739 100644
--- a/web/src/lib/components/asset-viewer/download-panel.svelte
+++ b/web/src/lib/components/asset-viewer/download-panel.svelte
@@ -16,10 +16,10 @@
 {#if downloadManager.isDownloading}
   <div
     transition:fly={{ x: -100, duration: 350 }}
-    class="fixed bottom-10 start-2 max-h-[270px] w-[315px] rounded-2xl border dark:border-white/10 p-4 shadow-lg bg-subtle"
+    class="fixed bottom-10 start-2 max-h-67.5 w-79 rounded-2xl border dark:border-white/10 p-4 shadow-lg bg-subtle"
   >
     <Heading size="tiny">{$t('downloading')}</Heading>
-    <div class="my-2 mb-2 flex max-h-[200px] flex-col overflow-y-auto text-sm">
+    <div class="my-2 mb-2 flex max-h-50 flex-col overflow-y-auto text-sm">
       {#each Object.keys(downloadManager.assets) as downloadKey (downloadKey)}
         {@const download = downloadManager.assets[downloadKey]}
         <div class="mb-2 flex place-items-center" transition:slide>
@@ -31,10 +31,10 @@
               {/if}
             </div>
             <div class="flex place-items-center gap-2">
-              <div class="h-[10px] w-full rounded-full bg-neutral-200 dark:bg-neutral-600">
-                <div class="h-[10px] rounded-full bg-primary" style={`width: ${download.percentage}%`}></div>
+              <div class="h-2.5 w-full rounded-full bg-neutral-200 dark:bg-neutral-600">
+                <div class="h-2.5 rounded-full bg-primary" style={`width: ${download.percentage}%`}></div>
               </div>
-              <p class="min-w-[4em] whitespace-nowrap text-right">
+              <p class="min-w-16 whitespace-nowrap text-right">
                 <span class="text-primary">
                   {(download.percentage / 100).toLocaleString($locale, { style: 'percent' })}
                 </span>
diff --git a/web/src/lib/components/asset-viewer/face-editor/face-editor.svelte b/web/src/lib/components/asset-viewer/face-editor/face-editor.svelte
index 24cf067989..01b2982efb 100644
--- a/web/src/lib/components/asset-viewer/face-editor/face-editor.svelte
+++ b/web/src/lib/components/asset-viewer/face-editor/face-editor.svelte
@@ -322,7 +322,7 @@
       <Input placeholder={$t('search_people')} bind:value={searchTerm} size="tiny" />
     </div>
 
-    <div class="h-[250px] overflow-y-auto mt-2">
+    <div class="h-62.5 overflow-y-auto mt-2">
       {#if filteredCandidates.length > 0}
         <div class="mt-2 rounded-lg">
           {#each filteredCandidates as person (person.id)}
diff --git a/web/src/lib/components/asset-viewer/photo-viewer.svelte b/web/src/lib/components/asset-viewer/photo-viewer.svelte
index a772a88d54..d88609f7bb 100644
--- a/web/src/lib/components/asset-viewer/photo-viewer.svelte
+++ b/web/src/lib/components/asset-viewer/photo-viewer.svelte
@@ -257,7 +257,7 @@
       <!-- eslint-disable-next-line svelte/require-each-key -->
       {#each getBoundingBox($boundingBoxesArray, $photoZoomState, $photoViewerImgElement) as boundingbox}
         <div
-          class="absolute border-solid border-white border-[3px] rounded-lg"
+          class="absolute border-solid border-white border-3 rounded-lg"
           style="top: {boundingbox.top}px; left: {boundingbox.left}px; height: {boundingbox.height}px; width: {boundingbox.width}px;"
         ></div>
       {/each}
diff --git a/web/src/lib/components/assets/thumbnail/image-thumbnail.svelte b/web/src/lib/components/assets/thumbnail/image-thumbnail.svelte
index 2a07aa2900..d73e9b8218 100644
--- a/web/src/lib/components/assets/thumbnail/image-thumbnail.svelte
+++ b/web/src/lib/components/assets/thumbnail/image-thumbnail.svelte
@@ -68,7 +68,7 @@
       circle && 'rounded-full',
       shadow && 'shadow-lg',
       (circle || !heightStyle) && 'aspect-square',
-      border && 'border-[3px] border-immich-dark-primary/80 hover:border-immich-primary',
+      border && 'border-3 border-immich-dark-primary/80 hover:border-immich-primary',
       brokenAssetClass,
     ]
       .filter(Boolean)
diff --git a/web/src/lib/components/assets/thumbnail/thumbnail.svelte b/web/src/lib/components/assets/thumbnail/thumbnail.svelte
index 1047f4a2df..994d741605 100644
--- a/web/src/lib/components/assets/thumbnail/thumbnail.svelte
+++ b/web/src/lib/components/assets/thumbnail/thumbnail.svelte
@@ -232,7 +232,7 @@
   ></div>
 
   <div
-    class={['group absolute -top-[0px] -bottom-[0px]', { 'cursor-not-allowed': disabled, 'cursor-pointer': !disabled }]}
+    class={['group absolute top-0 bottom-0', { 'cursor-not-allowed': disabled, 'cursor-pointer': !disabled }]}
     style:width="inherit"
     style:height="inherit"
   >
diff --git a/web/src/lib/components/faces-page/assign-face-side-panel.svelte b/web/src/lib/components/faces-page/assign-face-side-panel.svelte
index 7f829d60a5..9eb7c78666 100644
--- a/web/src/lib/components/faces-page/assign-face-side-panel.svelte
+++ b/web/src/lib/components/faces-page/assign-face-side-panel.svelte
@@ -73,7 +73,7 @@
 
 <section
   transition:fly={{ x: 360, duration: 100, easing: linear }}
-  class="absolute top-0 h-full w-[360px] overflow-x-hidden p-2 dark:text-immich-dark-fg bg-light"
+  class="absolute top-0 h-full w-90 overflow-x-hidden p-2 dark:text-immich-dark-fg bg-light"
 >
   <div class="flex place-items-center justify-between gap-2">
     {#if !searchFaces}
@@ -157,7 +157,7 @@
         {#each showPeople as person (person.id)}
           {#if !editedFace.person || person.id !== editedFace.person.id}
             <div class="w-fit">
-              <button type="button" class="w-[90px]" onclick={() => onReassign(person)}>
+              <button type="button" class="w-22.5" onclick={() => onReassign(person)}>
                 <div class="relative">
                   <ImageThumbnail
                     curve
diff --git a/web/src/lib/components/faces-page/merge-face-selector.svelte b/web/src/lib/components/faces-page/merge-face-selector.svelte
index 952cac1019..efec16173b 100644
--- a/web/src/lib/components/faces-page/merge-face-selector.svelte
+++ b/web/src/lib/components/faces-page/merge-face-selector.svelte
@@ -103,9 +103,9 @@
       </Button>
     {/snippet}
   </ControlAppBar>
-  <section class="px-[70px] pt-[100px]">
+  <section class="px-17.5 pt-25">
     <section id="merge-face-selector">
-      <div class="mb-10 h-[200px] place-content-center place-items-center">
+      <div class="mb-10 h-50 place-content-center place-items-center">
         <p class="mb-4 text-center uppercase dark:text-white">{$t('choose_matching_people_to_merge')}</p>
 
         <div class="grid grid-flow-col-dense place-content-center place-items-center gap-4">
diff --git a/web/src/lib/components/faces-page/person-side-panel.svelte b/web/src/lib/components/faces-page/person-side-panel.svelte
index bb72af367e..6a0d467124 100644
--- a/web/src/lib/components/faces-page/person-side-panel.svelte
+++ b/web/src/lib/components/faces-page/person-side-panel.svelte
@@ -186,7 +186,7 @@
 
 <section
   transition:fly={{ x: 360, duration: 100, easing: linear }}
-  class="absolute top-0 h-full w-[360px] overflow-x-hidden p-2 dark:text-immich-dark-fg bg-light"
+  class="absolute top-0 h-full w-90 overflow-x-hidden p-2 dark:text-immich-dark-fg bg-light"
 >
   <div class="flex place-items-center justify-between gap-2">
     <div class="flex items-center gap-2">
@@ -222,11 +222,11 @@
       {:else}
         {#each peopleWithFaces as face, index (face.id)}
           {@const personName = face.person ? face.person?.name : $t('face_unassigned')}
-          <div class="relative h-[115px] w-[95px]">
+          <div class="relative h-29 w-24">
             <div
               role="button"
               tabindex={index}
-              class="absolute start-0 top-0 h-[90px] w-[90px] cursor-default"
+              class="absolute start-0 top-0 h-22.5 w-22.5 cursor-default"
               onfocus={() => ($boundingBoxesArray = [peopleWithFaces[index]])}
               onmouseover={() => ($boundingBoxesArray = [peopleWithFaces[index]])}
               onmouseleave={() => ($boundingBoxesArray = [])}
@@ -302,7 +302,7 @@
                 </p>
               {/if}
 
-              <div class="absolute -end-[3px] -top-[3px] h-[20px] w-[20px] rounded-full">
+              <div class="absolute -end-[3px] -top-[3px] h-5 w-5 rounded-full">
                 {#if selectedPersonToCreate[face.id] || selectedPersonToReassign[face.id]}
                   <IconButton
                     shape="round"
@@ -326,7 +326,7 @@
                   />
                 {/if}
               </div>
-              <div class="absolute end-[33px] -top-[3px] h-[20px] w-[20px] rounded-full">
+              <div class="absolute end-8 -top-[3px] h-5 w-5 rounded-full">
                 {#if !selectedPersonToCreate[face.id] && !selectedPersonToReassign[face.id] && !face.person}
                   <div
                     class="flex place-content-center place-items-center rounded-full bg-[#d3d3d3] p-1 transition-all absolute start-1/2 top-1/2 translate-x-[-50%] translate-y-[-50%] transform"
@@ -336,7 +336,7 @@
                 {/if}
               </div>
               {#if face.person != null}
-                <div class="absolute -end-[3px] top-[33px] h-[20px] w-[20px] rounded-full">
+                <div class="absolute -end-[3px] top-8 h-5 w-5 rounded-full">
                   <IconButton
                     shape="round"
                     color="danger"
diff --git a/web/src/lib/components/faces-page/unmerge-face-selector.svelte b/web/src/lib/components/faces-page/unmerge-face-selector.svelte
index 377f8705c7..f12df74730 100644
--- a/web/src/lib/components/faces-page/unmerge-face-selector.svelte
+++ b/web/src/lib/components/faces-page/unmerge-face-selector.svelte
@@ -147,10 +147,10 @@
     {/snippet}
   </ControlAppBar>
   {@render merge?.()}
-  <section class="px-[70px] pt-[100px]">
+  <section class="px-17.5 pt-25">
     <section id="merge-face-selector relative">
       {#if selectedPerson !== null}
-        <div class="mb-10 h-[200px] place-content-center place-items-center">
+        <div class="mb-10 h-50 place-content-center place-items-center">
           <p class="mb-4 text-center uppercase dark:text-white">Choose matching faces to re assign</p>
 
           <div class="grid grid-flow-col-dense place-content-center place-items-center gap-4">
diff --git a/web/src/lib/components/forms/library-import-paths-form.svelte b/web/src/lib/components/forms/library-import-paths-form.svelte
index 6e79edd573..02f82504a7 100644
--- a/web/src/lib/components/forms/library-import-paths-form.svelte
+++ b/web/src/lib/components/forms/library-import-paths-form.svelte
@@ -156,7 +156,7 @@
     <tbody class="block w-full overflow-y-auto rounded-md border dark:border-immich-dark-gray">
       {#each validatedPaths as validatedPath, listIndex (validatedPath.importPath)}
         <tr
-          class="flex h-[80px] w-full place-items-center text-center dark:text-immich-dark-fg even:bg-subtle/20 odd:bg-subtle/80"
+          class="flex h-20 w-full place-items-center text-center dark:text-immich-dark-fg even:bg-subtle/20 odd:bg-subtle/80"
         >
           <td class="w-1/8 text-ellipsis ps-8 text-sm">
             {#if validatedPath.isValid}
@@ -180,7 +180,7 @@
         </tr>
       {/each}
       <tr
-        class="flex h-[80px] w-full place-items-center text-center dark:text-immich-dark-fg even:bg-subtle/20 odd:bg-subtle/80"
+        class="flex h-20 w-full place-items-center text-center dark:text-immich-dark-fg even:bg-subtle/20 odd:bg-subtle/80"
       >
         <td class="w-4/5 text-ellipsis px-4 text-sm">
           {#if importPaths.length === 0}
diff --git a/web/src/lib/components/forms/library-scan-settings-form.svelte b/web/src/lib/components/forms/library-scan-settings-form.svelte
index 846360684a..fde3849599 100644
--- a/web/src/lib/components/forms/library-scan-settings-form.svelte
+++ b/web/src/lib/components/forms/library-scan-settings-form.svelte
@@ -111,7 +111,7 @@
     <tbody class="block w-full overflow-y-auto rounded-md border dark:border-immich-dark-gray">
       {#each exclusionPatterns as exclusionPattern, listIndex (exclusionPattern)}
         <tr
-          class="flex h-[80px] w-full place-items-center text-center dark:text-immich-dark-fg even:bg-subtle/20 odd:bg-subtle/80"
+          class="flex h-20 w-full place-items-center text-center dark:text-immich-dark-fg even:bg-subtle/20 odd:bg-subtle/80"
         >
           <td class="w-3/4 text-ellipsis px-4 text-sm">{exclusionPattern}</td>
           <td class="w-1/4 text-ellipsis flex justify-center">
@@ -128,7 +128,7 @@
         </tr>
       {/each}
       <tr
-        class="flex h-[80px] w-full place-items-center text-center dark:text-immich-dark-fg even:bg-subtle/20 odd:bg-subtle/80"
+        class="flex h-20 w-full place-items-center text-center dark:text-immich-dark-fg even:bg-subtle/20 odd:bg-subtle/80"
       >
         <td class="w-3/4 text-ellipsis px-4 text-sm">
           {#if exclusionPatterns.length === 0}
diff --git a/web/src/lib/components/jobs/JobTile.svelte b/web/src/lib/components/jobs/JobTile.svelte
index ff07f74f60..5a5f1c8822 100644
--- a/web/src/lib/components/jobs/JobTile.svelte
+++ b/web/src/lib/components/jobs/JobTile.svelte
@@ -53,9 +53,7 @@
   const commonClasses = 'flex place-items-center justify-between w-full py-2 sm:py-4 pe-4 ps-6';
 </script>
 
-<div
-  class="flex flex-col overflow-hidden rounded-2xl bg-gray-100 dark:bg-immich-dark-gray sm:flex-row sm:rounded-[35px]"
->
+<div class="flex flex-col overflow-hidden rounded-2xl bg-gray-100 dark:bg-immich-dark-gray sm:flex-row sm:rounded-9">
   <div class="flex w-full flex-col">
     {#if queueStatus.isPaused}
       <JobTileStatus color="warning">{$t('paused')}</JobTileStatus>
diff --git a/web/src/lib/components/layouts/ErrorLayout.svelte b/web/src/lib/components/layouts/ErrorLayout.svelte
index e40a9a68d7..b97b1f05d5 100644
--- a/web/src/lib/components/layouts/ErrorLayout.svelte
+++ b/web/src/lib/components/layouts/ErrorLayout.svelte
@@ -24,7 +24,7 @@
   <section>
     <div class="flex place-items-center border-b px-6 py-4 dark:border-b-immich-dark-gray">
       <a class="flex place-items-center gap-2 hover:cursor-pointer" href="/photos">
-        <ImmichLogo class="h-[50px]" />
+        <ImmichLogo class="h-12.5" />
       </a>
     </div>
   </section>
@@ -32,7 +32,7 @@
   <div class="fixed top-0 flex h-full w-full place-content-center place-items-center overflow-hidden bg-black/50">
     <div>
       <div
-        class="w-[500px] max-w-[95vw] rounded-3xl border shadow-sm dark:border-immich-dark-gray dark:text-immich-dark-fg bg-subtle/80"
+        class="w-125 max-w-[95vw] rounded-3xl border shadow-sm dark:border-immich-dark-gray dark:text-immich-dark-fg bg-subtle/80"
       >
         <div>
           <div class="flex items-center justify-between gap-4 px-4 py-4">
@@ -52,7 +52,7 @@
 
           <hr />
 
-          <div class="immich-scrollbar max-h-[75vh] min-h-[300px] gap-4 overflow-y-auto p-4 pb-4">
+          <div class="immich-scrollbar max-h-[75vh] min-h-75 gap-4 overflow-y-auto p-4 pb-4">
             <div class="flex w-full flex-col gap-2">
               <p class="text-red-500">{error?.message} ({error?.code})</p>
               {#if error?.stack}
diff --git a/web/src/lib/components/memory-page/memory-viewer.svelte b/web/src/lib/components/memory-page/memory-viewer.svelte
index a765d585de..fe3569f916 100644
--- a/web/src/lib/components/memory-page/memory-viewer.svelte
+++ b/web/src/lib/components/memory-page/memory-viewer.svelte
@@ -372,7 +372,7 @@
       {/snippet}
 
       <div class="flex place-content-center place-items-center gap-2 overflow-hidden">
-        <div class="w-[50px] dark">
+        <div class="w-12.5 dark">
           <IconButton
             shape="round"
             variant="ghost"
@@ -385,8 +385,8 @@
 
         {#each current.memory.assets as asset, index (asset.id)}
           <a class="relative w-full py-2" href={asHref(asset)} aria-label={$t('view')}>
-            <span class="absolute start-0 h-[2px] w-full bg-gray-500"></span>
-            <span class="absolute start-0 h-[2px] bg-white" style:width={`${toProgressPercentage(index)}%`}></span>
+            <span class="absolute start-0 h-0.5 w-full bg-gray-500"></span>
+            <span class="absolute start-0 h-0.5 bg-white" style:width={`${toProgressPercentage(index)}%`}></span>
           </a>
         {/each}
 
@@ -397,7 +397,7 @@
         </div>
 
         {#if currentTimelineAssets.some(({ isVideo }) => isVideo)}
-          <div class="w-[50px] dark">
+          <div class="w-12.5 dark">
             <IconButton
               shape="round"
               variant="ghost"
@@ -502,7 +502,7 @@
                   color="secondary"
                   aria-label={isSaved ? $t('unfavorite') : $t('favorite')}
                   onclick={() => handleSaveMemory()}
-                  class="w-[48px] h-[48px]"
+                  class="w-12 h-12"
                 />
                 <!-- <IconButton
                   icon={mdiShareVariantOutline}
diff --git a/web/src/lib/components/onboarding-page/onboarding-hello.svelte b/web/src/lib/components/onboarding-page/onboarding-hello.svelte
index ee3516b895..3466ecda2b 100644
--- a/web/src/lib/components/onboarding-page/onboarding-hello.svelte
+++ b/web/src/lib/components/onboarding-page/onboarding-hello.svelte
@@ -9,7 +9,7 @@
 </script>
 
 <div class="gap-4">
-  <ImmichLogo noText class="h-[100px] mb-2" />
+  <ImmichLogo noText class="h-25 mb-2" />
   <p class="font-medium mb-6 text-6xl text-primary">
     {$t('onboarding_welcome_user', { values: { user: $user.name } })}
   </p>
diff --git a/web/src/lib/components/photos-page/memory-lane.svelte b/web/src/lib/components/photos-page/memory-lane.svelte
index e4e3d325c5..1d61b61b40 100644
--- a/web/src/lib/components/photos-page/memory-lane.svelte
+++ b/web/src/lib/components/photos-page/memory-lane.svelte
@@ -47,10 +47,7 @@
     {#if canScrollLeft || canScrollRight}
       <div class="sticky start-0 z-1">
         {#if canScrollLeft}
-          <div
-            class="absolute start-4 max-md:top-[75px] top-[108px] -translate-y-1/2"
-            transition:fade={{ duration: 200 }}
-          >
+          <div class="absolute start-4 max-md:top-19 top-27 -translate-y-1/2" transition:fade={{ duration: 200 }}>
             <button
               type="button"
               class="rounded-full border border-gray-500 bg-gray-100 p-2 text-gray-500 opacity-50 hover:opacity-100"
@@ -63,10 +60,7 @@
           </div>
         {/if}
         {#if canScrollRight}
-          <div
-            class="absolute end-4 max-md:top-[75px] top-[108px] -translate-y-1/2 z-1"
-            transition:fade={{ duration: 200 }}
-          >
+          <div class="absolute end-4 max-md:top-19 top-27 -translate-y-1/2 z-1" transition:fade={{ duration: 200 }}>
             <button
               type="button"
               class="rounded-full border border-gray-500 bg-gray-100 p-2 text-gray-500 opacity-50 hover:opacity-100"
@@ -83,7 +77,7 @@
     <div class="inline-block" use:resizeObserver={({ width }) => (innerWidth = width)}>
       {#each memoryStore.memories as memory (memory.id)}
         <a
-          class="memory-card relative me-2 md:me-4 last:me-0 inline-block aspect-3/4 md:aspect-4/3 max-md:h-[150px] xl:aspect-video h-[216px] rounded-xl"
+          class="memory-card relative me-2 md:me-4 last:me-0 inline-block aspect-3/4 md:aspect-4/3 max-md:h-37.5 xl:aspect-video h-54 rounded-xl"
           href="{AppRoute.MEMORY}?{QueryParameter.ID}={memory.assets[0].id}"
         >
           <img
diff --git a/web/src/lib/components/places-page/places-card-group.svelte b/web/src/lib/components/places-page/places-card-group.svelte
index fd27fe7192..2e918b79ff 100644
--- a/web/src/lib/components/places-page/places-card-group.svelte
+++ b/web/src/lib/components/places-page/places-card-group.svelte
@@ -43,12 +43,12 @@
         {@const city = item.exifInfo?.city}
         <a class="relative" href="{AppRoute.SEARCH}?{getMetadataSearchQuery({ city })}" draggable="false">
           <div
-            class="flex w-[calc((100vw-(72px+5rem))/2)] max-w-[156px] justify-center overflow-hidden rounded-xl brightness-75 filter"
+            class="flex w-[calc((100vw-(72px+5rem))/2)] max-w-39 justify-center overflow-hidden rounded-xl brightness-75 filter"
           >
             <img
               src={getAssetThumbnailUrl({ id: item.id, size: AssetMediaSize.Thumbnail })}
               alt={city}
-              class="object-cover w-[156px] h-[156px]"
+              class="object-cover w-39 h-39"
             />
           </div>
           <span
diff --git a/web/src/lib/components/server-statistics/ServerStatisticsCard.svelte b/web/src/lib/components/server-statistics/ServerStatisticsCard.svelte
index c44839ae38..61d4c643c8 100644
--- a/web/src/lib/components/server-statistics/ServerStatisticsCard.svelte
+++ b/web/src/lib/components/server-statistics/ServerStatisticsCard.svelte
@@ -20,7 +20,7 @@
   });
 </script>
 
-<div class="flex h-[140px] w-full flex-col justify-between rounded-3xl bg-subtle text-primary p-5">
+<div class="flex h-35 w-full flex-col justify-between rounded-3xl bg-subtle text-primary p-5">
   <div class="flex place-items-center gap-4">
     <Icon {icon} size="40" />
     <Text size="large" fontWeight="bold" class="uppercase">{title}</Text>
diff --git a/web/src/lib/components/server-statistics/ServerStatisticsPanel.svelte b/web/src/lib/components/server-statistics/ServerStatisticsPanel.svelte
index e1087d5777..d8de773943 100644
--- a/web/src/lib/components/server-statistics/ServerStatisticsPanel.svelte
+++ b/web/src/lib/components/server-statistics/ServerStatisticsPanel.svelte
@@ -100,10 +100,10 @@
         </tr>
       </thead>
       <tbody
-        class="block max-h-[320px] w-full overflow-y-auto rounded-md border dark:border-immich-dark-gray dark:text-immich-dark-fg"
+        class="block max-h-80 w-full overflow-y-auto rounded-md border dark:border-immich-dark-gray dark:text-immich-dark-fg"
       >
         {#each stats.usageByUser as user (user.userId)}
-          <tr class="flex h-[50px] w-full place-items-center text-center even:bg-subtle/20 odd:bg-subtle/80">
+          <tr class="flex h-12.5 w-full place-items-center text-center even:bg-subtle/20 odd:bg-subtle/80">
             <td class="w-1/4 text-ellipsis px-2 text-sm">{user.userName}</td>
             <td class="w-1/4 text-ellipsis px-2 text-sm"
               >{user.photos.toLocaleString($locale)} ({getByteUnitString(user.usagePhotos, $locale, 0)})</td
diff --git a/web/src/lib/components/share-page/individual-shared-viewer.svelte b/web/src/lib/components/share-page/individual-shared-viewer.svelte
index e4cd83a851..f805e92de0 100644
--- a/web/src/lib/components/share-page/individual-shared-viewer.svelte
+++ b/web/src/lib/components/share-page/individual-shared-viewer.svelte
@@ -136,7 +136,7 @@
         {/snippet}
       </ControlAppBar>
     {/if}
-    <section class="my-[160px] mx-4" bind:clientHeight={viewport.height} bind:clientWidth={viewport.width}>
+    <section class="my-40 mx-4" bind:clientHeight={viewport.height} bind:clientWidth={viewport.width}>
       <GalleryViewer {assets} {assetInteraction} {viewport} />
     </section>
   {:else if assets.length === 1}
diff --git a/web/src/lib/components/shared-components/change-location.svelte b/web/src/lib/components/shared-components/change-location.svelte
index 0215846c12..23fd00190e 100644
--- a/web/src/lib/components/shared-components/change-location.svelte
+++ b/web/src/lib/components/shared-components/change-location.svelte
@@ -172,7 +172,7 @@
       </div>
 
       <span>{$t('pick_a_location')}</span>
-      <div class="h-[500px] min-h-[300px] w-full z-0">
+      <div class="h-125 min-h-75 w-full z-0">
         {#await import('$lib/components/shared-components/map/map.svelte')}
           {#await delay(timeToLoadTheMap) then}
             <!-- show the loading spinner only if loading the map takes too much time -->
diff --git a/web/src/lib/components/shared-components/context-menu/context-menu.svelte b/web/src/lib/components/shared-components/context-menu/context-menu.svelte
index c98a986973..f63cbd0621 100644
--- a/web/src/lib/components/shared-components/context-menu/context-menu.svelte
+++ b/web/src/lib/components/shared-components/context-menu/context-menu.svelte
@@ -61,7 +61,7 @@
 
 <div
   bind:clientHeight={height}
-  class="fixed min-w-[200px] w-max max-w-[300px] overflow-hidden rounded-lg shadow-lg z-1"
+  class="fixed min-w-50 w-max max-w-75 overflow-hidden rounded-lg shadow-lg z-1"
   style:left="{left}px"
   style:top="{top}px"
   transition:slide={{ duration: 250, easing: quintOut }}
diff --git a/web/src/lib/components/shared-components/immich-logo-small-link.svelte b/web/src/lib/components/shared-components/immich-logo-small-link.svelte
index 5a940fa278..5cce02e89e 100644
--- a/web/src/lib/components/shared-components/immich-logo-small-link.svelte
+++ b/web/src/lib/components/shared-components/immich-logo-small-link.svelte
@@ -4,5 +4,5 @@
 </script>
 
 <a data-sveltekit-preload-data="hover" class="ms-4" href="/">
-  <ImmichLogo class="h-[50px] max-w-none md:w-auto md:max-w-full" noText={mobileDevice.maxMd} />
+  <ImmichLogo class="h-12.5 max-w-none md:w-auto md:max-w-full" noText={mobileDevice.maxMd} />
 </a>
diff --git a/web/src/lib/components/shared-components/map/map.svelte b/web/src/lib/components/shared-components/map/map.svelte
index 969d003e9d..ee0961917f 100644
--- a/web/src/lib/components/shared-components/map/map.svelte
+++ b/web/src/lib/components/shared-components/map/map.svelte
@@ -359,7 +359,7 @@
       >
         {#snippet children({ feature })}
           <div
-            class="rounded-full w-[40px] h-[40px] bg-immich-primary text-white flex justify-center items-center font-mono font-bold shadow-lg hover:bg-immich-dark-primary transition-all duration-200 hover:text-immich-dark-bg opacity-90"
+            class="rounded-full w-10 h-10 bg-immich-primary text-white flex justify-center items-center font-mono font-bold shadow-lg hover:bg-immich-dark-primary transition-all duration-200 hover:text-immich-dark-bg opacity-90"
           >
             {feature.properties?.point_count?.toLocaleString()}
           </div>
@@ -380,7 +380,7 @@
           {:else}
             <img
               src={getAssetThumbnailUrl(feature.properties?.id)}
-              class="rounded-full w-[60px] h-[60px] border-2 border-immich-primary shadow-lg hover:border-immich-dark-primary transition-all duration-200 hover:scale-150 object-cover bg-immich-primary"
+              class="rounded-full w-15 h-15 border-2 border-immich-primary shadow-lg hover:border-immich-dark-primary transition-all duration-200 hover:scale-150 object-cover bg-immich-primary"
               alt={feature.properties?.city && feature.properties.country
                 ? $t('map_marker_for_images', {
                     values: { city: feature.properties.city, country: feature.properties.country },
diff --git a/web/src/lib/components/shared-components/navigation-bar/account-info-panel.svelte b/web/src/lib/components/shared-components/navigation-bar/account-info-panel.svelte
index 645b6fbf38..1ef695ca91 100644
--- a/web/src/lib/components/shared-components/navigation-bar/account-info-panel.svelte
+++ b/web/src/lib/components/shared-components/navigation-bar/account-info-panel.svelte
@@ -32,7 +32,7 @@
   in:fade={{ duration: 100 }}
   out:fade={{ duration: 100 }}
   id="account-info-panel"
-  class="absolute z-1 end-[25px] top-[75px] w-[min(360px,100vw-50px)] rounded-3xl bg-gray-200 shadow-lg dark:border dark:border-immich-dark-gray dark:bg-immich-dark-gray"
+  class="absolute z-1 end-6 top-19 w-[min(360px,100vw-50px)] rounded-3xl bg-gray-200 shadow-lg dark:border dark:border-immich-dark-gray dark:bg-immich-dark-gray"
   use:focusTrap
 >
   <div
diff --git a/web/src/lib/components/shared-components/navigation-bar/navigation-bar.svelte b/web/src/lib/components/shared-components/navigation-bar/navigation-bar.svelte
index 51488381f5..f73f9f3b51 100644
--- a/web/src/lib/components/shared-components/navigation-bar/navigation-bar.svelte
+++ b/web/src/lib/components/shared-components/navigation-bar/navigation-bar.svelte
@@ -78,7 +78,7 @@
         class="sidebar:hidden"
       />
       <a data-sveltekit-preload-data="hover" href={AppRoute.PHOTOS}>
-        <ImmichLogo class="max-md:h-[48px] h-[50px]" noText={!mobileDevice.isFullSidebar} />
+        <ImmichLogo class="max-md:h-12 h-12.5" noText={!mobileDevice.isFullSidebar} />
       </a>
     </div>
     <div class="flex justify-between gap-4 lg:gap-8 pe-6">
diff --git a/web/src/lib/components/shared-components/navigation-bar/notification-item.svelte b/web/src/lib/components/shared-components/navigation-bar/notification-item.svelte
index e713eb7743..a233060c00 100644
--- a/web/src/lib/components/shared-components/navigation-bar/notification-item.svelte
+++ b/web/src/lib/components/shared-components/navigation-bar/notification-item.svelte
@@ -100,7 +100,7 @@
 </script>
 
 <button
-  class="min-h-[80px] p-2 py-3 hover:bg-immich-primary/10 dark:hover:bg-immich-dark-primary/10 border-b border-gray-200 dark:border-immich-dark-gray w-full"
+  class="min-h-20 p-2 py-3 hover:bg-immich-primary/10 dark:hover:bg-immich-dark-primary/10 border-b border-gray-200 dark:border-immich-dark-gray w-full"
   type="button"
   onclick={() => onclick(notification)}
   title={notification.createdAt}
diff --git a/web/src/lib/components/shared-components/navigation-bar/notification-panel.svelte b/web/src/lib/components/shared-components/navigation-bar/notification-panel.svelte
index 11b643c598..85ff9d90f8 100644
--- a/web/src/lib/components/shared-components/navigation-bar/notification-panel.svelte
+++ b/web/src/lib/components/shared-components/navigation-bar/notification-panel.svelte
@@ -66,10 +66,10 @@
   in:fade={{ duration: 100 }}
   out:fade={{ duration: 100 }}
   id="notification-panel"
-  class="absolute right-[25px] top-[70px] z-1 w-[min(360px,100vw-50px)] rounded-3xl bg-gray-100 border border-gray-200 shadow-lg dark:border dark:border-light dark:bg-immich-dark-gray text-light"
+  class="absolute right-6 top-17.5 z-1 w-[min(360px,100vw-50px)] rounded-3xl bg-gray-100 border border-gray-200 shadow-lg dark:border dark:border-light dark:bg-immich-dark-gray text-light"
   use:focusTrap
 >
-  <Stack class="max-h-[500px]">
+  <Stack class="max-h-125">
     <div class="flex justify-between items-center mt-4 mx-4">
       <Text size="medium" color="secondary" class="font-semibold">{$t('notifications')}</Text>
       <div>
diff --git a/web/src/lib/components/shared-components/purchasing/individual-purchase-option-card.svelte b/web/src/lib/components/shared-components/purchasing/individual-purchase-option-card.svelte
index ea57bf6ce7..205324aecf 100644
--- a/web/src/lib/components/shared-components/purchasing/individual-purchase-option-card.svelte
+++ b/web/src/lib/components/shared-components/purchasing/individual-purchase-option-card.svelte
@@ -20,7 +20,7 @@
     <p>{$t('purchase_per_user')}</p>
   </div>
 
-  <div class="flex flex-col justify-between h-[200px] dark:text-immich-gray">
+  <div class="flex flex-col justify-between h-50 dark:text-immich-gray">
     <div class="mt-6 flex flex-col gap-1">
       <div class="grid grid-cols-[36px_auto]">
         <Icon icon={mdiCheckCircleOutline} size="24" class="text-green-500 self-center" />
diff --git a/web/src/lib/components/shared-components/purchasing/server-purchase-option-card.svelte b/web/src/lib/components/shared-components/purchasing/server-purchase-option-card.svelte
index 026675dab1..ca12d17ae0 100644
--- a/web/src/lib/components/shared-components/purchasing/server-purchase-option-card.svelte
+++ b/web/src/lib/components/shared-components/purchasing/server-purchase-option-card.svelte
@@ -20,7 +20,7 @@
     <p>{$t('purchase_per_server')}</p>
   </div>
 
-  <div class="flex flex-col justify-between h-[200px] dark:text-immich-gray">
+  <div class="flex flex-col justify-between h-50 dark:text-immich-gray">
     <div class="mt-6 flex flex-col gap-1">
       <div class="grid grid-cols-[36px_auto]">
         <Icon icon={mdiCheckCircleOutline} size="24" class="text-green-500 self-center" />
diff --git a/web/src/lib/components/shared-components/search-bar/search-bar.svelte b/web/src/lib/components/shared-components/search-bar/search-bar.svelte
index c1b3da70e8..d0e84fd072 100644
--- a/web/src/lib/components/shared-components/search-bar/search-bar.svelte
+++ b/web/src/lib/components/shared-components/search-bar/search-bar.svelte
@@ -235,7 +235,7 @@
         name="q"
         id="main-search-bar"
         class="w-full transition-all border-2 ps-14 py-4 max-md:py-2 text-immich-fg/75 dark:text-immich-dark-fg
-        {showClearIcon ? 'pe-[90px]' : 'pe-14'}
+        {showClearIcon ? 'pe-22.5' : 'pe-14'}
         {grayTheme ? 'dark:bg-immich-dark-gray' : 'dark:bg-immich-dark-bg'}
         {showSuggestions && isSearchSuggestions ? 'rounded-t-3xl' : 'rounded-3xl bg-gray-200'}
         {searchStore.isSearchEnabled ? 'border-gray-200 dark:border-gray-700 bg-white' : 'border-transparent'}"
diff --git a/web/src/lib/components/shared-components/search-bar/search-people-section.svelte b/web/src/lib/components/shared-components/search-bar/search-people-section.svelte
index a6b97704e5..6d1f1e44dd 100644
--- a/web/src/lib/components/shared-components/search-bar/search-people-section.svelte
+++ b/web/src/lib/components/shared-components/search-bar/search-people-section.svelte
@@ -52,7 +52,7 @@
 </script>
 
 {#await peoplePromise}
-  <div id="spinner" class="flex h-[217px] items-center justify-center -mb-4">
+  <div id="spinner" class="flex h-54 items-center justify-center -mb-4">
     <LoadingSpinner size="large" />
   </div>
 {:then people}
diff --git a/web/src/lib/components/shared-components/settings/setting-checkboxes.svelte b/web/src/lib/components/shared-components/settings/setting-checkboxes.svelte
index 940bab36fc..3ec8509411 100644
--- a/web/src/lib/components/shared-components/settings/setting-checkboxes.svelte
+++ b/web/src/lib/components/shared-components/settings/setting-checkboxes.svelte
@@ -30,7 +30,7 @@
 </script>
 
 <div class="mb-4 w-full">
-  <div class="flex h-[26px] place-items-center gap-1">
+  <div class="flex h-6.5 place-items-center gap-1">
     <label class="font-medium text-primary text-sm" for="{name}-select">
       {label}
     </label>
diff --git a/web/src/lib/components/shared-components/settings/setting-combobox.svelte b/web/src/lib/components/shared-components/settings/setting-combobox.svelte
index 03329946ae..0a8db3f55b 100644
--- a/web/src/lib/components/shared-components/settings/setting-combobox.svelte
+++ b/web/src/lib/components/shared-components/settings/setting-combobox.svelte
@@ -30,7 +30,7 @@
 
 <div class="grid grid-cols-2">
   <div>
-    <div class="flex h-[26px] place-items-center gap-1">
+    <div class="flex h-6.5 place-items-center gap-1">
       <label class="font-medium text-primary text-sm" for={title}>
         {title}
       </label>
diff --git a/web/src/lib/components/shared-components/settings/setting-dropdown.svelte b/web/src/lib/components/shared-components/settings/setting-dropdown.svelte
index 224008c628..640b9b86b5 100644
--- a/web/src/lib/components/shared-components/settings/setting-dropdown.svelte
+++ b/web/src/lib/components/shared-components/settings/setting-dropdown.svelte
@@ -28,7 +28,7 @@
 
 <div class="flex place-items-center justify-between">
   <div>
-    <div class="flex h-[26px] place-items-center gap-1">
+    <div class="flex h-6.5 place-items-center gap-1">
       <label class="font-medium text-primary text-sm" for={title}>
         {title}
       </label>
diff --git a/web/src/lib/components/shared-components/settings/setting-select.svelte b/web/src/lib/components/shared-components/settings/setting-select.svelte
index 0d949d077f..026b12f203 100644
--- a/web/src/lib/components/shared-components/settings/setting-select.svelte
+++ b/web/src/lib/components/shared-components/settings/setting-select.svelte
@@ -39,7 +39,7 @@
 </script>
 
 <div class="mb-4 w-full">
-  <div class="flex h-[26px] place-items-center gap-1">
+  <div class="flex h-6.5 place-items-center gap-1">
     <label class="font-medium text-primary text-sm" for="{name}-select">{label}</label>
 
     {#if isEdited}
diff --git a/web/src/lib/components/shared-components/settings/setting-switch.svelte b/web/src/lib/components/shared-components/settings/setting-switch.svelte
index e64f562195..42dc952010 100644
--- a/web/src/lib/components/shared-components/settings/setting-switch.svelte
+++ b/web/src/lib/components/shared-components/settings/setting-switch.svelte
@@ -34,7 +34,7 @@
 
 <div class="flex place-items-center justify-between">
   <div class="me-2">
-    <div class="flex h-[26px] place-items-center gap-1">
+    <div class="flex h-6.5 place-items-center gap-1">
       <label class="font-medium text-primary text-sm" for={sliderId}>
         {title}
       </label>
diff --git a/web/src/lib/components/shared-components/settings/setting-textarea.svelte b/web/src/lib/components/shared-components/settings/setting-textarea.svelte
index 50097f3ae1..7a4d3c12a8 100644
--- a/web/src/lib/components/shared-components/settings/setting-textarea.svelte
+++ b/web/src/lib/components/shared-components/settings/setting-textarea.svelte
@@ -30,7 +30,7 @@
 </script>
 
 <div class="mb-4 w-full">
-  <div class="flex h-[26px] place-items-center gap-1">
+  <div class="flex h-6.5 place-items-center gap-1">
     <label class="font-medium text-primary text-sm" for={label}>{label}</label>
     {#if required}
       <div class="text-red-400">*</div>
diff --git a/web/src/lib/components/shared-components/settings/settings-language-selector.svelte b/web/src/lib/components/shared-components/settings/settings-language-selector.svelte
index 6ec0a067cf..ab171f8743 100644
--- a/web/src/lib/components/shared-components/settings/settings-language-selector.svelte
+++ b/web/src/lib/components/shared-components/settings/settings-language-selector.svelte
@@ -37,7 +37,7 @@
 <div class={showSettingDescription ? 'grid grid-cols-2' : ''}>
   {#if showSettingDescription}
     <div>
-      <div class="flex h-[26px] place-items-center gap-1">
+      <div class="flex h-6.5 place-items-center gap-1">
         <label class="font-medium text-primary text-sm" for={$t('language')}>
           {$t('language')}
         </label>
diff --git a/web/src/lib/components/shared-components/side-bar/purchase-info.svelte b/web/src/lib/components/shared-components/side-bar/purchase-info.svelte
index 2b62917c31..eb4433aa2b 100644
--- a/web/src/lib/components/shared-components/side-bar/purchase-info.svelte
+++ b/web/src/lib/components/shared-components/side-bar/purchase-info.svelte
@@ -94,7 +94,7 @@
       <div class="flex justify-between w-full place-items-center place-content-center">
         <div class="flex place-items-center place-content-center gap-1">
           <div class="h-6 w-6">
-            <ImmichLogo noText class="h-[24px]" />
+            <ImmichLogo noText class="h-6" />
           </div>
           <p class="flex text-primary font-medium">
             {$t('purchase_button_buy_immich')}
@@ -113,7 +113,7 @@
   {#if showMessage}
     <dialog
       open
-      class="hidden sidebar:block w-[500px] absolute bottom-[75px] start-[255px] bg-gray-50 dark:border-gray-800 border border-gray-200 dark:bg-immich-dark-gray dark:text-white text-black rounded-3xl shadow-2xl px-8 py-6"
+      class="hidden sidebar:block w-125 absolute bottom-19 start-64 bg-gray-50 dark:border-gray-800 border border-gray-200 dark:bg-immich-dark-gray dark:text-white text-black rounded-3xl shadow-2xl px-8 py-6"
       transition:fade={{ duration: 150 }}
       onmouseover={() => (hoverMessage = true)}
       onmouseleave={() => (hoverMessage = false)}
@@ -122,7 +122,7 @@
     >
       <div class="flex justify-between place-items-center">
         <div class="h-10 w-10">
-          <ImmichLogo noText class="h-[32px]" />
+          <ImmichLogo noText class="h-8" />
         </div>
         <IconButton
           shape="round"
diff --git a/web/src/lib/components/shared-components/upload-asset-preview.svelte b/web/src/lib/components/shared-components/upload-asset-preview.svelte
index 6a9549ab17..597e48c75a 100644
--- a/web/src/lib/components/shared-components/upload-asset-preview.svelte
+++ b/web/src/lib/components/shared-components/upload-asset-preview.svelte
@@ -95,8 +95,8 @@
   </div>
 
   {#if uploadAsset.state === UploadState.STARTED}
-    <div class="text-black relative mt-[5px] h-[18px] w-full rounded-md bg-gray-300 dark:bg-gray-700">
-      <div class="h-[18px] rounded-md bg-immich-primary transition-all" style={`width: ${uploadAsset.progress}%`}></div>
+    <div class="text-black relative mt-[5px] h-4.5 w-full rounded-md bg-gray-300 dark:bg-gray-700">
+      <div class="h-4.5 rounded-md bg-immich-primary transition-all" style={`width: ${uploadAsset.progress}%`}></div>
       <p class="absolute top-0.5 h-full w-full text-center text-white text-[10px]">
         {#if uploadAsset.message === $t('asset_hashing')}
           {uploadAsset.message}
diff --git a/web/src/lib/components/shared-components/upload-panel.svelte b/web/src/lib/components/shared-components/upload-panel.svelte
index 91f6609e10..021940d506 100644
--- a/web/src/lib/components/shared-components/upload-panel.svelte
+++ b/web/src/lib/components/shared-components/upload-panel.svelte
@@ -42,7 +42,7 @@
     {#if showDetail}
       <div
         in:scale={{ duration: 250, easing: quartInOut }}
-        class="w-[325px] rounded-xl border border-gray-200 dark:border-subtle p-4 text-sm shadow-xs bg-subtle"
+        class="w-81 rounded-xl border border-gray-200 dark:border-subtle p-4 text-sm shadow-xs bg-subtle"
       >
         <div class="place-item-center mb-4 flex justify-between">
           <div class="flex flex-col gap-1">
@@ -101,8 +101,8 @@
           </div>
         </div>
         {#if showOptions}
-          <div class="immich-scrollbar mb-4 max-h-[400px] overflow-y-auto rounded-lg">
-            <div class="flex h-[26px] place-items-center gap-1">
+          <div class="immich-scrollbar mb-4 max-h-100 overflow-y-auto rounded-lg">
+            <div class="flex h-6.5 place-items-center gap-1">
               <label class="immich-form-label" for="upload-concurrency">{$t('upload_concurrency')}</label>
             </div>
             <input
diff --git a/web/src/lib/components/sidebar/sidebar.spec.ts b/web/src/lib/components/sidebar/sidebar.spec.ts
index cf9ecabada..645816e460 100644
--- a/web/src/lib/components/sidebar/sidebar.spec.ts
+++ b/web/src/lib/components/sidebar/sidebar.spec.ts
@@ -61,7 +61,7 @@ describe('Sidebar component', () => {
     const parent = screen.getByTestId('sidebar-parent');
 
     // then
-    expect(parent.classList).toContain('sidebar:w-[16rem]'); // sets the initial width for page load
+    expect(parent.classList).toContain('sidebar:w-64'); // sets the initial width for page load
     expect(parent.classList).toContain('w-[min(100vw,16rem)]');
     expect(parent.classList).toContain('shadow-2xl');
   });
diff --git a/web/src/lib/components/sidebar/sidebar.svelte b/web/src/lib/components/sidebar/sidebar.svelte
index 95d2021b6a..ecb2561a03 100644
--- a/web/src/lib/components/sidebar/sidebar.svelte
+++ b/web/src/lib/components/sidebar/sidebar.svelte
@@ -35,7 +35,7 @@
   id="sidebar"
   aria-label={ariaLabel}
   tabindex="-1"
-  class="immich-scrollbar relative z-1 w-0 sidebar:w-[16rem] overflow-y-auto overflow-x-hidden pt-8 transition-all duration-200 bg-light"
+  class="immich-scrollbar relative z-1 w-0 sidebar:w-64 overflow-y-auto overflow-x-hidden pt-8 transition-all duration-200 bg-light"
   class:shadow-2xl={isExpanded}
   class:dark:border-e-immich-dark-gray={isExpanded}
   class:border-r={isExpanded}
diff --git a/web/src/lib/components/timeline/Scrubber.svelte b/web/src/lib/components/timeline/Scrubber.svelte
index 827f9df587..d64d45cc87 100644
--- a/web/src/lib/components/timeline/Scrubber.svelte
+++ b/web/src/lib/components/timeline/Scrubber.svelte
@@ -528,7 +528,7 @@
   {#if usingMobileDevice && ((timelineManager.scrolling && scrollHoverLabel) || isHover || isDragging)}
     <div
       id="time-label"
-      class="rounded-s-full w-[32px] ps-2 text-white bg-immich-primary dark:bg-gray-600 hover:cursor-pointer select-none"
+      class="rounded-s-full w-8 ps-2 text-white bg-immich-primary dark:bg-gray-600 hover:cursor-pointer select-none"
       style:top="{PADDING_TOP + (scrollY - 50 / 2)}px"
       style:height="50px"
       style:right="0"
@@ -536,15 +536,15 @@
       in:fade={{ duration: 200 }}
       out:fade={{ duration: 200 }}
     >
-      <Icon icon={mdiPlay} size="20" class="-rotate-90 relative top-[9px] -end-[2px]" />
-      <Icon icon={mdiPlay} size="20" class="rotate-90 relative top-px -end-[2px]" />
+      <Icon icon={mdiPlay} size="20" class="-rotate-90 relative top-[9px] -end-0.5" />
+      <Icon icon={mdiPlay} size="20" class="rotate-90 relative top-px -end-0.5" />
       {#if (timelineManager.scrolling && scrollHoverLabel) || isHover || isDragging}
         <p
           transition:fade={{ duration: 200 }}
           style:bottom={50 / 2 - 30 / 2 + 'px'}
           style:right="36px"
           style:width="fit-content"
-          class="truncate pointer-events-none absolute text-sm rounded-full w-[32px] py-2 px-4 text-white bg-immich-primary/90 dark:bg-gray-500 hover:cursor-pointer select-none font-semibold"
+          class="truncate pointer-events-none absolute text-sm rounded-full w-8 py-2 px-4 text-white bg-immich-primary/90 dark:bg-gray-500 hover:cursor-pointer select-none font-semibold"
         >
           {scrollHoverLabel}
         </p>
@@ -553,7 +553,7 @@
   {/if}
   <!-- Scroll Position Indicator Line -->
   {#if !usingMobileDevice && !isDragging}
-    <div class="absolute end-0 h-[2px] w-10 bg-primary" style:top="{scrollY + PADDING_TOP - 2}px">
+    <div class="absolute end-0 h-0.5 w-10 bg-primary" style:top="{scrollY + PADDING_TOP - 2}px">
       {#if timelineManager.scrolling && scrollHoverLabel && !isHover}
         <p
           transition:fade={{ duration: 200 }}
@@ -586,7 +586,7 @@
           </div>
         {/if}
         {#if segment.hasDot}
-          <div class="absolute end-3 bottom-0 h-[4px] w-[4px] rounded-full bg-gray-300"></div>
+          <div class="absolute end-3 bottom-0 h-1 w-1 rounded-full bg-gray-300"></div>
         {/if}
       {/if}
     </div>
diff --git a/web/src/lib/components/user-settings-page/user-api-key-list.svelte b/web/src/lib/components/user-settings-page/user-api-key-list.svelte
index 96e159459a..6828efbb33 100644
--- a/web/src/lib/components/user-settings-page/user-api-key-list.svelte
+++ b/web/src/lib/components/user-settings-page/user-api-key-list.svelte
@@ -80,7 +80,7 @@
         <tbody class="block w-full overflow-y-auto rounded-md border dark:border-immich-dark-gray">
           {#each keys as key (key.id)}
             <tr
-              class="flex h-[80px] w-full place-items-center text-center dark:text-immich-dark-fg even:bg-subtle/20 odd:bg-subtle/80"
+              class="flex h-20 w-full place-items-center text-center dark:text-immich-dark-fg even:bg-subtle/20 odd:bg-subtle/80"
             >
               <td class="w-1/4 text-ellipsis px-4 text-sm overflow-hidden">{key.name}</td>
               <td
diff --git a/web/src/lib/elements/Dropdown.svelte b/web/src/lib/elements/Dropdown.svelte
index 6cf4b005b2..513f7dc5a3 100644
--- a/web/src/lib/elements/Dropdown.svelte
+++ b/web/src/lib/elements/Dropdown.svelte
@@ -107,7 +107,7 @@
   {#if showMenu}
     <div
       transition:fly={{ y: -30, duration: 250 }}
-      class="text-sm font-medium z-1 absolute flex min-w-[250px] max-h-[70vh] overflow-y-auto immich-scrollbar flex-col rounded-2xl bg-gray-100 py-2 text-black shadow-lg dark:bg-gray-700 dark:text-white {className} {getAlignClass(
+      class="text-sm font-medium z-1 absolute flex min-w-75 max-h-[70vh] overflow-y-auto immich-scrollbar flex-col rounded-2xl bg-gray-100 py-2 text-black shadow-lg dark:bg-gray-700 dark:text-white {className} {getAlignClass(
         position,
       )}"
     >
diff --git a/web/src/lib/modals/AlbumEditModal.svelte b/web/src/lib/modals/AlbumEditModal.svelte
index a7e62d1031..84a44c8395 100644
--- a/web/src/lib/modals/AlbumEditModal.svelte
+++ b/web/src/lib/modals/AlbumEditModal.svelte
@@ -39,7 +39,7 @@
   <ModalBody>
     <form onsubmit={handleSubmit} autocomplete="off" id="edit-album-form">
       <div class="flex items-center gap-8 m-4">
-        <AlbumCover {album} class="h-[200px] w-[200px] shadow-lg hidden sm:flex" />
+        <AlbumCover {album} class="h-50 w-50 shadow-lg hidden sm:flex" />
 
         <div class="grow flex flex-col gap-4">
           <Field label={$t('name')}>
diff --git a/web/src/lib/modals/AlbumPickerModal.svelte b/web/src/lib/modals/AlbumPickerModal.svelte
index 529ef4b137..72f80043f5 100644
--- a/web/src/lib/modals/AlbumPickerModal.svelte
+++ b/web/src/lib/modals/AlbumPickerModal.svelte
@@ -148,7 +148,7 @@
 
 <Modal title={shared ? $t('add_to_shared_album') : $t('add_to_album')} {onClose} size="small">
   <ModalBody>
-    <div class="mb-2 flex max-h-[400px] flex-col">
+    <div class="mb-2 flex max-h-100 flex-col">
       {#if loading}
         <!-- eslint-disable-next-line svelte/require-each-key -->
         {#each { length: 3 } as _}
diff --git a/web/src/lib/modals/AlbumShareModal.svelte b/web/src/lib/modals/AlbumShareModal.svelte
index 7aa59cbd22..9a60c0f710 100644
--- a/web/src/lib/modals/AlbumShareModal.svelte
+++ b/web/src/lib/modals/AlbumShareModal.svelte
@@ -117,7 +117,7 @@
       </p>
     {/if}
 
-    <div class="immich-scrollbar max-h-[500px] overflow-y-auto">
+    <div class="immich-scrollbar max-h-125 overflow-y-auto">
       {#if users.length > 0 && users.length !== Object.keys(selectedUsers).length}
         <Text>{$t('users')}</Text>
 
diff --git a/web/src/lib/modals/AlbumUsersModal.svelte b/web/src/lib/modals/AlbumUsersModal.svelte
index d33ca7a8bb..d1b009cb91 100644
--- a/web/src/lib/modals/AlbumUsersModal.svelte
+++ b/web/src/lib/modals/AlbumUsersModal.svelte
@@ -99,7 +99,7 @@
 
 <Modal title={$t('options')} size="small" {onClose}>
   <ModalBody>
-    <section class="immich-scrollbar max-h-[400px] overflow-y-auto pb-4">
+    <section class="immich-scrollbar max-h-100 overflow-y-auto pb-4">
       {#each [{ user: album.owner, role: 'owner' }, ...album.albumUsers] as { user, role } (user.id)}
         <div class="flex w-full place-items-center justify-between gap-4 p-5 rounded-xl transition-colors">
           <div class="flex place-items-center gap-4">
diff --git a/web/src/lib/modals/AppDownloadModal.svelte b/web/src/lib/modals/AppDownloadModal.svelte
index 7804394d74..c78c45c324 100644
--- a/web/src/lib/modals/AppDownloadModal.svelte
+++ b/web/src/lib/modals/AppDownloadModal.svelte
@@ -17,21 +17,21 @@
           target="_blank"
           id="play-store-link"
         >
-          <img class="w-[200px] mt-2" alt="Get it on Google Play" src={playStoreBadge} />
+          <img class="w-50 mt-2" alt="Get it on Google Play" src={playStoreBadge} />
         </a>
       </div>
 
       <div class="flex flex-col place-items-start">
         <Text>App Store</Text>
         <a href="https://apps.apple.com/us/app/immich/id1613945652" target="_blank" id="app-store-link">
-          <img class="w-[200px] mt-2" alt="Download on the App Store" src={appStoreBadge} />
+          <img class="w-50 mt-2" alt="Download on the App Store" src={appStoreBadge} />
         </a>
       </div>
 
       <div class="flex flex-col place-items-start">
         <Text>F-Droid</Text>
         <a href="https://f-droid.org/packages/app.alextran.immich/" target="_blank" id="fdroid-link">
-          <img class="w-[200px] mt-2" alt="Get it on F-Droid" src={fdroidBadge} />
+          <img class="w-50 mt-2" alt="Get it on F-Droid" src={fdroidBadge} />
         </a>
       </div>
     </div>
diff --git a/web/src/lib/modals/ObtainiumConfigModal.svelte b/web/src/lib/modals/ObtainiumConfigModal.svelte
index d8cb4aabe2..bc74379ac8 100644
--- a/web/src/lib/modals/ObtainiumConfigModal.svelte
+++ b/web/src/lib/modals/ObtainiumConfigModal.svelte
@@ -73,7 +73,7 @@
               rel="noreferrer"
               id="obtainium-link"
             >
-              <img class="pt-2 pr-5 h-[80px]" alt="Get it on Obtainium" src={obtainiumBadge} />
+              <img class="pt-2 pr-5 h-20" alt="Get it on Obtainium" src={obtainiumBadge} />
             </a>
           </div>
         </div>
diff --git a/web/src/lib/modals/PartnerSelectionModal.svelte b/web/src/lib/modals/PartnerSelectionModal.svelte
index 729a035ef1..65e263918f 100644
--- a/web/src/lib/modals/PartnerSelectionModal.svelte
+++ b/web/src/lib/modals/PartnerSelectionModal.svelte
@@ -36,7 +36,7 @@
 
 <Modal title={$t('add_partner')} {onClose} size="small">
   <ModalBody>
-    <div class="immich-scrollbar max-h-[300px] overflow-y-auto">
+    <div class="immich-scrollbar max-h-75 overflow-y-auto">
       {#if availableUsers.length > 0}
         {#each availableUsers as user (user.id)}
           <button
diff --git a/web/src/lib/modals/ProfileImageCropperModal.svelte b/web/src/lib/modals/ProfileImageCropperModal.svelte
index a39c417391..7f7050f663 100644
--- a/web/src/lib/modals/ProfileImageCropperModal.svelte
+++ b/web/src/lib/modals/ProfileImageCropperModal.svelte
@@ -83,7 +83,7 @@
   <ModalBody>
     <div class="flex place-items-center items-center justify-center">
       <div
-        class="relative flex aspect-square w-[250px] overflow-hidden rounded-full border-4 border-immich-primary bg-immich-dark-primary dark:border-immich-dark-primary dark:bg-immich-primary"
+        class="relative flex aspect-square w-62.5 overflow-hidden rounded-full border-4 border-immich-primary bg-immich-dark-primary dark:border-immich-dark-primary dark:bg-immich-primary"
       >
         <PhotoViewer bind:element={imgElement} {asset} />
       </div>
diff --git 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
index ff19871627..464543cdce 100644
--- 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
@@ -516,8 +516,8 @@
           {/if}
 
           {#if album.assetCount === 0}
-            <section id="empty-album" class=" mt-[200px] flex place-content-center place-items-center">
-              <div class="w-[300px]">
+            <section id="empty-album" class=" mt-50 flex place-content-center place-items-center">
+              <div class="w-75">
                 <p class="uppercase text-xs dark:text-immich-dark-fg">{$t('add_photos')}</p>
                 <button
                   type="button"
@@ -722,7 +722,7 @@
       <div
         transition:fly={{ duration: 150 }}
         id="activity-panel"
-        class="z-2 w-[360px] md:w-[460px] overflow-y-auto transition-all dark:border-l dark:border-s-immich-dark-gray"
+        class="z-2 w-90 md:w-115 overflow-y-auto transition-all dark:border-l dark:border-s-immich-dark-gray"
         translate="yes"
       >
         <ActivityViewer
diff --git a/web/src/routes/admin/jobs-status/+page.svelte b/web/src/routes/admin/jobs-status/+page.svelte
index e5ecf9a15d..1204ff901f 100644
--- a/web/src/routes/admin/jobs-status/+page.svelte
+++ b/web/src/routes/admin/jobs-status/+page.svelte
@@ -95,7 +95,7 @@
     </HStack>
   {/snippet}
   <section id="setting-content" class="flex place-content-center sm:mx-4">
-    <section class="w-full pb-28 sm:w-5/6 md:w-[850px]">
+    <section class="w-full pb-28 sm:w-5/6 md:w-212.5">
       {#if jobs}
         <JobsPanel {jobs} />
       {/if}
diff --git a/web/src/routes/admin/library-management/+page.svelte b/web/src/routes/admin/library-management/+page.svelte
index c39413fda6..039afc97b7 100644
--- a/web/src/routes/admin/library-management/+page.svelte
+++ b/web/src/routes/admin/library-management/+page.svelte
@@ -278,7 +278,7 @@
           <tbody class="block overflow-y-auto rounded-md border dark:border-immich-dark-gray">
             {#each libraries as library, index (library.id)}
               <tr
-                class="grid grid-cols-6 h-[80px] w-full place-items-center text-center dark:text-immich-dark-fg even:bg-subtle/20 odd:bg-subtle/80"
+                class="grid grid-cols-6 h-20 w-full place-items-center text-center dark:text-immich-dark-fg even:bg-subtle/20 odd:bg-subtle/80"
               >
                 <td class="text-ellipsis px-4 text-sm">{library.name}</td>
                 <td class="text-ellipsis px-4 text-sm">
diff --git a/web/src/routes/admin/server-status/+page.svelte b/web/src/routes/admin/server-status/+page.svelte
index 5aa7bfe57a..433703ae0e 100644
--- a/web/src/routes/admin/server-status/+page.svelte
+++ b/web/src/routes/admin/server-status/+page.svelte
@@ -28,7 +28,7 @@
 
 <AdminPageLayout title={data.meta.title}>
   <section id="setting-content" class="flex place-content-center sm:mx-4">
-    <section class="w-full pb-28 sm:w-5/6 md:w-[850px]">
+    <section class="w-full pb-28 sm:w-5/6 md:w-212.5">
       <ServerStatisticsPanel stats={data.stats} />
     </section>
   </section>
diff --git a/web/src/routes/admin/system-settings/+page.svelte b/web/src/routes/admin/system-settings/+page.svelte
index e13cebac67..c7edc4339e 100644
--- a/web/src/routes/admin/system-settings/+page.svelte
+++ b/web/src/routes/admin/system-settings/+page.svelte
@@ -285,7 +285,7 @@
   <AdminSettings bind:config bind:this={adminSettingElement}>
     {#snippet children({ savedConfig, defaultConfig })}
       <section id="setting-content" class="flex place-content-center sm:mx-4">
-        <section class="w-full pb-28 sm:w-5/6 md:w-[896px]">
+        <section class="w-full pb-28 sm:w-5/6 md:w-4xl">
           {#if $featureFlags.configFile}
             <Alert color="warning" class="text-dark my-4" title={$t('admin.config_set_by_file')} />
           {/if}
diff --git a/web/src/routes/admin/users/+page.svelte b/web/src/routes/admin/users/+page.svelte
index dcbffa11ae..129862a62c 100644
--- a/web/src/routes/admin/users/+page.svelte
+++ b/web/src/routes/admin/users/+page.svelte
@@ -77,7 +77,7 @@
     </HStack>
   {/snippet}
   <section id="setting-content" class="flex place-content-center sm:mx-4">
-    <section class="w-full pb-28 lg:w-[850px]">
+    <section class="w-full pb-28 lg:w-212.5">
       <table class="my-5 w-full text-start">
         <thead
           class="mb-4 flex h-12 w-full rounded-md border bg-gray-50 text-primary dark:border-immich-dark-gray dark:bg-immich-dark-gray"
@@ -95,7 +95,7 @@
           {#if allUsers}
             {#each allUsers as immichUser (immichUser.id)}
               <tr
-                class="flex h-[80px] overflow-hidden w-full place-items-center text-center dark:text-immich-dark-fg {immichUser.deletedAt
+                class="flex h-20 overflow-hidden w-full place-items-center text-center dark:text-immich-dark-fg {immichUser.deletedAt
                   ? 'bg-red-300 dark:bg-red-900'
                   : 'even:bg-subtle/20 odd:bg-subtle/80'}"
               >
diff --git a/web/src/routes/auth/onboarding/+page.svelte b/web/src/routes/auth/onboarding/+page.svelte
index 9b33351d0f..d2e9a9f240 100644
--- a/web/src/routes/auth/onboarding/+page.svelte
+++ b/web/src/routes/auth/onboarding/+page.svelte
@@ -167,7 +167,7 @@
         style="width: {(onboardingProgress / onboardingStepCount) * 100}%"
       ></div>
     </div>
-    <div class="py-8 flex place-content-center place-items-center m-auto w-[min(100%,_800px)]">
+    <div class="py-8 flex place-content-center place-items-center m-auto w-[min(100%,800px)]">
       <OnboardingCard
         title={onboardingSteps[index].title}
         icon={onboardingSteps[index].icon}

From ceb36a304d9bfc59c868b222f46a5da45e32f009 Mon Sep 17 00:00:00 2001
From: Alex <alex.tran1502@gmail.com>
Date: Fri, 31 Oct 2025 12:24:41 -0500
Subject: [PATCH 08/84] fix: view in timeline does not jump to the timeline
 correctly (#23428)

---
 mobile/lib/constants/constants.dart            |  5 +++++
 mobile/lib/pages/common/tab_shell.page.dart    | 16 ++++++++++------
 .../similar_photos_action_button.widget.dart   | 18 +++++++++++++++++-
 .../widgets/timeline/timeline.widget.dart      |  2 ++
 mobile/lib/providers/routes.provider.dart      |  1 +
 5 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/mobile/lib/constants/constants.dart b/mobile/lib/constants/constants.dart
index 10f4e88f0f..03acd6a548 100644
--- a/mobile/lib/constants/constants.dart
+++ b/mobile/lib/constants/constants.dart
@@ -53,3 +53,8 @@ const int kMinMonthsToEnableScrubberSnap = 12;
 const String kImmichAppStoreLink = "https://apps.apple.com/app/immich/id6449244941";
 const String kImmichPlayStoreLink = "https://play.google.com/store/apps/details?id=app.alextran.immich";
 const String kImmichLatestRelease = "https://github.com/immich-app/immich/releases/latest";
+
+const int kPhotoTabIndex = 0;
+const int kSearchTabIndex = 1;
+const int kAlbumTabIndex = 2;
+const int kLibraryTabIndex = 3;
diff --git a/mobile/lib/pages/common/tab_shell.page.dart b/mobile/lib/pages/common/tab_shell.page.dart
index c4bf19fe34..b04a379e41 100644
--- a/mobile/lib/pages/common/tab_shell.page.dart
+++ b/mobile/lib/pages/common/tab_shell.page.dart
@@ -4,6 +4,7 @@ import 'package:auto_route/auto_route.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/constants/constants.dart';
 import 'package:immich_mobile/domain/models/timeline.model.dart';
 import 'package:immich_mobile/domain/utils/event_stream.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
@@ -13,6 +14,7 @@ import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/memory.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/people.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/readonly_mode.provider.dart';
+import 'package:immich_mobile/providers/routes.provider.dart';
 import 'package:immich_mobile/providers/search/search_input_focus.provider.dart';
 import 'package:immich_mobile/providers/tab.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
@@ -106,31 +108,33 @@ class _TabShellPageState extends ConsumerState<TabShellPage> {
 }
 
 void _onNavigationSelected(TabsRouter router, int index, WidgetRef ref) {
+  ref.read(currentTabIndexProvider.notifier).state = index;
+
   // On Photos page menu tapped
-  if (router.activeIndex == 0 && index == 0) {
+  if (router.activeIndex == kPhotoTabIndex && index == kPhotoTabIndex) {
     EventStream.shared.emit(const ScrollToTopEvent());
   }
 
-  if (index == 0) {
+  if (index == kPhotoTabIndex) {
     ref.invalidate(driftMemoryFutureProvider);
   }
 
-  if (router.activeIndex != 1 && index == 1) {
+  if (router.activeIndex != kSearchTabIndex && index == kSearchTabIndex) {
     ref.read(searchPreFilterProvider.notifier).clear();
   }
 
   // On Search page tapped
-  if (router.activeIndex == 1 && index == 1) {
+  if (router.activeIndex == kSearchTabIndex && index == kSearchTabIndex) {
     ref.read(searchInputFocusProvider).requestFocus();
   }
 
   // Album page
-  if (index == 2) {
+  if (index == kAlbumTabIndex) {
     ref.read(remoteAlbumProvider.notifier).refresh();
   }
 
   // Library page
-  if (index == 3) {
+  if (index == kLibraryTabIndex) {
     ref.invalidate(localAlbumProvider);
     ref.invalidate(driftGetAllPeopleProvider);
   }
diff --git 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
index f9ba31e8be..acfeb131de 100644
--- 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
@@ -3,12 +3,14 @@ import 'dart:async';
 import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/constants/constants.dart';
 import 'package:immich_mobile/entities/asset.entity.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/models/search/search_filter.model.dart';
 import 'package:immich_mobile/presentation/pages/search/paginated_search.provider.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_viewer.state.dart';
+import 'package:immich_mobile/providers/routes.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
 
 class SimilarPhotosActionButton extends ConsumerWidget {
@@ -35,7 +37,21 @@ class SimilarPhotosActionButton extends ConsumerWidget {
             mediaType: AssetType.image,
           ),
         );
-    unawaited(context.router.popAndPush(const DriftSearchRoute()));
+
+    /// Using and currentTabIndex to make sure we are using the correct
+    /// navigation behavior. We want to be able to navigate back to the
+    /// main timline using View In Timeline button without the need of
+    /// waiting for the timeline to be rebuild. At the same time, we want
+    /// to refresh the search page when tapping the Similar Photos button
+    /// while already in the Search tab.
+    final currentTabIndex = (ref.read(currentTabIndexProvider.notifier).state);
+
+    if (currentTabIndex != kSearchTabIndex) {
+      unawaited(context.router.navigate(const DriftSearchRoute()));
+      ref.read(currentTabIndexProvider.notifier).state = kSearchTabIndex;
+    } else {
+      unawaited(context.router.popAndPush(const DriftSearchRoute()));
+    }
   }
 
   @override
diff --git a/mobile/lib/presentation/widgets/timeline/timeline.widget.dart b/mobile/lib/presentation/widgets/timeline/timeline.widget.dart
index 5f1e7f27b0..70dd15bf7f 100644
--- a/mobile/lib/presentation/widgets/timeline/timeline.widget.dart
+++ b/mobile/lib/presentation/widgets/timeline/timeline.widget.dart
@@ -228,6 +228,8 @@ class _SliverTimelineState extends ConsumerState<_SliverTimeline> {
               curve: Curves.easeInOut,
             )
             .whenComplete(() => ref.read(timelineStateProvider.notifier).setScrubbing(false));
+      } else {
+        ref.read(timelineStateProvider.notifier).setScrubbing(false);
       }
     });
   }
diff --git a/mobile/lib/providers/routes.provider.dart b/mobile/lib/providers/routes.provider.dart
index c51f67bc0e..57b375d229 100644
--- a/mobile/lib/providers/routes.provider.dart
+++ b/mobile/lib/providers/routes.provider.dart
@@ -5,3 +5,4 @@ final inLockedViewProvider = StateProvider<bool>((ref) => false);
 final currentRouteNameProvider = StateProvider<String?>((ref) => null);
 final previousRouteNameProvider = StateProvider<String?>((ref) => null);
 final previousRouteDataProvider = StateProvider<RouteSettings?>((ref) => null);
+final currentTabIndexProvider = StateProvider<int>((ref) => 0);

From 5854cbbe9775b53c9e87ecfaba9b10089c57225d Mon Sep 17 00:00:00 2001
From: Alex <alex.tran1502@gmail.com>
Date: Fri, 31 Oct 2025 12:47:14 -0500
Subject: [PATCH 09/84] fix: show close button on purchase modal (#23436)

---
 web/src/lib/modals/PurchaseModal.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/src/lib/modals/PurchaseModal.svelte b/web/src/lib/modals/PurchaseModal.svelte
index f771529ad2..eb1880c91b 100644
--- a/web/src/lib/modals/PurchaseModal.svelte
+++ b/web/src/lib/modals/PurchaseModal.svelte
@@ -13,7 +13,7 @@
   let showProductActivated = $state(false);
 </script>
 
-<Modal title="" {onClose} size="large">
+<Modal title=" " {onClose} size="large">
   <ModalBody>
     {#if showProductActivated}
       <PurchaseActivationSuccess onDone={onClose} />

From 86cc7c3c7354f08e7b38bd31bd0b705ffbab53fa Mon Sep 17 00:00:00 2001
From: "Weblate (bot)" <hosted@weblate.org>
Date: Fri, 31 Oct 2025 19:02:30 +0100
Subject: [PATCH 10/84] chore(web): update translations (#23375)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Translate-URL: https://hosted.weblate.org/projects/immich/immich/
Translate-URL: https://hosted.weblate.org/projects/immich/immich/da/
Translate-URL: https://hosted.weblate.org/projects/immich/immich/de/
Translate-URL: https://hosted.weblate.org/projects/immich/immich/fr/
Translate-URL: https://hosted.weblate.org/projects/immich/immich/hi/
Translate-URL: https://hosted.weblate.org/projects/immich/immich/nb_NO/
Translate-URL: https://hosted.weblate.org/projects/immich/immich/pl/
Translate-URL: https://hosted.weblate.org/projects/immich/immich/pt/
Translate-URL: https://hosted.weblate.org/projects/immich/immich/ru/
Translate-URL: https://hosted.weblate.org/projects/immich/immich/sv/
Translate-URL: https://hosted.weblate.org/projects/immich/immich/ta/
Translate-URL: https://hosted.weblate.org/projects/immich/immich/tr/
Translate-URL: https://hosted.weblate.org/projects/immich/immich/zh_Hant/
Translation: Immich/immich

Co-authored-by: Akhil Raj Baranwal <akhil.r.baranwal@gmail.com>
Co-authored-by: Dennis Kjær Jensen <weblate@signout.dk>
Co-authored-by: DevServs <bonov@mail.ru>
Co-authored-by: Florian Amsallem <florian.amsallem@gmail.com>
Co-authored-by: Hurricane-32 <rodrigorimo@hotmail.com>
Co-authored-by: Kai Heine <kai-heine@users.noreply.hosted.weblate.org>
Co-authored-by: Marrick Schröder <marrick.schroeder@gmail.com>
Co-authored-by: Michael <parieren.gefuehl5g@icloud.com>
Co-authored-by: PontusÖsterlindh <pontus@osterlindh.com>
Co-authored-by: S M, Aravinth (A.) <asm1@ford.com>
Co-authored-by: User 123456789 <user123456789@users.noreply.hosted.weblate.org>
Co-authored-by: Vegard Fladby <vegard@fladby.org>
Co-authored-by: linux-universe <lauro@dilorenzo.one>
Co-authored-by: shiuh67 <shiuh.cheng@gmail.com>
Co-authored-by: slick-daddy <129640104+slick-daddy@users.noreply.github.com>
Co-authored-by: ti-guru <anders.egeland@outlook.com>
---
 i18n/da.json      |  1 +
 i18n/de.json      | 10 +++--
 i18n/fr.json      |  2 +-
 i18n/hi.json      | 96 ++++++++++++++++++++++++++++++++++++++++++-----
 i18n/nb_NO.json   |  3 +-
 i18n/pl.json      |  1 +
 i18n/pt.json      | 90 ++++++++++++++++++++++----------------------
 i18n/ru.json      |  8 ++--
 i18n/sv.json      |  8 +++-
 i18n/ta.json      | 25 ++++++++++++
 i18n/tr.json      |  6 +++
 i18n/zh_Hant.json |  3 ++
 12 files changed, 189 insertions(+), 64 deletions(-)

diff --git a/i18n/da.json b/i18n/da.json
index 84109939bf..5bb67dd83d 100644
--- a/i18n/da.json
+++ b/i18n/da.json
@@ -1716,6 +1716,7 @@
   "running": "Kører",
   "save": "Gem",
   "save_to_gallery": "Gem til galleri",
+  "saved": "Gemt",
   "saved_api_key": "Gemt API-nøgle",
   "saved_profile": "Gemte profil",
   "saved_settings": "Gemte indstillinger",
diff --git a/i18n/de.json b/i18n/de.json
index ce0f8a2966..0cae9c0762 100644
--- a/i18n/de.json
+++ b/i18n/de.json
@@ -155,12 +155,15 @@
     "machine_learning_min_recognized_faces": "Mindestens erkannte Gesichter",
     "machine_learning_min_recognized_faces_description": "Die Mindestanzahl von erkannten Gesichtern, damit eine Person erstellt werden kann. Eine Erhöhung dieses Wertes macht die Gesichtserkennung präziser, erhöht aber die Wahrscheinlichkeit, dass ein Gesicht nicht zu einer Person zugeordnet wird.",
     "machine_learning_ocr": "OCR",
-    "machine_learning_ocr_description": "Maschinen lernen nutzen um Texte in Bildern zu erkennen",
+    "machine_learning_ocr_description": "Maschinelles Lernen nutzen um Texte in Bildern zu erkennen",
     "machine_learning_ocr_enabled": "OCR aktivieren",
     "machine_learning_ocr_enabled_description": "Wenn deaktiviert, werden die Bilder nicht von der Texterkennung bearbeitet.",
     "machine_learning_ocr_max_resolution": "Maximale Auflösung",
     "machine_learning_ocr_max_resolution_description": "Vorschauen über dieser Auflösung werden unter Beibehaltung des Seitenverhältnisses verkleinert. Höhere Werte sind genauer, benötigen jedoch mehr Zeit für die Verarbeitung und verbrauchen mehr Speicher.",
     "machine_learning_ocr_min_detection_score": "Minimaler Erkennungswert",
+    "machine_learning_ocr_min_detection_score_description": "Minimale Konfidenzrate für die Texterkennung von 0–1. Niedrigere Werte führen dazu, dass mehr Text erkannt wird, können jedoch zu falsch-positiven Ergebnissen führen.",
+    "machine_learning_ocr_min_recognition_score": "Minimale Erkennungsrate",
+    "machine_learning_ocr_min_score_recognition_description": "Minimale Konfidenzrate für die Erkennung von erkanntem Text von 0–1. Niedrigere Werte führen dazu, dass mehr Text erkannt wird, können jedoch zu falsch-positiven Ergebnissen führen.",
     "machine_learning_ocr_model": "OCR Modell",
     "machine_learning_ocr_model_description": "Server Modelle sind genauer als mobile Modelle, brauchen aber länger zur Verarbeitung und brauchen mehr Speicher.",
     "machine_learning_settings": "Einstellungen für maschinelles Lernen",
@@ -254,7 +257,7 @@
     "oauth_storage_quota_default_description": "Kontingent in GiB, das verwendet werden soll, wenn keines übermittelt wird.",
     "oauth_timeout": "Zeitüberschreitung bei Anfrage",
     "oauth_timeout_description": "Zeitüberschreitung für Anfragen in Millisekunden",
-    "ocr_job_description": "Verwende Machine Learning zur Ernennung von Text in Bildern",
+    "ocr_job_description": "Verwende Machine Learning zur Erkennung von Text in Bildern",
     "password_enable_description": "Mit E-Mail und Passwort anmelden",
     "password_settings": "Passwort-Anmeldung",
     "password_settings_description": "Passwort-Anmeldeeinstellungen verwalten",
@@ -1352,7 +1355,7 @@
   "memories_check_back_tomorrow": "Schau morgen wieder vorbei für weitere Erinnerungen",
   "memories_setting_description": "Verwalte, was du in deinen Erinnerungen siehst",
   "memories_start_over": "Erneut beginnen",
-  "memories_swipe_to_close": "Nach oben Wischen zum schließen",
+  "memories_swipe_to_close": "Nach oben Wischen zum Schließen",
   "memory": "Erinnerung",
   "memory_lane_title": "Foto-Erinnerungen {title}",
   "menu": "Menü",
@@ -1713,6 +1716,7 @@
   "running": "Läuft",
   "save": "Speichern",
   "save_to_gallery": "In Galerie speichern",
+  "saved": "Gespeichert",
   "saved_api_key": "API-Schlüssel wurde gespeichert",
   "saved_profile": "Profil gespeichert",
   "saved_settings": "Einstellungen gespeichert",
diff --git a/i18n/fr.json b/i18n/fr.json
index 6c2f979e86..789afffc38 100644
--- a/i18n/fr.json
+++ b/i18n/fr.json
@@ -157,7 +157,7 @@
     "machine_learning_ocr": "OCR",
     "machine_learning_ocr_description": "Utiliser l'apprentissage automatique pour reconnaître le texte dans les images",
     "machine_learning_ocr_enabled": "Activer la reconnaissance de caractères",
-    "machine_learning_ocr_enabled_description": "Si désactivé, la reconnaissance de texte ne s'appliquera pas aux images",
+    "machine_learning_ocr_enabled_description": "Si désactivé, la reconnaissance de texte ne s'appliquera pas aux images.",
     "machine_learning_ocr_max_resolution": "Résolution maximale",
     "machine_learning_ocr_max_resolution_description": "Les prévisualisations au-dessus de cette résolution seront retaillées en conservant leur ratio. Des valeurs plus grandes sont plus précises, mais sont plus lentes et utilisent plus de mémoire.",
     "machine_learning_ocr_min_detection_score": "Score minimum de détection",
diff --git a/i18n/hi.json b/i18n/hi.json
index d902a34dd8..fb1698c0a2 100644
--- a/i18n/hi.json
+++ b/i18n/hi.json
@@ -33,6 +33,7 @@
   "add_to_albums": "एकाधिक एल्बम में डाले",
   "add_to_albums_count": "एल्बमों में डालें ({count})",
   "add_to_shared_album": "शेयर किए गए एल्बम में डालें",
+  "add_upload_to_stack": "स्टैक में अपलोड करें",
   "add_url": "URL डालें",
   "added_to_archive": "संग्रहीत कर दिया गया है",
   "added_to_favorites": "पसंदीदा में डाला गया",
@@ -124,6 +125,13 @@
     "logging_enable_description": "लॉगिंग करने देना",
     "logging_level_description": "सक्षम होने पर, किस लॉग स्तर का उपयोग करना है।",
     "logging_settings": "लॉगिंग",
+    "machine_learning_availability_checks": "उपलब्धता जांच",
+    "machine_learning_availability_checks_description": "उपलब्ध मशीन लर्निंग सर्वर का स्वचालित रूप से पता लगाएं और प्राथमिकता दें",
+    "machine_learning_availability_checks_enabled": "उपलब्धता जांच सक्षम करें",
+    "machine_learning_availability_checks_interval": "अंतराल की जाँच करें",
+    "machine_learning_availability_checks_interval_description": "उपलब्धता जांच के बीच मिलीसेकेंड में अंतराल",
+    "machine_learning_availability_checks_timeout": "अनुरोध समयबाह्य हुआ",
+    "machine_learning_availability_checks_timeout_description": "उपलब्धता जांच के लिए मिलीसेकंड में समयबाह्य अंतराल",
     "machine_learning_clip_model": "क्लिप मॉडल",
     "machine_learning_clip_model_description": "CLIP मॉडल का नाम <link>यहां</link> सूचीबद्ध है। ध्यान दें कि मॉडल बदलने पर आपको सभी छवियों के लिए 'स्मार्ट सर्च' जोब फिर से चलाना होगा।",
     "machine_learning_duplicate_detection": "डुप्लिकेट का पता लगाना",
@@ -146,6 +154,18 @@
     "machine_learning_min_detection_score_description": "किसी चेहरे का पता लगाने के लिए न्यूनतम आत्मविश्वास स्कोर 0-1 होना चाहिए।",
     "machine_learning_min_recognized_faces": "निम्नतम पहचाने चेहरे",
     "machine_learning_min_recognized_faces_description": "किसी व्यक्ति के लिए पहचाने जाने वाले चेहरों की न्यूनतम संख्या।",
+    "machine_learning_ocr": "ओ.सी.आर",
+    "machine_learning_ocr_description": "चित्रों में पाठ को पहचानने के लिए मशीन लर्निंग का उपयोग करें",
+    "machine_learning_ocr_enabled": "ओ.सी.आर. सक्षम करें",
+    "machine_learning_ocr_enabled_description": "यदि अक्षम किया गया है, तो चित्रों पर पाठ-पहचान नहीं होगा।",
+    "machine_learning_ocr_max_resolution": "अधिकतम रिज़ॉल्यूशन",
+    "machine_learning_ocr_max_resolution_description": "इस रिज़ॉल्यूशन से ऊपर के प्रदर्शन का आकार मूल अनुपात को संरक्षित करते हुए बदल दिया जाएगा। उच्च मान अधिक सटीक होते हैं, लेकिन संसाधित होने में अधिक मेमोरी और समय लगाते हैं।",
+    "machine_learning_ocr_min_detection_score": "न्यूनतम खोज अंक",
+    "machine_learning_ocr_min_detection_score_description": "पाठ का पता लगाने के लिए 0-1 के बीच न्यूनतम आत्मविश्वास अंक। कम अंक अधिक पाठ का पता लगाएंगे लेकिन परिणाम गलत हो सकते हैं।",
+    "machine_learning_ocr_min_recognition_score": "न्यूनतम पहचान अंक",
+    "machine_learning_ocr_min_score_recognition_description": "पाठ को पहचानने के लिए 0-1 के बीच न्यूनतम आत्मविश्वास अंक। कम अंक अधिक पाठ को पहचानेंगे लेकिन परिणाम गलत हो सकते हैं।",
+    "machine_learning_ocr_model": "ओसीआर प्रतिमान",
+    "machine_learning_ocr_model_description": "सर्वर प्रतिमान मोबाइल प्रतिमान की तुलना में अधिक सटीक होते हैं, लेकिन संसाधित होने में अधिक मेमोरी और समय लेते हैं।",
     "machine_learning_settings": "मशीन लर्निंग सेटिंग्स",
     "machine_learning_settings_description": "मशीन लर्निंग सुविधाओं और सेटिंग्स को प्रबंधित करें",
     "machine_learning_smart_search": "स्मार्ट खोज",
@@ -203,6 +223,8 @@
     "notification_email_ignore_certificate_errors_description": "टीएलएस प्रमाणपत्र सत्यापन त्रुटियों पर ध्यान न दें (अनुशंसित नहीं)",
     "notification_email_password_description": "ईमेल सर्वर से प्रमाणीकरण करते समय उपयोग किया जाने वाला पासवर्ड",
     "notification_email_port_description": "ईमेल सर्वर का पोर्ट (जैसे 25, 465, या 587)",
+    "notification_email_secure": "एस एम टी पी एस",
+    "notification_email_secure_description": "एस.एम.टी.पी.एस. प्रयोग करें (टी.एल.एस पर एस.एम.टी.पी)",
     "notification_email_sent_test_email_button": "परीक्षण ईमेल भेजें और सहेजें",
     "notification_email_setting_description": "ईमेल सूचनाएं भेजने के लिए सेटिंग्स",
     "notification_email_test_email": "परीक्षण ईमेल भेजें",
@@ -235,6 +257,7 @@
     "oauth_storage_quota_default_description": "GiB में कोटा का उपयोग तब किया जाएगा जब कोई दावा प्रदान नहीं किया गया हो ।",
     "oauth_timeout": "ब्रेक का अनुरोध",
     "oauth_timeout_description": "अनुरोधों के लिए समय-सीमा मिलीसेकंड में",
+    "ocr_job_description": "चित्रों में पाठ को पहचानने के लिए मशीन लर्निंग का उपयोग करें",
     "password_enable_description": "ईमेल और पासवर्ड से लॉगिन करें",
     "password_settings": "पासवर्ड लॉग इन",
     "password_settings_description": "पासवर्ड लॉगिन सेटिंग प्रबंधित करें",
@@ -325,7 +348,7 @@
     "transcoding_max_b_frames": "अधिकतम बी-फ्रेम",
     "transcoding_max_b_frames_description": "उच्च मान संपीड़न दक्षता में सुधार करते हैं, लेकिन एन्कोडिंग को धीमा कर देते हैं।",
     "transcoding_max_bitrate": "अधिकतम बिटरेट",
-    "transcoding_max_bitrate_description": "अधिकतम बिटरेट सेट करने से फ़ाइल आकार को गुणवत्ता पर मामूली लागत के साथ अधिक पूर्वानुमानित किया जा सकता है। 720p पर, सामान्य मान VP9 या HEVC के लिए 2600k kbit/s या H.264 के लिए 4500k kbit/s हैं। 0 पर सेट होने पर अक्षम।",
+    "transcoding_max_bitrate_description": "अधिकतम बिटरेट सेट करने से फ़ाइल आकार को गुणवत्ता पर मामूली लागत के साथ अधिक पूर्वानुमानित किया जा सकता है। 720p पर, सामान्य मान VP9 या HEVC के लिए 2600k kbit/s या H.264 के लिए 4500k kbit/s हैं। 0 पर सेट होने पर अक्षम। जब कोई इकाई निर्दिष्ट नहीं की जाती है, तो k (kbit/s के लिए) मान लिया जाता है; इसलिए 5000, 5000k, और 5M (Mbit/s के लिए) समतुल्य हैं।",
     "transcoding_max_keyframe_interval": "अधिकतम मुख्यफ़्रेम अंतराल",
     "transcoding_max_keyframe_interval_description": "मुख्यफ़्रेम के बीच अधिकतम फ़्रेम दूरी निर्धारित करता है।",
     "transcoding_optimal_description": "लक्ष्य रिज़ॉल्यूशन से अधिक ऊंचे वीडियो या स्वीकृत प्रारूप में नहीं",
@@ -359,6 +382,9 @@
     "trash_number_of_days_description": "संपत्तियों को स्थायी रूप से हटाने से पहले उन्हें कूड़ेदान में रखने के लिए दिनों की संख्या",
     "trash_settings": "ट्रैश सेटिंग",
     "trash_settings_description": "ट्रैश सेटिंग प्रबंधित करें",
+    "unlink_all_oauth_accounts": "सभी ओ.औथ खातों से संपर्क तोड़ दें",
+    "unlink_all_oauth_accounts_description": "नए प्रदाता पर सतानांतरण करने से पहले सभी ओ.औथ खातों से संपर्क तोड़ना याद रखें।",
+    "unlink_all_oauth_accounts_prompt": "क्या आप वाकई सभी ओ.औथ खातों से संपर्क तोड़ना चाहते हैं? इससे प्रत्येक उपयोगकर्ता के लिए ओ.औथ आई.डी रद्द हो जाएगी और इसे पूर्ववत नहीं किया जा सकेगा।",
     "user_cleanup_job": "उपयोगकर्ता सफ़ाई",
     "user_delete_delay": "<b>{user}</b> के खाते और परिसंपत्तियों को {delay, plural, one {# day} other {# days}} में स्थायी रूप से हटाने के लिए शेड्यूल किया जाएगा।",
     "user_delete_delay_settings": "हटाने में देरी",
@@ -392,6 +418,8 @@
   "advanced_settings_prefer_remote_title": "दूरस्थ छवियों को प्राथमिकता दें",
   "advanced_settings_proxy_headers_subtitle": "प्रत्येक नेटवर्क अनुरोध के साथ इम्मिच द्वारा भेजे जाने वाले प्रॉक्सी हेडर को परिभाषित करें",
   "advanced_settings_proxy_headers_title": "प्रॉक्सी हेडर",
+  "advanced_settings_readonly_mode_subtitle": "रीड-ओनली प्रणाली को सक्षम करता है जहां चित्र को केवल देखा जा सकता है, एकाधिक चित्रों का चयन करना, साझा करना, कास्टिंग करना, हटाना जैसी सभी चीज़ें अक्षम हैं। मुख्य स्क्रीन में उपयोगकर्ता- अवतार के माध्यम से रीड-ओनली प्रणाली को सक्षम/अक्षम करें",
+  "advanced_settings_readonly_mode_title": "रीड-ओनली प्रणाली",
   "advanced_settings_self_signed_ssl_subtitle": "सर्वर एंडपॉइंट के लिए SSL प्रमाणपत्र सत्यापन को छोड़ देता है। स्व-हस्ताक्षरित प्रमाणपत्रों के लिए आवश्यक है।",
   "advanced_settings_self_signed_ssl_title": "स्व-हस्ताक्षरित SSL प्रमाणपत्रों की अनुमति दें",
   "advanced_settings_sync_remote_deletions_subtitle": "वेब पर कार्रवाई किए जाने पर इस डिवाइस पर किसी संपत्ति को स्वचालित रूप से हटाएँ या पुनर्स्थापित करें",
@@ -419,6 +447,7 @@
   "album_remove_user_confirmation": "क्या आप वाकई {user} को हटाना चाहते हैं?",
   "album_search_not_found": "आपकी खोज से मेल खाता कोई एल्बम नहीं मिला",
   "album_share_no_users": "ऐसा लगता है कि आपने यह एल्बम सभी उपयोगकर्ताओं के साथ साझा कर दिया है या आपके पास साझा करने के लिए कोई उपयोगकर्ता नहीं है।",
+  "album_summary": "एल्बम सारांश",
   "album_updated": "एल्बम अपडेट किया गया",
   "album_updated_setting_description": "जब किसी साझा एल्बम में नई संपत्तियाँ हों तो एक ईमेल सूचना प्राप्त करें",
   "album_user_left": "बायाँ {album}",
@@ -452,11 +481,16 @@
   "api_key_description": "यह की केवल एक बार दिखाई जाएगी। विंडो बंद करने से पहले कृपया इसे कॉपी करना सुनिश्चित करें।।",
   "api_key_empty": "आपका एपीआई कुंजी नाम खाली नहीं होना चाहिए",
   "api_keys": "एपीआई कीज",
+  "app_architecture_variant": "रूपान्तर (स्थापत्य/आर्किटेक्चर)",
   "app_bar_signout_dialog_content": "क्या आप सुनिश्चित हैं कि आप लॉग आउट करना चाहते हैं?",
   "app_bar_signout_dialog_ok": "हाँ",
   "app_bar_signout_dialog_title": "लॉग आउट",
+  "app_download_links": "ऐप डाउनलोड लिंक",
   "app_settings": "एप्लिकेशन सेटिंग",
+  "app_stores": "ऐप स्टोर/गोदाम",
+  "app_update_available": "आधुनिक ऐप उपलब्ध है",
   "appears_in": "प्रकट होता है",
+  "apply_count": "लागू करें ({count, number})",
   "archive": "संग्रहालय",
   "archive_action_prompt": "{count} को संग्रह में जोड़ा गया",
   "archive_or_unarchive_photo": "फ़ोटो को संग्रहीत या असंग्रहीत करें",
@@ -465,17 +499,17 @@
   "archive_size": "पुरालेख आकार",
   "archive_size_description": "डाउनलोड के लिए संग्रह आकार कॉन्फ़िगर करें (GiB में)",
   "archived": "संग्रहित",
-  "archived_count": "{count, plural, other {# संग्रहीत किए गए}",
+  "archived_count": "{count, plural, other {# संग्रहीत किए गए}}",
   "are_these_the_same_person": "क्या ये वही व्यक्ति हैं?",
   "are_you_sure_to_do_this": "क्या आप वास्तव में इसे करना चाहते हैं?",
   "asset_action_delete_err_read_only": "केवल पढ़ने योग्य परिसंपत्ति(ओं) को हटाया नहीं जा सकता, छोड़ा जा सकता है",
   "asset_action_share_err_offline": "ऑफ़लाइन परिसंपत्ति(एँ) प्राप्त नहीं की जा सकती, छोड़ी जा रही है",
   "asset_added_to_album": "एल्बम में डाला गया",
-  "asset_adding_to_album": "एल्बम में डाला जा रहा है..।",
+  "asset_adding_to_album": "एल्बम में डाला जा रहा है…",
   "asset_description_updated": "संपत्ति विवरण अद्यतन कर दिया गया है",
   "asset_filename_is_offline": "एसेट {filename} ऑफ़लाइन है",
   "asset_has_unassigned_faces": "एसेट में अनिर्धारित चेहरे हैं",
-  "asset_hashing": "हैशिंग...।",
+  "asset_hashing": "हैशिंग…",
   "asset_list_group_by_sub_title": "द्वारा समूह बनाएं",
   "asset_list_layout_settings_dynamic_layout_title": "गतिशील लेआउट",
   "asset_list_layout_settings_group_automatically": "स्वचालित",
@@ -489,6 +523,8 @@
   "asset_restored_successfully": "संपत्ति(याँ) सफलतापूर्वक पुनर्स्थापित की गईं",
   "asset_skipped": "छोड़ा गया",
   "asset_skipped_in_trash": "कचरे में",
+  "asset_trashed": "एसेट नष्ट किया गया",
+  "asset_troubleshoot": "एसेट समस्या निवारण",
   "asset_uploaded": "अपलोड किए गए",
   "asset_uploading": "अपलोड हो रहा है…",
   "asset_viewer_settings_subtitle": "अपनी गैलरी व्यूअर सेटिंग प्रबंधित करें",
@@ -496,7 +532,9 @@
   "assets": "संपत्तियां",
   "assets_added_count": "{count, plural, one {# asset} other {# assets}} जोड़ा गया",
   "assets_added_to_album_count": "एल्बम में {count, plural, one {# asset} other {# assets}} जोड़ा गया",
+  "assets_added_to_albums_count": "{assetTotal, plural, one {# asset} other {# assets}} को {albumTotal, plural, one {# album} other {# albums}} से जोड़ा गया",
   "assets_cannot_be_added_to_album_count": "{count, plural, one {Asset} other {Assets}} को एल्बम में नहीं जोड़ा जा सकता",
+  "assets_cannot_be_added_to_albums": "{count, plural, one {Asset} other {Assets}} किसी एल्बम से नहीं जोड़े जा सकते",
   "assets_count": "{count, plural, one {# आइटम} other {# आइटम्स}}",
   "assets_deleted_permanently": "{count} संपत्ति(याँ) स्थायी रूप से हटा दी गईं",
   "assets_deleted_permanently_from_server": "{count} संपत्ति(याँ) इमिच सर्वर से स्थायी रूप से हटा दी गईं",
@@ -513,14 +551,17 @@
   "assets_trashed_count": "ट्रैश की गई {count, plural, one {# asset} other {# assets}}",
   "assets_trashed_from_server": "{count} संपत्ति(याँ) इमिच सर्वर से कचरे में डाली गईं",
   "assets_were_part_of_album_count": "{count, plural, one {Asset was} other {Assets were}}एल्बम का पहले से ही हिस्सा थे",
+  "assets_were_part_of_albums_count": "{count, plural, one {Asset was} other {Assets were}} पहले ही एल्बम में संयोजित हैं",
   "authorized_devices": "अधिकृत उपकरण",
   "automatic_endpoint_switching_subtitle": "उपलब्ध होने पर निर्दिष्ट वाई-फाई से स्थानीय रूप से कनेक्ट करें और अन्यत्र वैकल्पिक कनेक्शन का उपयोग करें",
   "automatic_endpoint_switching_title": "स्वचालित URL स्विचिंग",
   "autoplay_slideshow": "ऑटोप्ले स्लाइड शो",
   "back": "वापस",
   "back_close_deselect": "वापस जाएँ, बंद करें, या अचयनित करें",
+  "background_backup_running_error": "परिप्रेक्ष्य बैकअप अभी जारी है, नियमावली बैकअप प्रारंभ नहीं किया जा सकता",
   "background_location_permission": "पृष्ठभूमि स्थान अनुमति",
   "background_location_permission_content": "पृष्ठभूमि में चलते समय नेटवर्क बदलने के लिए, Immich के पास *हमेशा* सटीक स्थान तक पहुंच होनी चाहिए ताकि ऐप वाई-फाई नेटवर्क का नाम पढ़ सके",
+  "background_options": "परिप्रेक्ष्य विकल्प",
   "backup": "बैकअप",
   "backup_album_selection_page_albums_device": "डिवाइस पर एल्बम ({count})",
   "backup_album_selection_page_albums_tap": "शामिल करने के लिए टैप करें, बाहर करने के लिए डबल टैप करें",
@@ -528,8 +569,10 @@
   "backup_album_selection_page_select_albums": "एल्बम चुनें",
   "backup_album_selection_page_selection_info": "चयन जानकारी",
   "backup_album_selection_page_total_assets": "कुल अद्वितीय संपत्तियाँ",
+  "backup_albums_sync": "बैकअप एल्बम का तुल्यकालन",
   "backup_all": "सभी",
   "backup_background_service_backup_failed_message": "संपत्तियों का बैकअप लेने में विफल. पुनः प्रयास किया जा रहा है…",
+  "backup_background_service_complete_notification": "एसेट का बैकअप पूरा हुआ",
   "backup_background_service_connection_failed_message": "सर्वर से कनेक्ट करने में विफल. पुनः प्रयास किया जा रहा है…",
   "backup_background_service_current_upload_notification": "{filename} अपलोड हो रहा है",
   "backup_background_service_default_notification": "नई परिसंपत्तियों की जांच की जा रही है…",
@@ -577,6 +620,7 @@
   "backup_controller_page_turn_on": "अग्रभूमि बैकअप चालू करें",
   "backup_controller_page_uploading_file_info": "फ़ाइल जानकारी अपलोड करना",
   "backup_err_only_album": "एकमात्र एल्बम नहीं हटाया जा सकता",
+  "backup_error_sync_failed": "तुल्यकालन विफल. बैकअप संसाधित नहीं किया जा सकता।",
   "backup_info_card_assets": "संपत्ति",
   "backup_manual_cancelled": "रद्द",
   "backup_manual_in_progress": "अपलोड पहले से ही प्रगति पर है। कुछ देर बाद प्रयास करें",
@@ -638,12 +682,16 @@
   "change_password_description": "यह या तो पहली बार है जब आप सिस्टम में साइन इन कर रहे हैं या आपका पासवर्ड बदलने का अनुरोध किया गया है।",
   "change_password_form_confirm_password": "पासवर्ड की पुष्टि कीजिये",
   "change_password_form_description": "नमस्ते {name},\n\nया तो आप पहली बार सिस्टम में साइन इन कर रहे हैं या फिर आपका पासवर्ड बदलने का अनुरोध किया गया है। कृपया नीचे नया पासवर्ड डालें।",
+  "change_password_form_log_out": "अन्य सभी डिवाइस को लॉग आउट करें",
+  "change_password_form_log_out_description": "अन्य सभी डिवाइस से लॉग आउट करना अनुशंसित है",
   "change_password_form_new_password": "नया पासवर्ड",
   "change_password_form_password_mismatch": "सांकेतिक शब्द मेल नहीं खाते",
   "change_password_form_reenter_new_password": "नया पासवर्ड पुनः दर्ज करें",
   "change_pin_code": "पिन कोड बदलें",
   "change_your_password": "अपना पासवर्ड बदलें",
   "changed_visibility_successfully": "दृश्यता सफलतापूर्वक परिवर्तित",
+  "charging": "चार्जिंग",
+  "charging_requirement_mobile_backup": "परिप्रेक्ष्य बैकअप के लिए डिवाइस का चार्जिंग पे लगे होना आवश्यक है",
   "check_corrupt_asset_backup": "दूषित परिसंपत्ति बैकअप की जाँच करें",
   "check_corrupt_asset_backup_button": "जाँच करें",
   "check_corrupt_asset_backup_description": "यह जाँच केवल वाई-फ़ाई पर ही करें और सभी संपत्तियों का बैकअप लेने के बाद ही करें। इस प्रक्रिया में कुछ मिनट लग सकते हैं।",
@@ -665,7 +713,7 @@
   "client_cert_subtitle": "केवल PKCS12 (.p12, .pfx) फ़ॉर्मैट का समर्थन करता है। प्रमाणपत्र आयात/हटाएँ केवल लॉगिन से पहले उपलब्ध हैं",
   "client_cert_title": "SSL क्लाइंट प्रमाणपत्र",
   "clockwise": "दक्षिणावर्त",
-  "close": "बंद",
+  "close": "बंद करें",
   "collapse": "गिर जाना",
   "collapse_all": "सभी को संकुचित करें",
   "color": "रंग",
@@ -675,8 +723,8 @@
   "comments_and_likes": "टिप्पणियाँ और पसंद",
   "comments_are_disabled": "टिप्पणियाँ अक्षम हैं",
   "common_create_new_album": "नया एल्बम बनाएँ",
-  "completed": "पुरा होना",
-  "confirm": "पुष्टि",
+  "completed": "पूरित",
+  "confirm": "पुष्टि करें",
   "confirm_admin_password": "एडमिन पासवर्ड की पुष्टि करें",
   "confirm_delete_face": "क्या आप वाकई एसेट से {name} चेहरा हटाना चाहते हैं?",
   "confirm_delete_shared_link": "क्या आप वाकई इस साझा लिंक को हटाना चाहते हैं?",
@@ -685,13 +733,13 @@
   "confirm_password": "पासवर्ड की पुष्टि कीजिये",
   "confirm_tag_face": "क्या आप इस चेहरे को {name} के रूप में टैग करना चाहते हैं?",
   "confirm_tag_face_unnamed": "क्या आप इस चेहरे को टैग करना चाहते हैं?",
-  "connected_device": "कनेक्टेड डिवाइस",
+  "connected_device": "योजित यंत्र",
   "connected_to": "से जुड़ा",
   "contain": "समाहित",
   "context": "संदर्भ",
   "continue": "जारी",
   "control_bottom_app_bar_create_new_album": "नया एल्बम बनाएँ",
-  "control_bottom_app_bar_delete_from_immich": "Immich से हटाएं",
+  "control_bottom_app_bar_delete_from_immich": "इम्मिच से हटाएं",
   "control_bottom_app_bar_delete_from_local": "डिवाइस से हटाएं",
   "control_bottom_app_bar_edit_location": "स्थान संपादित करें",
   "control_bottom_app_bar_edit_time": "तारीख और समय संपादित करें",
@@ -713,6 +761,7 @@
   "create": "तैयार करें",
   "create_album": "एल्बम बनाओ",
   "create_album_page_untitled": "शीर्षकहीन",
+  "create_api_key": "ऐ.पी.आई. चाभी बनाएं",
   "create_library": "लाइब्रेरी बनाएं",
   "create_link": "लिंक बनाएं",
   "create_link_to_share": "शेयर करने के लिए लिंक बनाएं",
@@ -729,6 +778,7 @@
   "create_user": "उपयोगकर्ता बनाइये",
   "created": "बनाया",
   "created_at": "बनाया था",
+  "creating_linked_albums": "जुड़े हुए एल्बम बनाए जा रहे हैं..।",
   "crop": "छाँटें",
   "curated_object_page_title": "चीज़ें",
   "current_device": "वर्तमान उपकरण",
@@ -741,6 +791,7 @@
   "daily_title_text_date_year": "ई, एमएमएम दिन, वर्ष",
   "dark": "डार्क",
   "dark_theme": "डार्क थीम टॉगल करें",
+  "date": "दिनांक",
   "date_after": "इसके बाद की तारीख",
   "date_and_time": "तिथि और समय",
   "date_before": "पहले की तारीख",
@@ -748,6 +799,7 @@
   "date_of_birth_saved": "जन्मतिथि सफलतापूर्वक सहेजी गई",
   "date_range": "तिथि सीमा",
   "day": "दिन",
+  "days": "दिन",
   "deduplicate_all": "सभी को डुप्लिकेट करें",
   "deduplication_criteria_1": "छवि का आकार बाइट्स में",
   "deduplication_criteria_2": "EXIF डेटा की संख्या",
@@ -836,6 +888,8 @@
   "edit_date": "संपादन की तारीख",
   "edit_date_and_time": "दिनांक और समय संपादित करें",
   "edit_date_and_time_action_prompt": "{count} तारीख और समय संपादित किए गए",
+  "edit_date_and_time_by_offset": "अंकुर से दिनांक बदलें",
+  "edit_date_and_time_by_offset_interval": "नयी दिनांक सीमा: {from} - {to}",
   "edit_description": "संपादित करें वर्णन",
   "edit_description_prompt": "कृपया एक नया विवरण चुनें:",
   "edit_exclusion_pattern": "बहिष्करण पैटर्न संपादित करें",
@@ -874,7 +928,9 @@
   "error": "गलती",
   "error_change_sort_album": "एल्बम का क्रम बदलने में असफल रहा",
   "error_delete_face": "एसेट से चेहरे को हटाने में त्रुटि हुई",
+  "error_getting_places": "स्थानों को प्राप्त करने में त्रुटि हुई",
   "error_loading_image": "छवि लोड करने में त्रुटि",
+  "error_loading_partners": "जोड़ीदार लोड करने में त्रुटि हुई: {error}",
   "error_saving_image": "त्रुटि: {error}",
   "error_tag_face_bounding_box": "चेहरे को टैग करने में त्रुटि – बाउंडिंग बॉक्स निर्देशांक प्राप्त नहीं कर सके",
   "error_title": "त्रुटि - कुछ गलत हो गया",
@@ -907,6 +963,7 @@
     "failed_to_load_notifications": "सूचनाएँ लोड करने में विफल",
     "failed_to_load_people": "लोगों को लोड करने में विफल",
     "failed_to_remove_product_key": "उत्पाद कुंजी निकालने में विफल",
+    "failed_to_reset_pin_code": "पिन कोड रीसेट करना विफल हुआ",
     "failed_to_stack_assets": "परिसंपत्तियों का ढेर लगाने में विफल",
     "failed_to_unstack_assets": "परिसंपत्तियों का ढेर खोलने में विफल",
     "failed_to_update_notification_status": "सूचना की स्थिति अपडेट करने में विफल",
@@ -915,6 +972,7 @@
     "paths_validation_failed": "{paths, plural, one {# पथ} other {# पथ}} सत्यापन में विफल रहे",
     "profile_picture_transparent_pixels": "प्रोफ़ाइल चित्रों में पारदर्शी पिक्सेल नहीं हो सकते।",
     "quota_higher_than_disk_size": "आपने डिस्क आकार से अधिक कोटा निर्धारित किया है",
+    "something_went_wrong": "कुछ त्रुटि हुई",
     "unable_to_add_album_users": "उपयोगकर्ताओं को एल्बम में डालने में असमर्थ",
     "unable_to_add_assets_to_shared_link": "साझा लिंक में संपत्ति डालने में असमर्थ",
     "unable_to_add_comment": "टिप्पणी डालने में असमर्थ",
@@ -1000,22 +1058,42 @@
   },
   "exif": "एक्सिफ",
   "exif_bottom_sheet_description": "विवरण जोड़ें..।",
+  "exif_bottom_sheet_description_error": "विवरण के आधुनीकरण करने में त्रुटि हुई",
+  "exif_bottom_sheet_details": "विवरण",
+  "exif_bottom_sheet_location": "स्थान",
+  "exif_bottom_sheet_no_description": "कोई विवरण नहीं",
+  "exif_bottom_sheet_people": "लोग",
   "exif_bottom_sheet_person_add_person": "नाम डालें",
   "exit_slideshow": "स्लाइड शो से बाहर निकलें",
   "expand_all": "सभी का विस्तार",
+  "experimental_settings_new_asset_list_subtitle": "कार्य प्रगति पर है",
+  "experimental_settings_new_asset_list_title": "प्रयोगात्मक फोटो ग्रिड सक्षम करें",
+  "experimental_settings_subtitle": "अपने जोखिम पर उपयोग करें!",
+  "experimental_settings_title": "प्रयोगात्मक",
   "expire_after": "एक्सपायर आफ्टर",
   "expired": "खत्म हो चुका",
+  "expires_date": "{date} को समाप्त हो रहा है",
   "explore": "अन्वेषण करना",
+  "explorer": "समन्वेषक",
   "export": "निर्यात",
   "export_as_json": "JSON के रूप में निर्यात करें",
+  "export_database": "डेटाबेस निर्यात करें",
+  "export_database_description": "इस.क्यू.लाइट डेटाबेस निर्यात करें",
   "extension": "विस्तार",
   "external": "बाहरी",
   "external_libraries": "बाहरी पुस्तकालय",
+  "external_network": "बाहरी नेटवर्क",
   "external_network_sheet_info": "When not on the preferred WiFi network, the app will connect to the server through the first of the below URLs it can reach, starting from top to bottom",
   "face_unassigned": "सौंपे नहीं गए",
+  "failed": "विफल हुआ",
+  "failed_to_authenticate": "प्रमाणित करने में विफल",
+  "failed_to_load_assets": "एसेट लोड करने में विफल",
+  "failed_to_load_folder": "फोल्डर लोड करने में विफल",
   "favorite": "पसंदीदा",
+  "favorite_action_prompt": "{count} पसंदीदा संकलन में जोड़े गए",
   "favorite_or_unfavorite_photo": "पसंदीदा या नापसंद फोटो",
   "favorites": "पसंदीदा",
+  "favorites_page_no_favorites": "कोई पसंदीदा एसेट नहीं मिले",
   "feature_photo_updated": "फ़ीचर फ़ोटो अपडेट किया गया",
   "file_name": "फ़ाइल का नाम",
   "file_name_or_extension": "फ़ाइल का नाम या एक्सटेंशन",
diff --git a/i18n/nb_NO.json b/i18n/nb_NO.json
index 281c1c266f..071dd27a16 100644
--- a/i18n/nb_NO.json
+++ b/i18n/nb_NO.json
@@ -1716,6 +1716,7 @@
   "running": "Kjører",
   "save": "Lagre",
   "save_to_gallery": "Lagre til galleriet",
+  "saved": "Lagret",
   "saved_api_key": "Lagret API-nøkkel",
   "saved_profile": "Lagret profil",
   "saved_settings": "Lagret instillinger",
@@ -1732,7 +1733,7 @@
   "search_by_description_example": "Turdag i Sapa",
   "search_by_filename": "Søk etter filnavn og filtype",
   "search_by_filename_example": "f.eks. IMG_1234.JPG eller PNG",
-  "search_by_ocr": "Søk med OCR",
+  "search_by_ocr": "Søk etter tekst i bilde",
   "search_by_ocr_example": "Latte",
   "search_camera_lens_model": "Søk etter objektivmodell...",
   "search_camera_make": "Søk etter kameramerke...",
diff --git a/i18n/pl.json b/i18n/pl.json
index 0302eeafae..8bbefef148 100644
--- a/i18n/pl.json
+++ b/i18n/pl.json
@@ -1716,6 +1716,7 @@
   "running": "W trakcie",
   "save": "Zapisz",
   "save_to_gallery": "Zapisz w galerii",
+  "saved": "Zapisano",
   "saved_api_key": "Zapisany klucz API",
   "saved_profile": "Zapisany profil",
   "saved_settings": "Zapisane ustawienia",
diff --git a/i18n/pt.json b/i18n/pt.json
index e3bbb97965..4e04331ad3 100644
--- a/i18n/pt.json
+++ b/i18n/pt.json
@@ -344,7 +344,7 @@
     "transcoding_hardware_acceleration": "Aceleração de hardware",
     "transcoding_hardware_acceleration_description": "Experimental; transcodificação mais rápida, mas poderá ter qualidade inferior com a mesma taxa de bits",
     "transcoding_hardware_decoding": "Decodificação de hardware",
-    "transcoding_hardware_decoding_setting_description": "Permite a aceleração ponta a ponta em vez de apenas acelerar a codificação. Pode não funcionar em todos os formatos de arquivo.",
+    "transcoding_hardware_decoding_setting_description": "Permite a aceleração ponta a ponta em vez de apenas acelerar a codificação. Pode não funcionar em todos os videos.",
     "transcoding_max_b_frames": "Máximo de quadros B",
     "transcoding_max_b_frames_description": "Valores mais altos melhoram a eficiência da compressão, mas tornam a codificação mais lenta. Pode não ser compatível com aceleração de hardware em dispositivos mais antigos. 0 desativa os quadros B, enquanto -1 define esse valor automaticamente.",
     "transcoding_max_bitrate": "Taxa de bits máxima",
@@ -455,7 +455,7 @@
   "album_viewer_appbar_delete_confirm": "Tem certeza que deseja excluir este álbum da sua conta?",
   "album_viewer_appbar_share_err_delete": "Ocorreu um erro ao eliminar álbum",
   "album_viewer_appbar_share_err_leave": "Ocorreu um erro ao sair do álbum",
-  "album_viewer_appbar_share_err_remove": "Houveram problemas ao remover arquivos do álbum",
+  "album_viewer_appbar_share_err_remove": "Ocorreu um erro ao remover ficheiros do álbum",
   "album_viewer_appbar_share_err_title": "Ocorreu um erro ao alterar o título do álbum",
   "album_viewer_appbar_share_leave": "Deixar álbum",
   "album_viewer_appbar_share_to": "Compartilhar com",
@@ -494,7 +494,7 @@
   "archive": "Arquivo",
   "archive_action_prompt": "{count} adicionados ao Arquivo",
   "archive_or_unarchive_photo": "Arquivar ou desarquivar foto",
-  "archive_page_no_archived_assets": "Nenhum arquivo encontrado",
+  "archive_page_no_archived_assets": "Nenhum ficheiro arquivado encontrado",
   "archive_page_title": "Arquivo ({count})",
   "archive_size": "Tamanho do arquivo",
   "archive_size_description": "Configure o tamanho do arquivo para transferências (em GiB)",
@@ -502,8 +502,8 @@
   "archived_count": "{count, plural, one {#Arquivado # item} other {Arquivados # itens}}",
   "are_these_the_same_person": "Estas pessoas são a mesma pessoa?",
   "are_you_sure_to_do_this": "Tem a certeza de que quer fazer isto?",
-  "asset_action_delete_err_read_only": "Não é possível excluir arquivo só leitura, ignorando",
-  "asset_action_share_err_offline": "Não foi possível obter os arquivos offline, ignorando",
+  "asset_action_delete_err_read_only": "Não é possível eliminar ficheiro só de leitura, a ignorar",
+  "asset_action_share_err_offline": "Não foi possível obter os ficheiros offline, a ignorar",
   "asset_added_to_album": "Adicionado ao álbum",
   "asset_adding_to_album": "A adicionar ao álbum…",
   "asset_description_updated": "A descrição do ficheiro foi atualizada",
@@ -513,14 +513,14 @@
   "asset_list_group_by_sub_title": "Agrupar por",
   "asset_list_layout_settings_dynamic_layout_title": "Layout dinâmico",
   "asset_list_layout_settings_group_automatically": "Automático",
-  "asset_list_layout_settings_group_by": "Agrupar arquivos por",
+  "asset_list_layout_settings_group_by": "Agrupar ficheiros por",
   "asset_list_layout_settings_group_by_month_day": "Mês + dia",
   "asset_list_layout_sub_title": "Disposição",
   "asset_list_settings_subtitle": "Configurações de disposição da grade de fotos",
   "asset_list_settings_title": "Grade de fotos",
   "asset_offline": "Ficheiro Indisponível",
   "asset_offline_description": "Este ficheiro externo deixou de estar disponível no disco. Contacte o seu administrador do Immich para obter ajuda.",
-  "asset_restored_successfully": "Arquivo restaurado com sucesso",
+  "asset_restored_successfully": "FIcheiro restaurado com sucesso",
   "asset_skipped": "Ignorado",
   "asset_skipped_in_trash": "Na reciclagem",
   "asset_trashed": "Ficheiro apagado",
@@ -565,19 +565,19 @@
   "backup": "Cópia de segurança",
   "backup_album_selection_page_albums_device": "Álbuns no dispositivo ({count})",
   "backup_album_selection_page_albums_tap": "Toque para incluir, duplo toque para excluir",
-  "backup_album_selection_page_assets_scatter": "Os arquivos podem estar espalhados em vários álbuns. Assim, os álbuns podem ser incluídos ou excluídos durante o processo de backup.",
+  "backup_album_selection_page_assets_scatter": "Os ficheros podem estar espalhados por vários álbuns. Desta forma, os álbuns podem ser incluídos ou excluídos durante o processo de cópia de segurança.",
   "backup_album_selection_page_select_albums": "Selecione Álbuns",
   "backup_album_selection_page_selection_info": "Informações da Seleção",
-  "backup_album_selection_page_total_assets": "Total de arquivos únicos",
+  "backup_album_selection_page_total_assets": "Total de ficheiros únicos",
   "backup_albums_sync": "Cópia de segurança de sincronização de álbuns",
   "backup_all": "Tudo",
   "backup_background_service_backup_failed_message": "Ocorreu um erro ao efetuar cópia de segurança dos ficheiros. A tentar de novo…",
   "backup_background_service_complete_notification": "Cópia de conteúdos concluída",
   "backup_background_service_connection_failed_message": "Ocorreu um erro na ligação ao servidor. A tentar de novo…",
   "backup_background_service_current_upload_notification": "A enviar {filename}",
-  "backup_background_service_default_notification": "Verificando novos arquivos…",
+  "backup_background_service_default_notification": "A verificar se há novos ficheiros…",
   "backup_background_service_error_title": "Erro de backup",
-  "backup_background_service_in_progress_notification": "Fazendo backup dos arquivos…",
+  "backup_background_service_in_progress_notification": "A fazer cópia de segurança dos seus ficheiros…",
   "backup_background_service_upload_failure_notification": "Ocorreu um erro ao enviar {filename}",
   "backup_controller_page_albums": "Backup Álbuns",
   "backup_controller_page_background_app_refresh_disabled_content": "Para utilizar a cópia de segurança em segundo plano, ative a atualização da aplicação em segundo plano em Definições > Geral > Atualização da aplicação em segundo plano.",
@@ -600,7 +600,7 @@
   "backup_controller_page_backup_selected": "Selecionado: ",
   "backup_controller_page_backup_sub": "Fotos e vídeos salvos em backup",
   "backup_controller_page_created": "Criado em: {date}",
-  "backup_controller_page_desc_backup": "Ative o backup para enviar automáticamente novos arquivos para o servidor.",
+  "backup_controller_page_desc_backup": "Ative a cópia de segurança em primeiro plano para enviar novos ficheiros automaticamente ao abrir a aplicação.",
   "backup_controller_page_excluded": "Eliminado: ",
   "backup_controller_page_failed": "Falhou ({count})",
   "backup_controller_page_filename": "Nome do ficheiro: {filename} [{size}]",
@@ -618,10 +618,10 @@
   "backup_controller_page_total_sub": "Todas as fotos e vídeos dos álbuns selecionados",
   "backup_controller_page_turn_off": "Desativar backup",
   "backup_controller_page_turn_on": "Ativar backup",
-  "backup_controller_page_uploading_file_info": "Enviando arquivo",
+  "backup_controller_page_uploading_file_info": "A enviar informações do ficheiro",
   "backup_err_only_album": "Não é possível remover apenas o álbum",
   "backup_error_sync_failed": "A sincronização falhou. Não é possível fazer a cópia de segurança.",
-  "backup_info_card_assets": "arquivos",
+  "backup_info_card_assets": "ficheiros",
   "backup_manual_cancelled": "Cancelado",
   "backup_manual_in_progress": "Envio já está em progresso. Tente novamente mais tarde",
   "backup_manual_success": "Sucesso",
@@ -694,7 +694,7 @@
   "charging_requirement_mobile_backup": "Cópia de segurança de fundo necessita que o dispositivo esteja a carregar",
   "check_corrupt_asset_backup": "Verificar por backups corrompidos",
   "check_corrupt_asset_backup_button": "Verificar",
-  "check_corrupt_asset_backup_description": "Execute esta verificação somente em uma rede Wi-Fi e quando o backup de todos os arquivos já estiver concluído. O processo demora alguns minutos.",
+  "check_corrupt_asset_backup_description": "Execute esta verificação apenas numa rede Wi-Fi e quando a cópia de segurança de todos os ficheiros já estiver concluída. O processo pode demorar alguns minutos.",
   "check_logs": "Verificar registos",
   "choose_matching_people_to_merge": "Escolha pessoas correspondentes para unir",
   "city": "Cidade/Localidade",
@@ -770,7 +770,7 @@
   "create_new_person": "Criar nova pessoa",
   "create_new_person_hint": "Associe os ficheiros a uma nova pessoa",
   "create_new_user": "Criar novo utilizador",
-  "create_shared_album_page_share_add_assets": "ADICIONAR ARQUIVOS",
+  "create_shared_album_page_share_add_assets": "ADICIONAR FICHEIROS",
   "create_shared_album_page_share_select_photos": "Selecionar Fotos",
   "create_shared_link": "Criar link partilhado",
   "create_tag": "Criar etiqueta",
@@ -812,10 +812,10 @@
   "delete_action_prompt": "{count} eliminados",
   "delete_album": "Apagar álbum",
   "delete_api_key_prompt": "Tem a certeza de que deseja remover esta chave de API?",
-  "delete_dialog_alert": "Esses arquivos serão permanentemente apagados do Immich e de seu dispositivo",
-  "delete_dialog_alert_local": "Estes arquivos serão permanentemente excluídos do seu dispositivo, mas continuarão disponíveis no servidor Immich",
-  "delete_dialog_alert_local_non_backed_up": "Não há backup de alguns dos arquivos no servidor e eles serão excluídos permanentemente do seu dispositivo",
-  "delete_dialog_alert_remote": "Estes arquivos serão permanentemente excluídos do servidor Immich",
+  "delete_dialog_alert": "Estes ficheiros serão eliminados permanentemente do Immich e do seu dispositivo",
+  "delete_dialog_alert_local": "Estes ficheiros serão eliminados permanentemente do seu dispositivo, mas continuarão disponíveis no servidor Immich",
+  "delete_dialog_alert_local_non_backed_up": "Alguns dos ficheiros não têm cópia de segurança no Immich e serão eliminados permanentemente do seu dispositivo",
+  "delete_dialog_alert_remote": "Estes ficheiros serão eliminados permanentemente do servidor Immich",
   "delete_dialog_ok_force": "Confirmo que quero excluir",
   "delete_dialog_title": "Excluir Permanentemente",
   "delete_duplicates_confirmation": "Tem a certeza de que deseja eliminar permanentemente estes itens duplicados?",
@@ -824,7 +824,7 @@
   "delete_library": "Eliminar Biblioteca",
   "delete_link": "Eliminar link",
   "delete_local_action_prompt": "{count} eliminados localmente",
-  "delete_local_dialog_ok_backed_up_only": "Excluir apenas arquivos com backup",
+  "delete_local_dialog_ok_backed_up_only": "Eliminar apenas ficheiros com cópia de segurança",
   "delete_local_dialog_ok_force": "Excluir mesmo assim",
   "delete_others": "Excluir outros",
   "delete_permanently": "Eliminar permanentemente",
@@ -872,7 +872,7 @@
   "download_settings_description": "Gerir definições relacionadas com a transferência de ficheiros",
   "download_started": "Iniciando",
   "download_sucess": "Baixado com sucesso",
-  "download_sucess_android": "O arquivo foi baixado na pasta DCIM/Immich",
+  "download_sucess_android": "O ficheiro foi descarregado para a pasta DCIM/Immich",
   "download_waiting_to_retry": "Tentando novamente",
   "downloading": "A transferir",
   "downloading_asset_filename": "A transferir o ficheiro {filename}",
@@ -1134,7 +1134,7 @@
   "group_owner": "Agrupar por dono",
   "group_places_by": "Agrupar lugares por...",
   "group_year": "Agrupar por ano",
-  "haptic_feedback_switch": "Habilitar vibração",
+  "haptic_feedback_switch": "Ativar vibração",
   "haptic_feedback_title": "Vibração",
   "has_quota": "Tem quota",
   "hash_asset": "Criptografar ficheiro",
@@ -1154,20 +1154,20 @@
   "hide_unnamed_people": "Ocultar pessoas sem nome",
   "home_page_add_to_album_conflicts": "Foram adicionados {added} ficheiros ao álbum {album}. {failed} ficheiros já estão no álbum.",
   "home_page_add_to_album_err_local": "Ainda não é possível adicionar recursos locais aos álbuns, ignorando",
-  "home_page_add_to_album_success": "Adicionado {added} arquivos ao álbum {album}.",
-  "home_page_album_err_partner": "Ainda não é possível adicionar arquivos do parceiro a um álbum, ignorando",
+  "home_page_add_to_album_success": "{added} ficheiros foram adicionados ao álbum {album}.",
+  "home_page_album_err_partner": "Ainda não é possível adicionar ficheiros do parceiro a um álbum, a ignorar",
   "home_page_archive_err_local": "Ainda não é possível arquivar recursos locais, ignorando",
   "home_page_archive_err_partner": "Não é possível arquivar Fotos e Videos do parceiro, ignorando",
   "home_page_building_timeline": "Construindo a linha do tempo",
-  "home_page_delete_err_partner": "Não é possível excluir arquivos do parceiro, ignorando",
-  "home_page_delete_remote_err_local": "Foram selecionados arquivos locais para excluir remotamente, ignorando",
+  "home_page_delete_err_partner": "Não é possível eliminar ficheiros do parceiro, a ignorar",
+  "home_page_delete_remote_err_local": "Foram selecionados ficheiros locais para excluir remotamente, a ignorar",
   "home_page_favorite_err_local": "Ainda não é possível adicionar recursos locais favoritos, ignorando",
-  "home_page_favorite_err_partner": "Ainda não é possível marcar arquivos do parceiro como favoritos, ignorando",
+  "home_page_favorite_err_partner": "Ainda não é possível marcar ficheiros do parceiro como favoritos, a ignorar",
   "home_page_first_time_notice": "Se é a primeira vez que utiliza a aplicação, certifique-se de que marca pelo menos um álbum do dispositivo para cópia de segurança, para a linha do tempo poder ser preenchida com fotos e vídeos",
   "home_page_locked_error_local": "Não foi possível mover ficheiros locais para a pasta trancada, a continuar",
   "home_page_locked_error_partner": "Não foi possível mover ficheiros do parceiro para a pasta trancada, a continuar",
-  "home_page_share_err_local": "Não é possível compartilhar arquivos locais com um link, ignorando",
-  "home_page_upload_err_limit": "Só é possível enviar 30 arquivos por vez, ignorando",
+  "home_page_share_err_local": "Não é possível partilhar ficheiros locais com um link, a ignorar",
+  "home_page_upload_err_limit": "Só é possível enviar um máximo de 30 ficheiros de cada vez, a ignorar",
   "host": "Servidor",
   "hour": "Hora",
   "hours": "Horas",
@@ -1187,7 +1187,7 @@
   "image_alt_text_date_place_3_people": "{isVideo, select, true {Vídeo gravado} other {Foto tirada}} em {city}, {country} com {person1}, {person2}, e {person3} em {date}",
   "image_alt_text_date_place_4_or_more_people": "{isVideo, select, true {Vídeo gravado} other {Foto tirada}} em {city}, {country} com {person1}, {person2}, e outras {additionalCount, number} pessoas em {date}",
   "image_saved_successfully": "Imagem salva",
-  "image_viewer_page_state_provider_download_started": "Baixando arquivo",
+  "image_viewer_page_state_provider_download_started": "A descarregar ficheiro",
   "image_viewer_page_state_provider_download_success": "Baixado com sucesso",
   "image_viewer_page_state_provider_share_error": "Erro ao compartilhar",
   "immich_logo": "Logotipo do Immich",
@@ -1244,7 +1244,7 @@
   "library_options": "Opções da biblioteca",
   "library_page_device_albums": "Álbuns no dispositivo",
   "library_page_new_album": "Novo álbum",
-  "library_page_sort_asset_count": "Quantidade de arquivos",
+  "library_page_sort_asset_count": "Quantidade de ficheiros",
   "library_page_sort_created": "Data de criação",
   "library_page_sort_last_modified": "Última modificação",
   "library_page_sort_title": "Título do álbum",
@@ -1383,8 +1383,8 @@
   "moved_to_archive": "{count, plural, one {Foi movido # ficheiro} other {Foram movidos # ficheiros}} para o arquivo",
   "moved_to_library": "{count, plural, one {Foi movido # ficheiro} other {Foram movidos # ficheiros}} para a biblioteca",
   "moved_to_trash": "Enviado para a reciclagem",
-  "multiselect_grid_edit_date_time_err_read_only": "Não é possível editar a data de arquivo só leitura, ignorando",
-  "multiselect_grid_edit_gps_err_read_only": "Não é possível editar a localização de arquivo só leitura, ignorando",
+  "multiselect_grid_edit_date_time_err_read_only": "Não é possível editar a data de um ficheiro só de leitura, a ignorar",
+  "multiselect_grid_edit_gps_err_read_only": "Não é possível editar a localização de um ficheiro só de leitura, a ignorar",
   "mute_memories": "Silenciar Memórias",
   "my_albums": "Os meus álbuns",
   "name": "Nome",
@@ -1417,7 +1417,7 @@
   "no_albums_yet": "Parece que ainda não tem nenhum álbum.",
   "no_archived_assets_message": "Arquive fotos e vídeos para os ocultar da sua visualização de fotos",
   "no_assets_message": "FAÇA CLIQUE PARA CARREGAR A SUA PRIMEIRA FOTO",
-  "no_assets_to_show": "Não há arquivos para exibir",
+  "no_assets_to_show": "Não há ficheiros para exibir",
   "no_cast_devices_found": "Nenhum dispositivo de transmissão encontrado",
   "no_checksum_local": "Sem cálculo de verificação disponível - não pode capturar conteúdos locais",
   "no_checksum_remote": "Soma de verificação (checksum) não disponível - não é possível obter o recurso remoto",
@@ -1586,7 +1586,7 @@
   "public_album": "Álbum público",
   "public_share": "Partilhar Publicamente",
   "purchase_account_info": "Apoiante",
-  "purchase_activated_subtitle": "Agradecemos por apoiar o Immich e software de código aberto",
+  "purchase_activated_subtitle": "Agradecemos o seu apoio ao Immich e ao software de código aberto",
   "purchase_activated_time": "Ativado em {date}",
   "purchase_activated_title": "A sua chave foi ativada com sucesso",
   "purchase_button_activate": "Ativar",
@@ -1747,7 +1747,7 @@
   "search_filter_date_title": "Selecione a data",
   "search_filter_display_option_not_in_album": "Fora de álbum",
   "search_filter_display_options": "Opções de exibição",
-  "search_filter_filename": "Pesquisar por nome do arquivo",
+  "search_filter_filename": "Pesquisar por nome do ficheiro",
   "search_filter_location": "Localização",
   "search_filter_location_title": "Selecione a localização",
   "search_filter_media_type": "Tipo da mídia",
@@ -1839,15 +1839,15 @@
   "setting_notifications_notify_minutes": "{count} minutos",
   "setting_notifications_notify_never": "Nunca",
   "setting_notifications_notify_seconds": "{count} segundos",
-  "setting_notifications_single_progress_subtitle": "Informações detalhadas sobre o progresso do envio por arquivo",
+  "setting_notifications_single_progress_subtitle": "Informações detalhadas sobre o progresso do envio por ficheiro",
   "setting_notifications_single_progress_title": "Mostrar progresso detalhado do backup em segundo plano",
   "setting_notifications_subtitle": "Ajuste as preferências de notificação",
-  "setting_notifications_total_progress_subtitle": "Progresso do envio de arquivos (concluídos/total)",
+  "setting_notifications_total_progress_subtitle": "Progresso do envio de ficheiro (concluídos/total)",
   "setting_notifications_total_progress_title": "Mostrar progresso total do backup em segundo plano",
   "setting_video_viewer_auto_play_subtitle": "Reproduzir os vídeos automaticamente quando abertos",
   "setting_video_viewer_auto_play_title": "Reproduzir vídeos automaticamente",
   "setting_video_viewer_looping_title": "Repetir",
-  "setting_video_viewer_original_video_subtitle": "Ao transmitir um vídeo do servidor, usar o arquivo original, mesmo quando uma versão transcodificada esteja disponível. Pode fazer com que o vídeo demore para carregar. Vídeos disponíveis localmente são exibidos na qualidade original independente desta configuração.",
+  "setting_video_viewer_original_video_subtitle": "Ao transmitir um vídeo do servidor, usar o ficheiro original, mesmo se uma versão transcodificada estiver disponível. Pode causar interrupções. Vídeos disponíveis localmente são exibidos na qualidade original independentemente desta definição.",
   "setting_video_viewer_original_video_title": "Forçar vídeo original",
   "settings": "Definições",
   "settings_require_restart": "Reinicie o Immich para aplicar essa configuração",
@@ -2019,7 +2019,7 @@
   "theme_setting_primary_color_subtitle": "Selecione a cor primária, utilizada nas ações principais e nos realces.",
   "theme_setting_primary_color_title": "Cor primária",
   "theme_setting_system_primary_color_title": "Use a cor do sistema",
-  "theme_setting_system_theme_switch": "Automático (Siga a configuração do sistema)",
+  "theme_setting_system_theme_switch": "Automático (Seguir a configuração do sistema)",
   "theme_setting_theme_subtitle": "Escolha a configuração do tema da aplicação",
   "theme_setting_three_stage_loading_subtitle": "O carregamento em três estágios pode aumentar o desempenho do carregamento, mas causa uma carga de rede significativamente maior",
   "theme_setting_three_stage_loading_title": "Habilitar carregamento em três estágios",
@@ -2048,11 +2048,11 @@
   "trash_emptied": "Lixeira esvaziada",
   "trash_no_results_message": "Fotos e vídeos enviados para a reciclagem aparecem aqui.",
   "trash_page_delete_all": "Excluir tudo",
-  "trash_page_empty_trash_dialog_content": "Deseja esvaziar a lixera? Estes arquivos serão apagados de forma permanente do Immich",
+  "trash_page_empty_trash_dialog_content": "Deseja esvaziar a reciclagem? Estes ficheiros serão apagados permanentemente do Immich",
   "trash_page_info": "Ficheiros na reciclagem irão ser eliminados permanentemente após {days} dias",
   "trash_page_no_assets": "Lixeira vazia",
   "trash_page_restore_all": "Restaurar tudo",
-  "trash_page_select_assets_btn": "Selecionar arquivos",
+  "trash_page_select_assets_btn": "Selecionar ficheiros",
   "trash_page_title": "Reciclagem ({count})",
   "trashed_items_will_be_permanently_deleted_after": "Os itens da reciclagem são eliminados permanentemente após {days, plural, one {# dia} other {# dias}}.",
   "troubleshoot": "Diagnosticar problemas",
@@ -2094,8 +2094,8 @@
   "upload_action_prompt": "{count} à espera de carregar",
   "upload_concurrency": "Carregamentos em simultâneo",
   "upload_details": "Detalhes do Carregamento",
-  "upload_dialog_info": "Deseja fazer o backup dos arquivos selecionados no servidor?",
-  "upload_dialog_title": "Enviar arquivo",
+  "upload_dialog_info": "Deseja realizar uma cópia de segurança dos ficheiros selecionados para o servidor?",
+  "upload_dialog_title": "Enviar ficheiro",
   "upload_errors": "Envio completo com {count, plural, one {# erro} other {# erros}}, atualize a página para ver os novos ficheiros enviados.",
   "upload_finished": "Carregamento acabado",
   "upload_progress": "Restante(s) {remaining, number} - Processado(s) {processed, number}/{total, number}",
diff --git a/i18n/ru.json b/i18n/ru.json
index d7c50be699..52cd3adbc3 100644
--- a/i18n/ru.json
+++ b/i18n/ru.json
@@ -485,7 +485,7 @@
   "app_bar_signout_dialog_content": "Вы уверены, что хотите выйти?",
   "app_bar_signout_dialog_ok": "Да",
   "app_bar_signout_dialog_title": "Выйти",
-  "app_download_links": "Загрузка приложения",
+  "app_download_links": "Ссылки на загрузку мобильного приложения",
   "app_settings": "Параметры приложения",
   "app_stores": "Магазины приложений",
   "app_update_available": "Доступна новая версия приложения",
@@ -1346,7 +1346,7 @@
   "map_zoom_to_see_photos": "Уменьшение масштаба для просмотра фотографий",
   "mark_all_as_read": "Прочитано",
   "mark_as_read": "Отметить как прочитанное",
-  "marked_all_as_read": "Отмечены как прочитанные",
+  "marked_all_as_read": "Все уведомления отмечены как прочитанные",
   "matches": "Совпадения",
   "matching_assets": "Соответствующие объекты",
   "media_type": "Тип медиа",
@@ -1453,7 +1453,7 @@
   "oauth": "OAuth",
   "obtainium_configurator": "Настройка Obtainium",
   "obtainium_configurator_instructions": "Для установки и обновления Android приложения Immich напрямую из источников на GitHub (минуя магазины приложений) можно использовать Obtainium. Создайте новый API ключ и укажите архитектуру приложения для формирования ссылки для Obtainium.",
-  "ocr": "Распознавание текста",
+  "ocr": "OCR",
   "official_immich_resources": "Официальные ресурсы Immich",
   "offline": "Недоступен",
   "offset": "Смещение",
@@ -1858,7 +1858,7 @@
   "share_add_photos": "Добавить фото",
   "share_assets_selected": "{count} выбрано",
   "share_dialog_preparing": "Подготовка...",
-  "share_link": "Поделиться ссылкой",
+  "share_link": "Создать ссылку",
   "shared": "Общиe",
   "shared_album_activities_input_disable": "Комментарии отключены",
   "shared_album_activity_remove_content": "Удалить сообщение?",
diff --git a/i18n/sv.json b/i18n/sv.json
index db7854a38a..d8f45465af 100644
--- a/i18n/sv.json
+++ b/i18n/sv.json
@@ -418,7 +418,7 @@
   "advanced_settings_prefer_remote_title": "Föredra bilder från servern",
   "advanced_settings_proxy_headers_subtitle": "Definiera proxy-headers som Immich ska skicka med i varje närverksanrop",
   "advanced_settings_proxy_headers_title": "Anpassade proxyheaders [EXPERIMENTELLT]",
-  "advanced_settings_readonly_mode_subtitle": "Aktiverar skrivskyddat läge där foton endast kan visas. Följande funktioner inaktiveras: välj flera bilder, dela, casta, ta bort bilder. Aktivera/inaktivera skrivskyddat läge via profilbilden på appens hemskärm",
+  "advanced_settings_readonly_mode_subtitle": "Aktiverar skrivskyddat-läge där foton endast kan visas. Följande funktioner inaktiveras: välj flera bilder, dela, casta, ta bort bilder. Aktivera/inaktivera skrivskyddat läge via profilbilden på appens hemskärm",
   "advanced_settings_readonly_mode_title": "Skrivskyddat läge",
   "advanced_settings_self_signed_ssl_subtitle": "Hoppar över verifiering av serverns SSL-certifikat. Krävs för självsignerade certifikat.",
   "advanced_settings_self_signed_ssl_title": "Tillåt självsignerade SSL-certifikat [EXPERIMENTELLT]",
@@ -791,6 +791,7 @@
   "daily_title_text_date_year": "E, dd MMM, yyyy",
   "dark": "Mörk",
   "dark_theme": "Växla mörkt tema",
+  "date": "Datum",
   "date_after": "Datum efter",
   "date_and_time": "Datum och Tid",
   "date_before": "Datum före",
@@ -1099,6 +1100,7 @@
   "features_setting_description": "Hantera appens funktioner",
   "file_name": "Filnamn",
   "file_name_or_extension": "Filnamn eller -tillägg",
+  "file_size": "Filstorlek",
   "filename": "Filnamn",
   "filetype": "Filtyp",
   "filter": "Filter",
@@ -1262,6 +1264,7 @@
   "local_media_summary": "Sammanfattning av lokala medier",
   "local_network": "Lokalt nätverk",
   "local_network_sheet_info": "Appen kommer ansluta till servern via denna URL när det specificerade WiFi-nätverket används",
+  "location": "Position",
   "location_permission": "Plats-rättighet",
   "location_permission_content": "För att använda funktionen för automatisk växling behöver Immich behörighet till exakt plats så att appen kan läsa av det aktuella Wi-Fi-nätverkets namn",
   "location_picker_choose_on_map": "Välj på karta",
@@ -1694,6 +1697,7 @@
   "reset_sqlite_confirmation": "Är du säker på att du vill återställa SQLite-databasen? Du måste logga ut och logga in igen för att synkronisera om data",
   "reset_sqlite_success": "Återställde SQLite-databasen",
   "reset_to_default": "Återställ till standard",
+  "resolution": "Upplösning",
   "resolve_duplicates": "Lös dubletter",
   "resolved_all_duplicates": "Lös alla dubletter",
   "restore": "Återställ",
@@ -1712,6 +1716,7 @@
   "running": "Igångsatt",
   "save": "Spara",
   "save_to_gallery": "Spara i galleri",
+  "saved": "Sparad",
   "saved_api_key": "Sparad API-nyckel",
   "saved_profile": "Sparade profil",
   "saved_settings": "Sparade inställningar",
@@ -2020,6 +2025,7 @@
   "theme_setting_three_stage_loading_title": "Aktivera trestegsladdning",
   "they_will_be_merged_together": "De kommer att slås samman",
   "third_party_resources": "Tredjepartsresurser",
+  "time": "Tid",
   "time_based_memories": "Tidsbaserade minnen",
   "timeline": "Tidslinje",
   "timezone": "Tidszon",
diff --git a/i18n/ta.json b/i18n/ta.json
index cca12c4d76..90a7f8e214 100644
--- a/i18n/ta.json
+++ b/i18n/ta.json
@@ -154,6 +154,18 @@
     "machine_learning_min_detection_score_description": "ஒரு முகம் 0-1 முதல் கண்டறியப்படுவதற்கு குறைந்தபட்ச நம்பிக்கை மதிப்பெண். குறைந்த மதிப்புகள் அதிக முகங்களைக் கண்டறியும், ஆனால் தவறான நேர்மறைகளை ஏற்படுத்தக்கூடும்.",
     "machine_learning_min_recognized_faces": "குறைந்தபட்ச அங்கீகரிக்கப்பட்ட முகங்கள்",
     "machine_learning_min_recognized_faces_description": "ஒரு நபருக்கு உருவாக்கப்பட வேண்டிய அங்கீகரிக்கப்பட்ட முகங்களின் குறைந்தபட்ச எண்ணிக்கை. இதை அதிகரிப்பது, ஒரு நபருக்கு முகம் ஒதுக்கப்படாமல் போகும் வாய்ப்பை அதிகரிக்கும் செலவில், முக அங்கீகாரத்தை மிகவும் துல்லியமாக்குகிறது.",
+    "machine_learning_ocr": "ஓசிஆர்",
+    "machine_learning_ocr_description": "படங்களில் உள்ள உரையை அடையாளம் காண இயந்திர கற்றலைப் பயன்படுத்தவும்",
+    "machine_learning_ocr_enabled": "ஓசிஆர் ஐ இயலச்செய்",
+    "machine_learning_ocr_enabled_description": "முடக்கப்பட்டால், படங்கள் உரை அடையாளம் காணப்படாது.",
+    "machine_learning_ocr_max_resolution": "அதிகபட்ச தெளிவுத்திறன்",
+    "machine_learning_ocr_max_resolution_description": "இந்தத் தெளிவுத்திறனுக்கு மேலே உள்ள மாதிரிக்காட்சிகள், தோற்ற விகிதத்தைப் பாதுகாக்கும் அதே வேளையில், அளவு மாற்றப்படும். அதிக மதிப்புகள் மிகவும் துல்லியமானவை, ஆனால் செயலாக்கவும் அதிக நினைவகத்தைப் பயன்படுத்தவும் அதிக நேரம் எடுக்கும்.",
+    "machine_learning_ocr_min_detection_score": "குறைந்தபட்ச கண்டறிதல் மதிப்பெண்",
+    "machine_learning_ocr_min_detection_score_description": "உரையைக் கண்டறிய குறைந்தபட்ச நம்பிக்கை மதிப்பெண் 0-1. குறைந்த மதிப்பெண் அதிக உரையைக் கண்டறியும், ஆனால் தவறான தகவல்க்கு வழிவகுக்கும்.",
+    "machine_learning_ocr_min_recognition_score": "குறைந்தபட்ச அங்கீகார மதிப்பெண்",
+    "machine_learning_ocr_min_score_recognition_description": "கண்டறியப்பட்ட உரையை அங்கீகரிக்க குறைந்தபட்ச நம்பிக்கை மதிப்பெண் 0-1 ஆகும். குறைந்த மதிப்பெண் அதிக உரையை அங்கீகரிக்கும், ஆனால் தவறான நேர்மறைகளுக்கு வழிவகுக்கும்.",
+    "machine_learning_ocr_model": "ஓசிஆர் மாதிரி",
+    "machine_learning_ocr_model_description": "மொபைல் மாடல்களை விட சர்வர் மாடல்கள் மிகவும் துல்லியமானவை, ஆனால் அதிக நினைவகத்தை செயலாக்கி பயன்படுத்த அதிக நேரம் எடுக்கும்.",
     "machine_learning_settings": "இயந்திர கற்றல் அமைப்புகள்",
     "machine_learning_settings_description": "இயந்திர கற்றல் அம்சங்கள் மற்றும் அமைப்புகளை நிர்வகிக்கவும்",
     "machine_learning_smart_search": "ஸ்மார்ட் தேடல்",
@@ -245,6 +257,7 @@
     "oauth_storage_quota_default_description": "GiB இல் உள்ள ஒதுக்கீடு எந்த உரிமைகோரலும் வழங்கப்படாதபோது பயன்படுத்தப்படும் .",
     "oauth_timeout": "கோரிக்கை நேரம் முடிந்தது",
     "oauth_timeout_description": "கோரிக்கைகளுக்கான காலக்கெடு மில்லி வினாடிகளில்",
+    "ocr_job_description": "படங்களில் உள்ள உரையை அடையாளம் காண இயந்திர கற்றலைப் பயன்படுத்தவும்",
     "password_enable_description": "மின்னஞ்சல் மற்றும் கடவுச்சொல் மூலம் உள்நுழையவும்",
     "password_settings": "கடவுச்சொல் உள்நுழைவு",
     "password_settings_description": "கடவுச்சொல் உள்நுழைவு அமைப்புகளை நிர்வகிக்கவும்",
@@ -669,6 +682,8 @@
   "change_password_description": "நீங்கள் கணினியில் கையொப்பமிடுவது இதுவே முதல் முறை அல்லது உங்கள் கடவுச்சொல்லை மாற்றுவதற்கான கோரிக்கை செய்யப்பட்டுள்ளது. கீழே புதிய கடவுச்சொல்லை உள்ளிடவும்.",
   "change_password_form_confirm_password": "கடவுச்சொல்லை உறுதிப்படுத்தவும்",
   "change_password_form_description": "ஆய் {name}, \n\nநீங்கள் கணினியில் கையொப்பமிடுவது இதுவே முதல் முறை அல்லது உங்கள் கடவுச்சொல்லை மாற்றுவதற்கான கோரிக்கை செய்யப்பட்டுள்ளது. கீழே புதிய கடவுச்சொல்லை உள்ளிடவும்.",
+  "change_password_form_log_out": "மற்ற எல்லா சாதனங்களிலிருந்தும் வெளியேறு",
+  "change_password_form_log_out_description": "மற்ற எல்லா சாதனங்களிலிருந்தும் வெளியேற பரிந்துரைக்கப்படுகிறது",
   "change_password_form_new_password": "புதிய கடவுச்சொல்",
   "change_password_form_password_mismatch": "கடவுச்சொற்கள் பொருந்தவில்லை",
   "change_password_form_reenter_new_password": "புதிய கடவுச்சொல்லை மீண்டும் உள்ளிடவும்",
@@ -776,6 +791,7 @@
   "daily_title_text_date_year": "E, mmm dd, yyyy",
   "dark": "இருண்ட",
   "dark_theme": "இருண்ட கருப்பொருளை மாற்றவும்",
+  "date": "தேதி",
   "date_after": "தேதி",
   "date_and_time": "தேதி மற்றும் நேரம்",
   "date_before": "முன் தேதி",
@@ -1084,6 +1100,7 @@
   "features_setting_description": "பயன்பாட்டு அம்சங்களை நிர்வகிக்கவும்",
   "file_name": "கோப்பு பெயர்",
   "file_name_or_extension": "கோப்பு பெயர் அல்லது நீட்டிப்பு",
+  "file_size": "கோப்பு அளவு",
   "filename": "கோப்புப்பெயர்",
   "filetype": "பைல்டைப்",
   "filter": "வடிப்பி",
@@ -1247,6 +1264,7 @@
   "local_media_summary": "உள்ளக ஊடக சுருக்கம்",
   "local_network": "உள்ளக பிணையம்",
   "local_network_sheet_info": "குறிப்பிட்ட வைஃபை நெட்வொர்க்கைப் பயன்படுத்தும் போது பயன்பாடு இந்த முகவரி மூலம் சேவையகத்துடன் இணைக்கப்படும்",
+  "location": "இடம்",
   "location_permission": "இருப்பிட இசைவு",
   "location_permission_content": "ஆட்டோ-ச்விட்சிங் அம்சத்தைப் பயன்படுத்த, இம்மிக்கு துல்லியமான இருப்பிட இசைவு தேவை, எனவே இது தற்போதைய வைஃபை நெட்வொர்க்கின் பெயரைப் படிக்க முடியும்",
   "location_picker_choose_on_map": "வரைபடத்தில் தேர்வு செய்யவும்",
@@ -1435,6 +1453,7 @@
   "oauth": "Oauth",
   "obtainium_configurator": "ஒப்டெய்னியம் கட்டமைப்பாளர்",
   "obtainium_configurator_instructions": "Immich GitHub வெளியீட்டில் இருந்து நேரடியாக ஆண்ட்ராய்டு பயன்பாட்டை நிறுவவும் புதுப்பிக்கவும் Obtainium ஐப் பயன்படுத்தவும். பநிஇ விசையை உருவாக்கி, உங்கள் ஒப்டெய்னியம் உள்ளமைவு இணைப்பை உருவாக்க ஒரு மாறுபாட்டைத் தேர்ந்தெடுக்கவும்",
+  "ocr": "ஓசிஆர்",
   "official_immich_resources": "உத்தியோகபூர்வ இம்மா வளங்கள்",
   "offline": "இணையமில்லாமல்",
   "offset": "ஈடுசெய்யும்",
@@ -1678,6 +1697,7 @@
   "reset_sqlite_confirmation": "SQLITE தரவுத்தளத்தை மீட்டமைக்க விரும்புகிறீர்களா? தரவை மீண்டும் ஒத்திசைக்க நீங்கள் வெளியேறி மீண்டும் உள்நுழைய வேண்டும்",
   "reset_sqlite_success": "SQLITE தரவுத்தளத்தை வெற்றிகரமாக மீட்டமைக்கவும்",
   "reset_to_default": "இயல்புநிலைக்கு மீட்டமைக்கவும்",
+  "resolution": "தெளிவுத்திறன்",
   "resolve_duplicates": "நகல்களைத் தீர்க்கவும்",
   "resolved_all_duplicates": "அனைத்து நகல்களையும் தீர்க்கும்",
   "restore": "மீட்டமை",
@@ -1696,6 +1716,7 @@
   "running": "இயங்கும்",
   "save": "சேமி",
   "save_to_gallery": "கேலரியில் சேமிக்கவும்",
+  "saved": "சேமிக்கப்பட்டது",
   "saved_api_key": "சேமித்த பநிஇ விசை",
   "saved_profile": "சேமித்த சுயவிவரம்",
   "saved_settings": "சேமித்த அமைப்புகள்",
@@ -1712,6 +1733,8 @@
   "search_by_description_example": "சப்பாவில் நடைபயணம்",
   "search_by_filename": "கோப்பு பெயர் அல்லது நீட்டிப்பு மூலம் தேடுங்கள்",
   "search_by_filename_example": "I.E. IMG_1234.JPG அல்லது PNG",
+  "search_by_ocr": "ஓசிஆர் மூலம் தேடு",
+  "search_by_ocr_example": "லேட்",
   "search_camera_lens_model": "கண்ணாடி வில்லை மாதிரியைத் தேடு...",
   "search_camera_make": "தேடல் கேமரா செய்யுங்கள் ...",
   "search_camera_model": "கேமரா மாதிரியைத் தேடுங்கள் ...",
@@ -1729,6 +1752,7 @@
   "search_filter_location_title": "இருப்பிடத்தைத் தேர்ந்தெடுக்கவும்",
   "search_filter_media_type": "ஊடக வகை",
   "search_filter_media_type_title": "மீடியா வகையைத் தேர்ந்தெடுக்கவும்",
+  "search_filter_ocr": "ஓசிஆர் மூலம் தேடு",
   "search_filter_people_title": "மக்களைத் தேர்ந்தெடுக்கவும்",
   "search_for": "தேடுங்கள்",
   "search_for_existing_person": "இருக்கும் நபரைத் தேடுங்கள்",
@@ -2001,6 +2025,7 @@
   "theme_setting_three_stage_loading_title": "மூன்று-நிலை ஏற்றுதலை இயக்கவும்",
   "they_will_be_merged_together": "அவர்கள் ஒன்றாக இணைக்கப்படுவார்கள்",
   "third_party_resources": "மூன்றாம் தரப்பு வளங்கள்",
+  "time": "நேரம்",
   "time_based_memories": "நேர அடிப்படையிலான நினைவுகள்",
   "timeline": "காலவரிசை",
   "timezone": "நேர மண்டலம்",
diff --git a/i18n/tr.json b/i18n/tr.json
index 84a246ddc5..1c1f4c7354 100644
--- a/i18n/tr.json
+++ b/i18n/tr.json
@@ -163,6 +163,7 @@
     "machine_learning_ocr_min_detection_score": "En düşük tespit puanı",
     "machine_learning_ocr_min_detection_score_description": "Metnin tespit edilmesi için minimum güven puanı 0-1 arasındadır. Düşük değerler daha fazla metin tespit eder, ancak yanlış pozitif sonuçlara yol açabilir.",
     "machine_learning_ocr_min_recognition_score": "Minimum tespit puanı",
+    "machine_learning_ocr_model": "OCR modeli",
     "machine_learning_settings": "Makine Öğrenmesi ayarları",
     "machine_learning_settings_description": "Makine öğrenmesi özelliklerini ve ayarlarını yönet",
     "machine_learning_smart_search": "Akıllı Arama",
@@ -785,6 +786,7 @@
   "daily_title_text_date_year": "dd MMM yyyy E",
   "dark": "Koyu",
   "dark_theme": "Karanlık temaya geç",
+  "date": "Tarih",
   "date_after": "Sonraki tarih",
   "date_and_time": "Tarih ve Zaman",
   "date_before": "Önceki tarih",
@@ -1093,6 +1095,7 @@
   "features_setting_description": "Uygulamanın özelliklerini yönet",
   "file_name": "Dosya adı",
   "file_name_or_extension": "Dosya adı veya uzantı",
+  "file_size": "Dosya boyutu",
   "filename": "Dosya adı",
   "filetype": "Dosya tipi",
   "filter": "Filtre",
@@ -1444,6 +1447,7 @@
   "oauth": "OAuth",
   "obtainium_configurator": "Obtainium Yapılandırıcı",
   "obtainium_configurator_instructions": "Obtainium kullanarak Android uygulamasını doğrudan Immich GitHub sürümünden yükleyin ve güncelleyin. Bir API anahtarı oluşturun ve bir varyant seçerek Obtainium yapılandırma bağlantınızı oluşturun",
+  "ocr": "OCR",
   "official_immich_resources": "Resmi Immich Kaynakları",
   "offline": "Çevrim dışı",
   "offset": "Ofset",
@@ -1687,6 +1691,7 @@
   "reset_sqlite_confirmation": "SQLite veritabanını sıfırlamak istediğinizden emin misiniz? Verileri yeniden eşzamanlamak için oturumu kapatıp tekrar oturum açmanız gerekecektir",
   "reset_sqlite_success": "SQLite veritabanını başarıyla sıfırladınız",
   "reset_to_default": "Varsayılana sıfırla",
+  "resolution": "Çözünürlük",
   "resolve_duplicates": "Çiftleri çöz",
   "resolved_all_duplicates": "Tüm çiftler çözüldü",
   "restore": "Geri yükle",
@@ -2010,6 +2015,7 @@
   "theme_setting_three_stage_loading_title": "Üç aşamalı yüklemeyi etkinleştir",
   "they_will_be_merged_together": "Birlikte birleştirilecekler",
   "third_party_resources": "Üçüncü taraf kaynaklar",
+  "time": "Zaman",
   "time_based_memories": "Zaman bazlı anılar",
   "timeline": "Zaman Çizelgesi",
   "timezone": "Zaman dilimi",
diff --git a/i18n/zh_Hant.json b/i18n/zh_Hant.json
index 16c6e9c926..8baeaec7d8 100644
--- a/i18n/zh_Hant.json
+++ b/i18n/zh_Hant.json
@@ -154,6 +154,8 @@
     "machine_learning_min_detection_score_description": "臉孔偵測的最低信心分數，範圍為 0 至 1。數值較低時會偵測到更多臉孔，但可能導致誤判。",
     "machine_learning_min_recognized_faces": "最低臉部辨識數量",
     "machine_learning_min_recognized_faces_description": "建立新人物所需的最低已辨識臉孔數量。提高此數值可讓臉孔辨識更精確，但同時會增加臉孔未被指派給任何人物的可能性。",
+    "machine_learning_ocr": "文字辨識(OCR)",
+    "machine_learning_ocr_description": "使用機器學習來識別圖片中的文字",
     "machine_learning_settings": "機器學習設定",
     "machine_learning_settings_description": "管理機器學習的功能和設定",
     "machine_learning_smart_search": "智慧搜尋",
@@ -245,6 +247,7 @@
     "oauth_storage_quota_default_description": "未提供宣告時所使用的配額（GiB）。",
     "oauth_timeout": "請求逾時",
     "oauth_timeout_description": "請求的逾時時間（毫秒）",
+    "ocr_job_description": "使用機器學習來識別圖像中的文字",
     "password_enable_description": "使用電子郵件和密碼登入",
     "password_settings": "密碼登入",
     "password_settings_description": "管理密碼登入設定",

From b35f00f768015002127e551dd875f85f546e8cb7 Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 31 Oct 2025 18:04:27 +0000
Subject: [PATCH 11/84] chore: version v2.2.1

---
 cli/package.json                            | 2 +-
 docs/static/archived-versions.json          | 4 ++++
 e2e/package.json                            | 2 +-
 machine-learning/pyproject.toml             | 2 +-
 mobile/android/fastlane/Fastfile            | 4 ++--
 mobile/ios/fastlane/Fastfile                | 2 +-
 mobile/openapi/README.md                    | 2 +-
 mobile/pubspec.yaml                         | 2 +-
 open-api/immich-openapi-specs.json          | 2 +-
 open-api/typescript-sdk/package.json        | 2 +-
 open-api/typescript-sdk/src/fetch-client.ts | 2 +-
 server/package.json                         | 2 +-
 web/package.json                            | 2 +-
 13 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/cli/package.json b/cli/package.json
index 0d635fce07..374a2deb84 100644
--- a/cli/package.json
+++ b/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@immich/cli",
-  "version": "2.2.98",
+  "version": "2.2.99",
   "description": "Command Line Interface (CLI) for Immich",
   "type": "module",
   "exports": "./dist/index.js",
diff --git a/docs/static/archived-versions.json b/docs/static/archived-versions.json
index 8e4ad4c12a..7055ade972 100644
--- a/docs/static/archived-versions.json
+++ b/docs/static/archived-versions.json
@@ -1,4 +1,8 @@
 [
+  {
+    "label": "v2.2.1",
+    "url": "https://docs.v2.2.1.archive.immich.app"
+  },
   {
     "label": "v2.2.0",
     "url": "https://docs.v2.2.0.archive.immich.app"
diff --git a/e2e/package.json b/e2e/package.json
index d6c875ad72..bd0cadfb24 100644
--- a/e2e/package.json
+++ b/e2e/package.json
@@ -1,6 +1,6 @@
 {
   "name": "immich-e2e",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "",
   "main": "index.js",
   "type": "module",
diff --git a/machine-learning/pyproject.toml b/machine-learning/pyproject.toml
index f2931baeb3..c7b0c44f44 100644
--- a/machine-learning/pyproject.toml
+++ b/machine-learning/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "immich-ml"
-version = "2.2.0"
+version = "2.2.1"
 description = ""
 authors = [{ name = "Hau Tran", email = "alex.tran1502@gmail.com" }]
 requires-python = ">=3.10,<4.0"
diff --git a/mobile/android/fastlane/Fastfile b/mobile/android/fastlane/Fastfile
index 5bcd30589b..dac033b59f 100644
--- 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" => 3023,
-        "android.injected.version.name" => "2.2.0",
+        "android.injected.version.code" => 3024,
+        "android.injected.version.name" => "2.2.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')
diff --git a/mobile/ios/fastlane/Fastfile b/mobile/ios/fastlane/Fastfile
index 1b1b22b67f..0cab13ad1b 100644
--- a/mobile/ios/fastlane/Fastfile
+++ b/mobile/ios/fastlane/Fastfile
@@ -169,7 +169,7 @@ platform :ios do
       targets: ["Runner", "ShareExtension", "WidgetExtension"]
     )
     increment_version_number(
-      version_number: "2.2.0"
+      version_number: "2.2.1"
     )
     increment_build_number(
       build_number: latest_testflight_build_number + 1,
diff --git a/mobile/openapi/README.md b/mobile/openapi/README.md
index 643b232f7b..e6c08a199a 100644
--- 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.2.0
+- API version: 2.2.1
 - Generator version: 7.8.0
 - Build package: org.openapitools.codegen.languages.DartClientCodegen
 
diff --git a/mobile/pubspec.yaml b/mobile/pubspec.yaml
index da8a5f3b81..c6a8565f37 100644
--- 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.2.0+3023
+version: 2.2.1+3024
 
 environment:
   sdk: '>=3.8.0 <4.0.0'
diff --git a/open-api/immich-openapi-specs.json b/open-api/immich-openapi-specs.json
index 0570ee857c..5051fcb3c5 100644
--- a/open-api/immich-openapi-specs.json
+++ b/open-api/immich-openapi-specs.json
@@ -10006,7 +10006,7 @@
   "info": {
     "title": "Immich",
     "description": "Immich API",
-    "version": "2.2.0",
+    "version": "2.2.1",
     "contact": {}
   },
   "tags": [],
diff --git a/open-api/typescript-sdk/package.json b/open-api/typescript-sdk/package.json
index b35311c0b1..3a44c4a1cb 100644
--- a/open-api/typescript-sdk/package.json
+++ b/open-api/typescript-sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@immich/sdk",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "Auto-generated TypeScript SDK for the Immich API",
   "type": "module",
   "main": "./build/index.js",
diff --git a/open-api/typescript-sdk/src/fetch-client.ts b/open-api/typescript-sdk/src/fetch-client.ts
index 2daf22a45f..6c1c7d9db2 100644
--- a/open-api/typescript-sdk/src/fetch-client.ts
+++ b/open-api/typescript-sdk/src/fetch-client.ts
@@ -1,6 +1,6 @@
 /**
  * Immich
- * 2.2.0
+ * 2.2.1
  * DO NOT MODIFY - This file has been generated using oazapfts.
  * See https://www.npmjs.com/package/oazapfts
  */
diff --git a/server/package.json b/server/package.json
index f853880218..31fd9a1d92 100644
--- a/server/package.json
+++ b/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "immich",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "",
   "author": "",
   "private": true,
diff --git a/web/package.json b/web/package.json
index 791fc8d982..45d8c36f34 100644
--- a/web/package.json
+++ b/web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "immich-web",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "license": "GNU Affero General Public License version 3",
   "type": "module",
   "scripts": {

From 2b33a58448a252d5d359f52683c58616c617f30c Mon Sep 17 00:00:00 2001
From: shenlong <139912620+shenlong-tanwen@users.noreply.github.com>
Date: Sat, 1 Nov 2025 01:25:28 +0530
Subject: [PATCH 12/84] fix: show in timeline from search page (#23440)

Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>
---
 mobile/lib/pages/common/tab_shell.page.dart     |  3 ---
 .../pages/search/drift_search.page.dart         | 16 +++++++++-------
 .../similar_photos_action_button.widget.dart    | 17 +----------------
 mobile/lib/providers/routes.provider.dart       |  1 -
 4 files changed, 10 insertions(+), 27 deletions(-)

diff --git a/mobile/lib/pages/common/tab_shell.page.dart b/mobile/lib/pages/common/tab_shell.page.dart
index b04a379e41..bbb567bd3b 100644
--- a/mobile/lib/pages/common/tab_shell.page.dart
+++ b/mobile/lib/pages/common/tab_shell.page.dart
@@ -14,7 +14,6 @@ import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/memory.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/people.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/readonly_mode.provider.dart';
-import 'package:immich_mobile/providers/routes.provider.dart';
 import 'package:immich_mobile/providers/search/search_input_focus.provider.dart';
 import 'package:immich_mobile/providers/tab.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
@@ -108,8 +107,6 @@ class _TabShellPageState extends ConsumerState<TabShellPage> {
 }
 
 void _onNavigationSelected(TabsRouter router, int index, WidgetRef ref) {
-  ref.read(currentTabIndexProvider.notifier).state = index;
-
   // On Photos page menu tapped
   if (router.activeIndex == kPhotoTabIndex && index == kPhotoTabIndex) {
     EventStream.shared.emit(const ScrollToTopEvent());
diff --git a/mobile/lib/presentation/pages/search/drift_search.page.dart b/mobile/lib/presentation/pages/search/drift_search.page.dart
index 661c8d127d..5ded685e21 100644
--- a/mobile/lib/presentation/pages/search/drift_search.page.dart
+++ b/mobile/lib/presentation/pages/search/drift_search.page.dart
@@ -73,27 +73,29 @@ class DriftSearchPage extends HookConsumerWidget {
       );
     }
 
-    search() async {
-      if (filter.value.isEmpty) {
+    searchFilter(SearchFilter filter) async {
+      if (filter.isEmpty) {
         return;
       }
 
-      if (preFilter == null && filter.value == previousFilter.value) {
+      if (preFilter == null && filter == previousFilter.value) {
         return;
       }
 
       isSearching.value = true;
       ref.watch(paginatedSearchProvider.notifier).clear();
-      final hasResult = await ref.watch(paginatedSearchProvider.notifier).search(filter.value);
+      final hasResult = await ref.watch(paginatedSearchProvider.notifier).search(filter);
 
       if (!hasResult) {
         context.showSnackBar(searchInfoSnackBar('search_no_result'.t(context: context)));
       }
 
-      previousFilter.value = filter.value;
+      previousFilter.value = filter;
       isSearching.value = false;
     }
 
+    search() => searchFilter(filter.value);
+
     loadMoreSearchResult() async {
       isSearching.value = true;
       final hasResult = await ref.watch(paginatedSearchProvider.notifier).search(filter.value);
@@ -108,7 +110,7 @@ class DriftSearchPage extends HookConsumerWidget {
     searchPreFilter() {
       if (preFilter != null) {
         Future.delayed(Duration.zero, () {
-          search();
+          searchFilter(preFilter);
 
           if (preFilter.location.city != null) {
             locationCurrentFilterWidget.value = Text(preFilter.location.city!, style: context.textTheme.labelLarge);
@@ -122,7 +124,7 @@ class DriftSearchPage extends HookConsumerWidget {
       searchPreFilter();
 
       return null;
-    }, []);
+    }, [preFilter]);
 
     showPeoplePicker() {
       handleOnSelect(Set<PersonDto> value) {
diff --git 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
index acfeb131de..4cbc0f0bb8 100644
--- 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
@@ -3,14 +3,12 @@ import 'dart:async';
 import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/constants/constants.dart';
 import 'package:immich_mobile/entities/asset.entity.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/models/search/search_filter.model.dart';
 import 'package:immich_mobile/presentation/pages/search/paginated_search.provider.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_viewer.state.dart';
-import 'package:immich_mobile/providers/routes.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
 
 class SimilarPhotosActionButton extends ConsumerWidget {
@@ -38,20 +36,7 @@ class SimilarPhotosActionButton extends ConsumerWidget {
           ),
         );
 
-    /// Using and currentTabIndex to make sure we are using the correct
-    /// navigation behavior. We want to be able to navigate back to the
-    /// main timline using View In Timeline button without the need of
-    /// waiting for the timeline to be rebuild. At the same time, we want
-    /// to refresh the search page when tapping the Similar Photos button
-    /// while already in the Search tab.
-    final currentTabIndex = (ref.read(currentTabIndexProvider.notifier).state);
-
-    if (currentTabIndex != kSearchTabIndex) {
-      unawaited(context.router.navigate(const DriftSearchRoute()));
-      ref.read(currentTabIndexProvider.notifier).state = kSearchTabIndex;
-    } else {
-      unawaited(context.router.popAndPush(const DriftSearchRoute()));
-    }
+    unawaited(context.navigateTo(const DriftSearchRoute()));
   }
 
   @override
diff --git a/mobile/lib/providers/routes.provider.dart b/mobile/lib/providers/routes.provider.dart
index 57b375d229..c51f67bc0e 100644
--- a/mobile/lib/providers/routes.provider.dart
+++ b/mobile/lib/providers/routes.provider.dart
@@ -5,4 +5,3 @@ final inLockedViewProvider = StateProvider<bool>((ref) => false);
 final currentRouteNameProvider = StateProvider<String?>((ref) => null);
 final previousRouteNameProvider = StateProvider<String?>((ref) => null);
 final previousRouteDataProvider = StateProvider<RouteSettings?>((ref) => null);
-final currentTabIndexProvider = StateProvider<int>((ref) => 0);

From 7bdf0f6c50fd7a8e637163ed4116a994aff457f7 Mon Sep 17 00:00:00 2001
From: dotlambda <mail@dotlambda.de>
Date: Fri, 31 Oct 2025 14:34:10 -0700
Subject: [PATCH 13/84] chore(ml): remove setuptools from dependencies (#23446)

---
 machine-learning/pyproject.toml | 1 -
 machine-learning/uv.lock        | 2 --
 2 files changed, 3 deletions(-)

diff --git a/machine-learning/pyproject.toml b/machine-learning/pyproject.toml
index c7b0c44f44..fe13d45d56 100644
--- a/machine-learning/pyproject.toml
+++ b/machine-learning/pyproject.toml
@@ -22,7 +22,6 @@ dependencies = [
     "rich>=13.4.2",
     "tokenizers>=0.15.0,<1.0",
     "uvicorn[standard]>=0.22.0,<1.0",
-    "setuptools>=78.1.0",
     "rapidocr>=3.1.0",
 ]
 
diff --git a/machine-learning/uv.lock b/machine-learning/uv.lock
index caaa1e4467..919a17d45e 100644
--- a/machine-learning/uv.lock
+++ b/machine-learning/uv.lock
@@ -1100,7 +1100,6 @@ dependencies = [
     { name = "python-multipart" },
     { name = "rapidocr" },
     { name = "rich" },
-    { name = "setuptools" },
     { name = "tokenizers" },
     { name = "uvicorn", extra = ["standard"] },
 ]
@@ -1188,7 +1187,6 @@ requires-dist = [
     { name = "rapidocr", specifier = ">=3.1.0" },
     { name = "rich", specifier = ">=13.4.2" },
     { name = "rknn-toolkit-lite2", marker = "extra == 'rknn'", specifier = ">=2.3.0,<3" },
-    { name = "setuptools", specifier = ">=78.1.0" },
     { name = "tokenizers", specifier = ">=0.15.0,<1.0" },
     { name = "uvicorn", extras = ["standard"], specifier = ">=0.22.0,<1.0" },
 ]

From d08a520aa2895cf7035ce018791626891f4e0e5d Mon Sep 17 00:00:00 2001
From: Alex <alex.tran1502@gmail.com>
Date: Sat, 1 Nov 2025 01:21:39 -0500
Subject: [PATCH 14/84] chore: post release tasks (#23443)

---
 mobile/ios/Runner.xcodeproj/project.pbxproj | 30 +++++++++------------
 mobile/ios/Runner/Info.plist                |  4 +--
 mobile/ios/fastlane/README.md               |  8 +++---
 3 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/mobile/ios/Runner.xcodeproj/project.pbxproj b/mobile/ios/Runner.xcodeproj/project.pbxproj
index 1b86a0b787..15130702bc 100644
--- a/mobile/ios/Runner.xcodeproj/project.pbxproj
+++ b/mobile/ios/Runner.xcodeproj/project.pbxproj
@@ -133,11 +133,15 @@
 /* Begin PBXFileSystemSynchronizedRootGroup section */
 		B231F52D2E93A44A00BC45D1 /* Core */ = {
 			isa = PBXFileSystemSynchronizedRootGroup;
+			exceptions = (
+			);
 			path = Core;
 			sourceTree = "<group>";
 		};
 		B2CF7F8C2DDE4EBB00744BF6 /* Sync */ = {
 			isa = PBXFileSystemSynchronizedRootGroup;
+			exceptions = (
+			);
 			path = Sync;
 			sourceTree = "<group>";
 		};
@@ -526,14 +530,10 @@
 			inputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			inputPaths = (
-			);
 			name = "[CP] Copy Pods Resources";
 			outputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
 			);
-			outputPaths = (
-			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
@@ -562,14 +562,10 @@
 			inputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			inputPaths = (
-			);
 			name = "[CP] Embed Pods Frameworks";
 			outputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
 			);
-			outputPaths = (
-			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
@@ -718,7 +714,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 231;
+				CURRENT_PROJECT_VERSION = 233;
 				CUSTOM_GROUP_ID = group.app.immich.share;
 				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_BITCODE = NO;
@@ -862,7 +858,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 231;
+				CURRENT_PROJECT_VERSION = 233;
 				CUSTOM_GROUP_ID = group.app.immich.share;
 				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_BITCODE = NO;
@@ -892,7 +888,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 231;
+				CURRENT_PROJECT_VERSION = 233;
 				CUSTOM_GROUP_ID = group.app.immich.share;
 				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_BITCODE = NO;
@@ -926,7 +922,7 @@
 				CODE_SIGN_ENTITLEMENTS = WidgetExtension/WidgetExtension.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 231;
+				CURRENT_PROJECT_VERSION = 233;
 				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu17;
@@ -969,7 +965,7 @@
 				CODE_SIGN_ENTITLEMENTS = WidgetExtension/WidgetExtension.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 231;
+				CURRENT_PROJECT_VERSION = 233;
 				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu17;
@@ -1009,7 +1005,7 @@
 				CODE_SIGN_ENTITLEMENTS = WidgetExtension/WidgetExtension.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 231;
+				CURRENT_PROJECT_VERSION = 233;
 				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu17;
@@ -1048,7 +1044,7 @@
 				CODE_SIGN_ENTITLEMENTS = ShareExtension/ShareExtension.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 231;
+				CURRENT_PROJECT_VERSION = 233;
 				CUSTOM_GROUP_ID = group.app.immich.share;
 				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
@@ -1092,7 +1088,7 @@
 				CODE_SIGN_ENTITLEMENTS = ShareExtension/ShareExtension.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 231;
+				CURRENT_PROJECT_VERSION = 233;
 				CUSTOM_GROUP_ID = group.app.immich.share;
 				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
@@ -1133,7 +1129,7 @@
 				CODE_SIGN_ENTITLEMENTS = ShareExtension/ShareExtension.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 231;
+				CURRENT_PROJECT_VERSION = 233;
 				CUSTOM_GROUP_ID = group.app.immich.share;
 				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
diff --git a/mobile/ios/Runner/Info.plist b/mobile/ios/Runner/Info.plist
index 1dc55468da..7a3a9261ae 100644
--- 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.1.0</string>
+	<string>2.2.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -107,7 +107,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>231</string>
+	<string>233</string>
 	<key>FLTEnableImpeller</key>
 	<true/>
 	<key>ITSAppUsesNonExemptEncryption</key>
diff --git a/mobile/ios/fastlane/README.md b/mobile/ios/fastlane/README.md
index 2bea622b18..5fc8101b3a 100644
--- a/mobile/ios/fastlane/README.md
+++ b/mobile/ios/fastlane/README.md
@@ -15,18 +15,18 @@ For _fastlane_ installation instructions, see [Installing _fastlane_](https://do
 
 ## iOS
 
-### ios release_dev
+### ios gha_testflight_dev
 
 ```sh
-[bundle exec] fastlane ios release_dev
+[bundle exec] fastlane ios gha_testflight_dev
 ```
 
 iOS Development Build to TestFlight (requires separate bundle ID)
 
-### ios release_ci
+### ios gha_release_prod
 
 ```sh
-[bundle exec] fastlane ios release_ci
+[bundle exec] fastlane ios gha_release_prod
 ```
 
 iOS Release to TestFlight

From 0ddb92e1ec02294a7d9c8adecc4b11aa981ed283 Mon Sep 17 00:00:00 2001
From: bo0tzz <git@bo0tzz.me>
Date: Sat, 1 Nov 2025 20:38:18 +0100
Subject: [PATCH 15/84] fix: use pnpm directly for fix-format (#23483)

---
 .github/workflows/fix-format.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/fix-format.yml b/.github/workflows/fix-format.yml
index 90810c2cfc..f7f34b929c 100644
--- a/.github/workflows/fix-format.yml
+++ b/.github/workflows/fix-format.yml
@@ -39,7 +39,7 @@ jobs:
           cache-dependency-path: '**/pnpm-lock.yaml'
 
       - name: Fix formatting
-        run: make install-all && make format-all
+        run: pnpm --recursive install && pnpm run --recursive --parallel fix:format
 
       - name: Commit and push
         uses: EndBug/add-and-commit@a94899bca583c204427a224a7af87c02f9b325d5 # v9.1.4

From c76324c611131a6d522667f881869b5fdf8217d5 Mon Sep 17 00:00:00 2001
From: Daniel Dietzler <36593685+danieldietzler@users.noreply.github.com>
Date: Sun, 2 Nov 2025 04:15:33 +0100
Subject: [PATCH 16/84] fix(web): mobile scrubber on page load (#23488)

---
 web/src/lib/managers/timeline-manager/timeline-manager.svelte.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/src/lib/managers/timeline-manager/timeline-manager.svelte.ts b/web/src/lib/managers/timeline-manager/timeline-manager.svelte.ts
index 9f879fe1b1..d2340224a2 100644
--- a/web/src/lib/managers/timeline-manager/timeline-manager.svelte.ts
+++ b/web/src/lib/managers/timeline-manager/timeline-manager.svelte.ts
@@ -234,6 +234,7 @@ export class TimelineManager extends VirtualScrollManager {
     await this.initTask.reset();
     await this.#init(options);
     this.updateViewportGeometry(false);
+    this.#createScrubberMonths();
   }
 
   async #init(options: TimelineManagerOptions) {

From 1036076b0d86c7c50a0d2a777e049c6b64a7d4cf Mon Sep 17 00:00:00 2001
From: Alex <alex.tran1502@gmail.com>
Date: Sun, 2 Nov 2025 15:54:03 -0600
Subject: [PATCH 17/84] fix: disable prunning for more investigation (#23531)

---
 mobile/lib/domain/services/sync_stream.service.dart | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mobile/lib/domain/services/sync_stream.service.dart b/mobile/lib/domain/services/sync_stream.service.dart
index 5ed11598dc..9af541e3a4 100644
--- a/mobile/lib/domain/services/sync_stream.service.dart
+++ b/mobile/lib/domain/services/sync_stream.service.dart
@@ -132,7 +132,8 @@ class SyncStreamService {
         return;
       // SyncCompleteV1 is used to signal the completion of the sync process. Cleanup stale assets and signal completion
       case SyncEntityType.syncCompleteV1:
-        return _syncStreamRepository.pruneAssets();
+        return;
+      // return _syncStreamRepository.pruneAssets();
       // Request to reset the client state. Clear everything related to remote entities
       case SyncEntityType.syncResetV1:
         return _syncStreamRepository.reset();

From b5efc9c16e6757ddb0874a83f492f0b0637099ad Mon Sep 17 00:00:00 2001
From: Alex <alex.tran1502@gmail.com>
Date: Sun, 2 Nov 2025 15:54:35 -0600
Subject: [PATCH 18/84] fix: passing secrets to trigger workflow (#23447)

* fix: passing secrets to trigger workflow

* pass secrets to workflow call
---
 .github/workflows/build-mobile.yml    | 24 ++++++++++++++++++++++++
 .github/workflows/prepare-release.yml | 14 ++++++++++++++
 2 files changed, 38 insertions(+)

diff --git a/.github/workflows/build-mobile.yml b/.github/workflows/build-mobile.yml
index f6f9a047b1..e39a8f5ea9 100644
--- a/.github/workflows/build-mobile.yml
+++ b/.github/workflows/build-mobile.yml
@@ -20,6 +20,30 @@ on:
         required: true
       ANDROID_STORE_PASSWORD:
         required: true
+      APP_STORE_CONNECT_API_KEY_ID:
+        required: true
+      APP_STORE_CONNECT_API_KEY_ISSUER_ID:
+        required: true
+      APP_STORE_CONNECT_API_KEY:
+        required: true
+      IOS_CERTIFICATE_P12:
+        required: true
+      IOS_CERTIFICATE_PASSWORD:
+        required: true
+      IOS_PROVISIONING_PROFILE:
+        required: true
+      IOS_PROVISIONING_PROFILE_SHARE_EXTENSION:
+        required: true
+      IOS_PROVISIONING_PROFILE_WIDGET_EXTENSION:
+        required: true
+      IOS_DEVELOPMENT_PROVISIONING_PROFILE:
+        required: true
+      IOS_DEVELOPMENT_PROVISIONING_PROFILE_SHARE_EXTENSION:
+        required: true
+      IOS_DEVELOPMENT_PROVISIONING_PROFILE_WIDGET_EXTENSION:
+        required: true
+      FASTLANE_TEAM_ID:
+        required: true
   pull_request:
   push:
     branches: [main]
diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml
index 8058ea7c94..77f32ace4f 100644
--- a/.github/workflows/prepare-release.yml
+++ b/.github/workflows/prepare-release.yml
@@ -99,6 +99,20 @@ jobs:
       ALIAS: ${{ secrets.ALIAS }}
       ANDROID_KEY_PASSWORD: ${{ secrets.ANDROID_KEY_PASSWORD }}
       ANDROID_STORE_PASSWORD: ${{ secrets.ANDROID_STORE_PASSWORD }}
+      # iOS secrets
+      APP_STORE_CONNECT_API_KEY_ID: ${{ secrets.APP_STORE_CONNECT_API_KEY_ID }}
+      APP_STORE_CONNECT_API_KEY_ISSUER_ID: ${{ secrets.APP_STORE_CONNECT_API_KEY_ISSUER_ID }}
+      APP_STORE_CONNECT_API_KEY: ${{ secrets.APP_STORE_CONNECT_API_KEY }}
+      IOS_CERTIFICATE_P12: ${{ secrets.IOS_CERTIFICATE_P12 }}
+      IOS_CERTIFICATE_PASSWORD: ${{ secrets.IOS_CERTIFICATE_PASSWORD }}
+      IOS_PROVISIONING_PROFILE: ${{ secrets.IOS_PROVISIONING_PROFILE }}
+      IOS_PROVISIONING_PROFILE_SHARE_EXTENSION: ${{ secrets.IOS_PROVISIONING_PROFILE_SHARE_EXTENSION }}
+      IOS_PROVISIONING_PROFILE_WIDGET_EXTENSION: ${{ secrets.IOS_PROVISIONING_PROFILE_WIDGET_EXTENSION }}
+      IOS_DEVELOPMENT_PROVISIONING_PROFILE: ${{ secrets.IOS_DEVELOPMENT_PROVISIONING_PROFILE }}
+      IOS_DEVELOPMENT_PROVISIONING_PROFILE_SHARE_EXTENSION: ${{ secrets.IOS_DEVELOPMENT_PROVISIONING_PROFILE_SHARE_EXTENSION }}
+      IOS_DEVELOPMENT_PROVISIONING_PROFILE_WIDGET_EXTENSION: ${{ secrets.IOS_DEVELOPMENT_PROVISIONING_PROFILE_WIDGET_EXTENSION }}
+      FASTLANE_TEAM_ID: ${{ secrets.FASTLANE_TEAM_ID }}
+
     with:
       ref: ${{ needs.bump_version.outputs.ref }}
       environment: production

From f5ff36a1f8051f5a12e74ec62840915edbf310d1 Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 2 Nov 2025 21:56:36 +0000
Subject: [PATCH 19/84] chore: version v2.2.2

---
 cli/package.json                            | 2 +-
 docs/static/archived-versions.json          | 4 ++++
 e2e/package.json                            | 2 +-
 machine-learning/pyproject.toml             | 2 +-
 mobile/android/fastlane/Fastfile            | 4 ++--
 mobile/ios/fastlane/Fastfile                | 2 +-
 mobile/openapi/README.md                    | 2 +-
 mobile/pubspec.yaml                         | 2 +-
 open-api/immich-openapi-specs.json          | 2 +-
 open-api/typescript-sdk/package.json        | 2 +-
 open-api/typescript-sdk/src/fetch-client.ts | 2 +-
 server/package.json                         | 2 +-
 web/package.json                            | 2 +-
 13 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/cli/package.json b/cli/package.json
index 374a2deb84..0dc0136cf2 100644
--- a/cli/package.json
+++ b/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@immich/cli",
-  "version": "2.2.99",
+  "version": "2.2.100",
   "description": "Command Line Interface (CLI) for Immich",
   "type": "module",
   "exports": "./dist/index.js",
diff --git a/docs/static/archived-versions.json b/docs/static/archived-versions.json
index 7055ade972..1d50ae54f8 100644
--- a/docs/static/archived-versions.json
+++ b/docs/static/archived-versions.json
@@ -1,4 +1,8 @@
 [
+  {
+    "label": "v2.2.2",
+    "url": "https://docs.v2.2.2.archive.immich.app"
+  },
   {
     "label": "v2.2.1",
     "url": "https://docs.v2.2.1.archive.immich.app"
diff --git a/e2e/package.json b/e2e/package.json
index bd0cadfb24..a6721a1bec 100644
--- a/e2e/package.json
+++ b/e2e/package.json
@@ -1,6 +1,6 @@
 {
   "name": "immich-e2e",
-  "version": "2.2.1",
+  "version": "2.2.2",
   "description": "",
   "main": "index.js",
   "type": "module",
diff --git a/machine-learning/pyproject.toml b/machine-learning/pyproject.toml
index fe13d45d56..1d36648c3d 100644
--- a/machine-learning/pyproject.toml
+++ b/machine-learning/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "immich-ml"
-version = "2.2.1"
+version = "2.2.2"
 description = ""
 authors = [{ name = "Hau Tran", email = "alex.tran1502@gmail.com" }]
 requires-python = ">=3.10,<4.0"
diff --git a/mobile/android/fastlane/Fastfile b/mobile/android/fastlane/Fastfile
index dac033b59f..1c22a83dc3 100644
--- 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" => 3024,
-        "android.injected.version.name" => "2.2.1",
+        "android.injected.version.code" => 3025,
+        "android.injected.version.name" => "2.2.2",
       }
     )
     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')
diff --git a/mobile/ios/fastlane/Fastfile b/mobile/ios/fastlane/Fastfile
index 0cab13ad1b..8229c65534 100644
--- a/mobile/ios/fastlane/Fastfile
+++ b/mobile/ios/fastlane/Fastfile
@@ -169,7 +169,7 @@ platform :ios do
       targets: ["Runner", "ShareExtension", "WidgetExtension"]
     )
     increment_version_number(
-      version_number: "2.2.1"
+      version_number: "2.2.2"
     )
     increment_build_number(
       build_number: latest_testflight_build_number + 1,
diff --git a/mobile/openapi/README.md b/mobile/openapi/README.md
index e6c08a199a..efde847034 100644
--- 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.2.1
+- API version: 2.2.2
 - Generator version: 7.8.0
 - Build package: org.openapitools.codegen.languages.DartClientCodegen
 
diff --git a/mobile/pubspec.yaml b/mobile/pubspec.yaml
index c6a8565f37..b47038b7e5 100644
--- 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.2.1+3024
+version: 2.2.2+3025
 
 environment:
   sdk: '>=3.8.0 <4.0.0'
diff --git a/open-api/immich-openapi-specs.json b/open-api/immich-openapi-specs.json
index 5051fcb3c5..f2b225769a 100644
--- a/open-api/immich-openapi-specs.json
+++ b/open-api/immich-openapi-specs.json
@@ -10006,7 +10006,7 @@
   "info": {
     "title": "Immich",
     "description": "Immich API",
-    "version": "2.2.1",
+    "version": "2.2.2",
     "contact": {}
   },
   "tags": [],
diff --git a/open-api/typescript-sdk/package.json b/open-api/typescript-sdk/package.json
index 3a44c4a1cb..9e62898cee 100644
--- a/open-api/typescript-sdk/package.json
+++ b/open-api/typescript-sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@immich/sdk",
-  "version": "2.2.1",
+  "version": "2.2.2",
   "description": "Auto-generated TypeScript SDK for the Immich API",
   "type": "module",
   "main": "./build/index.js",
diff --git a/open-api/typescript-sdk/src/fetch-client.ts b/open-api/typescript-sdk/src/fetch-client.ts
index 6c1c7d9db2..f6a68ee8df 100644
--- a/open-api/typescript-sdk/src/fetch-client.ts
+++ b/open-api/typescript-sdk/src/fetch-client.ts
@@ -1,6 +1,6 @@
 /**
  * Immich
- * 2.2.1
+ * 2.2.2
  * DO NOT MODIFY - This file has been generated using oazapfts.
  * See https://www.npmjs.com/package/oazapfts
  */
diff --git a/server/package.json b/server/package.json
index 31fd9a1d92..69fb98d0ed 100644
--- a/server/package.json
+++ b/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "immich",
-  "version": "2.2.1",
+  "version": "2.2.2",
   "description": "",
   "author": "",
   "private": true,
diff --git a/web/package.json b/web/package.json
index 45d8c36f34..dd582af438 100644
--- a/web/package.json
+++ b/web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "immich-web",
-  "version": "2.2.1",
+  "version": "2.2.2",
   "license": "GNU Affero General Public License version 3",
   "type": "module",
   "scripts": {

From 79d0e3e1ed01899239c1467b6cf31b7f898986f1 Mon Sep 17 00:00:00 2001
From: Mert <101130780+mertalev@users.noreply.github.com>
Date: Mon, 3 Nov 2025 02:21:30 -0500
Subject: [PATCH 20/84] fix(ml): ocr inputs not resized correctly (#23541)

* fix resizing, use pillow

* unused import

* linting

* lanczos

* optimizations

fused operations

unused import
---
 .../immich_ml/models/ocr/detection.py         | 94 +++++++++++++------
 .../immich_ml/models/ocr/recognition.py       | 76 ++++++++++-----
 .../immich_ml/models/ocr/schemas.py           |  1 -
 3 files changed, 120 insertions(+), 51 deletions(-)

diff --git a/machine-learning/immich_ml/models/ocr/detection.py b/machine-learning/immich_ml/models/ocr/detection.py
index 235fcc677e..0a9d09b599 100644
--- a/machine-learning/immich_ml/models/ocr/detection.py
+++ b/machine-learning/immich_ml/models/ocr/detection.py
@@ -1,8 +1,10 @@
 from typing import Any
 
+import cv2
 import numpy as np
+from numpy.typing import NDArray
 from PIL import Image
-from rapidocr.ch_ppocr_det import TextDetector as RapidTextDetector
+from rapidocr.ch_ppocr_det.utils import DBPostProcess
 from rapidocr.inference_engine.base import FileInfo, InferSession
 from rapidocr.utils import DownloadFile, DownloadFileInput
 from rapidocr.utils.typings import EngineType, LangDet, OCRVersion, TaskType
@@ -10,11 +12,10 @@ from rapidocr.utils.typings import ModelType as RapidModelType
 
 from immich_ml.config import log
 from immich_ml.models.base import InferenceModel
-from immich_ml.models.transforms import decode_cv2
 from immich_ml.schemas import ModelFormat, ModelSession, ModelTask, ModelType
 from immich_ml.sessions.ort import OrtSession
 
-from .schemas import OcrOptions, TextDetectionOutput
+from .schemas import TextDetectionOutput
 
 
 class TextDetector(InferenceModel):
@@ -24,13 +25,20 @@ class TextDetector(InferenceModel):
     def __init__(self, model_name: str, **model_kwargs: Any) -> None:
         super().__init__(model_name, **model_kwargs, model_format=ModelFormat.ONNX)
         self.max_resolution = 736
-        self.min_score = 0.5
-        self.score_mode = "fast"
+        self.mean = np.array([0.5, 0.5, 0.5], dtype=np.float32)
+        self.std_inv = np.float32(1.0) / (np.array([0.5, 0.5, 0.5], dtype=np.float32) * 255.0)
         self._empty: TextDetectionOutput = {
-            "image": np.empty(0, dtype=np.float32),
             "boxes": np.empty(0, dtype=np.float32),
             "scores": np.empty(0, dtype=np.float32),
         }
+        self.postprocess = DBPostProcess(
+            thresh=0.3,
+            box_thresh=model_kwargs.get("minScore", 0.5),
+            max_candidates=1000,
+            unclip_ratio=1.6,
+            use_dilation=True,
+            score_mode="fast",
+        )
 
     def _download(self) -> None:
         model_info = InferSession.get_model_url(
@@ -52,35 +60,65 @@ class TextDetector(InferenceModel):
 
     def _load(self) -> ModelSession:
         # TODO: support other runtime sessions
-        session = OrtSession(self.model_path)
-        self.model = RapidTextDetector(
-            OcrOptions(
-                session=session.session,
-                limit_side_len=self.max_resolution,
-                limit_type="min",
-                box_thresh=self.min_score,
-                score_mode=self.score_mode,
-            )
-        )
-        return session
+        return OrtSession(self.model_path)
 
-    def _predict(self, inputs: bytes | Image.Image) -> TextDetectionOutput:
-        results = self.model(decode_cv2(inputs))
-        if results.boxes is None or results.scores is None or results.img is None:
+    # partly adapted from RapidOCR
+    def _predict(self, inputs: Image.Image) -> TextDetectionOutput:
+        w, h = inputs.size
+        if w < 32 or h < 32:
+            return self._empty
+        out = self.session.run(None, {"x": self._transform(inputs)})[0]
+        boxes, scores = self.postprocess(out, (h, w))
+        if len(boxes) == 0:
             return self._empty
         return {
-            "image": results.img,
-            "boxes": np.array(results.boxes, dtype=np.float32),
-            "scores": np.array(results.scores, dtype=np.float32),
+            "boxes": self.sorted_boxes(boxes),
+            "scores": np.array(scores, dtype=np.float32),
         }
 
+    # adapted from RapidOCR
+    def _transform(self, img: Image.Image) -> NDArray[np.float32]:
+        if img.height < img.width:
+            ratio = float(self.max_resolution) / img.height
+        else:
+            ratio = float(self.max_resolution) / img.width
+
+        resize_h = int(img.height * ratio)
+        resize_w = int(img.width * ratio)
+
+        resize_h = int(round(resize_h / 32) * 32)
+        resize_w = int(round(resize_w / 32) * 32)
+        resized_img = img.resize((int(resize_w), int(resize_h)), resample=Image.Resampling.LANCZOS)
+
+        img_np: NDArray[np.float32] = cv2.cvtColor(np.array(resized_img, dtype=np.float32), cv2.COLOR_RGB2BGR)  # type: ignore
+        img_np -= self.mean
+        img_np *= self.std_inv
+        img_np = np.transpose(img_np, (2, 0, 1))
+        return np.expand_dims(img_np, axis=0)
+
+    def sorted_boxes(self, dt_boxes: NDArray[np.float32]) -> NDArray[np.float32]:
+        if len(dt_boxes) == 0:
+            return dt_boxes
+
+        # Sort by y, then identify lines, then sort by (line, x)
+        y_order = np.argsort(dt_boxes[:, 0, 1], kind="stable")
+        sorted_y = dt_boxes[y_order, 0, 1]
+
+        line_ids = np.empty(len(dt_boxes), dtype=np.int32)
+        line_ids[0] = 0
+        np.cumsum(np.abs(np.diff(sorted_y)) >= 10, out=line_ids[1:])
+
+        # Create composite sort key for final ordering
+        # Shift line_ids by large factor, add x for tie-breaking
+        sort_key = line_ids[y_order] * 1e6 + dt_boxes[y_order, 0, 0]
+        final_order = np.argsort(sort_key, kind="stable")
+        sorted_boxes: NDArray[np.float32] = dt_boxes[y_order[final_order]]
+        return sorted_boxes
+
     def configure(self, **kwargs: Any) -> None:
         if (max_resolution := kwargs.get("maxResolution")) is not None:
             self.max_resolution = max_resolution
-            self.model.limit_side_len = max_resolution
         if (min_score := kwargs.get("minScore")) is not None:
-            self.min_score = min_score
-            self.model.postprocess_op.box_thresh = min_score
+            self.postprocess.box_thresh = min_score
         if (score_mode := kwargs.get("scoreMode")) is not None:
-            self.score_mode = score_mode
-            self.model.postprocess_op.score_mode = score_mode
+            self.postprocess.score_mode = score_mode
diff --git a/machine-learning/immich_ml/models/ocr/recognition.py b/machine-learning/immich_ml/models/ocr/recognition.py
index c3d39b0d70..0f91fc4105 100644
--- a/machine-learning/immich_ml/models/ocr/recognition.py
+++ b/machine-learning/immich_ml/models/ocr/recognition.py
@@ -1,9 +1,8 @@
 from typing import Any
 
-import cv2
 import numpy as np
 from numpy.typing import NDArray
-from PIL.Image import Image
+from PIL import Image
 from rapidocr.ch_ppocr_rec import TextRecInput
 from rapidocr.ch_ppocr_rec import TextRecognizer as RapidTextRecognizer
 from rapidocr.inference_engine.base import FileInfo, InferSession
@@ -14,6 +13,7 @@ from rapidocr.utils.vis_res import VisRes
 
 from immich_ml.config import log, settings
 from immich_ml.models.base import InferenceModel
+from immich_ml.models.transforms import pil_to_cv2
 from immich_ml.schemas import ModelFormat, ModelSession, ModelTask, ModelType
 from immich_ml.sessions.ort import OrtSession
 
@@ -65,17 +65,16 @@ class TextRecognizer(InferenceModel):
         )
         return session
 
-    def _predict(self, _: Image, texts: TextDetectionOutput) -> TextRecognitionOutput:
-        boxes, img, box_scores = texts["boxes"], texts["image"], texts["scores"]
+    def _predict(self, img: Image.Image, texts: TextDetectionOutput) -> TextRecognitionOutput:
+        boxes, box_scores = texts["boxes"], texts["scores"]
         if boxes.shape[0] == 0:
             return self._empty
         rec = self.model(TextRecInput(img=self.get_crop_img_list(img, boxes)))
         if rec.txts is None:
             return self._empty
 
-        height, width = img.shape[0:2]
-        boxes[:, :, 0] /= width
-        boxes[:, :, 1] /= height
+        boxes[:, :, 0] /= img.width
+        boxes[:, :, 1] /= img.height
 
         text_scores = np.array(rec.scores)
         valid_text_score_idx = text_scores > self.min_score
@@ -87,7 +86,7 @@ class TextRecognizer(InferenceModel):
             "textScore": text_scores[valid_text_score_idx],
         }
 
-    def get_crop_img_list(self, img: NDArray[np.float32], boxes: NDArray[np.float32]) -> list[NDArray[np.float32]]:
+    def get_crop_img_list(self, img: Image.Image, boxes: NDArray[np.float32]) -> list[NDArray[np.uint8]]:
         img_crop_width = np.maximum(
             np.linalg.norm(boxes[:, 1] - boxes[:, 0], axis=1), np.linalg.norm(boxes[:, 2] - boxes[:, 3], axis=1)
         ).astype(np.int32)
@@ -98,22 +97,55 @@ class TextRecognizer(InferenceModel):
         pts_std[:, 1:3, 0] = img_crop_width[:, None]
         pts_std[:, 2:4, 1] = img_crop_height[:, None]
 
-        img_crop_sizes = np.stack([img_crop_width, img_crop_height], axis=1).tolist()
-        imgs: list[NDArray[np.float32]] = []
-        for box, pts_std, dst_size in zip(list(boxes), list(pts_std), img_crop_sizes):
-            M = cv2.getPerspectiveTransform(box, pts_std)
-            dst_img: NDArray[np.float32] = cv2.warpPerspective(
-                img,
-                M,
-                dst_size,
-                borderMode=cv2.BORDER_REPLICATE,
-                flags=cv2.INTER_CUBIC,
-            )  # type: ignore
-            dst_height, dst_width = dst_img.shape[0:2]
+        img_crop_sizes = np.stack([img_crop_width, img_crop_height], axis=1)
+        all_coeffs = self._get_perspective_transform(pts_std, boxes)
+        imgs: list[NDArray[np.uint8]] = []
+        for coeffs, dst_size in zip(all_coeffs, img_crop_sizes):
+            dst_img = img.transform(
+                size=tuple(dst_size),
+                method=Image.Transform.PERSPECTIVE,
+                data=tuple(coeffs),
+                resample=Image.Resampling.BICUBIC,
+            )
+
+            dst_width, dst_height = dst_img.size
             if dst_height * 1.0 / dst_width >= 1.5:
-                dst_img = np.rot90(dst_img)
-            imgs.append(dst_img)
+                dst_img = dst_img.rotate(90, expand=True)
+            imgs.append(pil_to_cv2(dst_img))
+
         return imgs
 
+    def _get_perspective_transform(self, src: NDArray[np.float32], dst: NDArray[np.float32]) -> NDArray[np.float32]:
+        N = src.shape[0]
+        x, y = src[:, :, 0], src[:, :, 1]
+        u, v = dst[:, :, 0], dst[:, :, 1]
+        A = np.zeros((N, 8, 9), dtype=np.float32)
+
+        # Fill even rows (0, 2, 4, 6): [x, y, 1, 0, 0, 0, -u*x, -u*y, -u]
+        A[:, ::2, 0] = x
+        A[:, ::2, 1] = y
+        A[:, ::2, 2] = 1
+        A[:, ::2, 6] = -u * x
+        A[:, ::2, 7] = -u * y
+        A[:, ::2, 8] = -u
+
+        # Fill odd rows (1, 3, 5, 7): [0, 0, 0, x, y, 1, -v*x, -v*y, -v]
+        A[:, 1::2, 3] = x
+        A[:, 1::2, 4] = y
+        A[:, 1::2, 5] = 1
+        A[:, 1::2, 6] = -v * x
+        A[:, 1::2, 7] = -v * y
+        A[:, 1::2, 8] = -v
+
+        # Solve using SVD for all matrices at once
+        _, _, Vt = np.linalg.svd(A)
+        H = Vt[:, -1, :].reshape(N, 3, 3)
+        H = H / H[:, 2:3, 2:3]
+
+        # Extract the 8 coefficients for each transformation
+        return np.column_stack(
+            [H[:, 0, 0], H[:, 0, 1], H[:, 0, 2], H[:, 1, 0], H[:, 1, 1], H[:, 1, 2], H[:, 2, 0], H[:, 2, 1]]
+        )  # pyright: ignore[reportReturnType]
+
     def configure(self, **kwargs: Any) -> None:
         self.min_score = kwargs.get("minScore", self.min_score)
diff --git a/machine-learning/immich_ml/models/ocr/schemas.py b/machine-learning/immich_ml/models/ocr/schemas.py
index 14a7d3cea0..a63c8dd8e5 100644
--- a/machine-learning/immich_ml/models/ocr/schemas.py
+++ b/machine-learning/immich_ml/models/ocr/schemas.py
@@ -7,7 +7,6 @@ from typing_extensions import TypedDict
 
 
 class TextDetectionOutput(TypedDict):
-    image: npt.NDArray[np.float32]
     boxes: npt.NDArray[np.float32]
     scores: npt.NDArray[np.float32]
 

From 619de2a5e42096daa43fabeedd965da623a6c394 Mon Sep 17 00:00:00 2001
From: Ben <45583362+ben-basten@users.noreply.github.com>
Date: Mon, 3 Nov 2025 08:31:57 -0500
Subject: [PATCH 21/84] fix(web): search bar accessibility (#23550)

* fix: always show search type when search bar is focused

* fix: indicate search type to screen reader users
---
 .../shared-components/search-bar/search-bar.svelte  | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/web/src/lib/components/shared-components/search-bar/search-bar.svelte b/web/src/lib/components/shared-components/search-bar/search-bar.svelte
index d0e84fd072..8c1d2c5d08 100644
--- a/web/src/lib/components/shared-components/search-bar/search-bar.svelte
+++ b/web/src/lib/components/shared-components/search-bar/search-bar.svelte
@@ -30,10 +30,10 @@
   let showSuggestions = $state(false);
   let isSearchSuggestions = $state(false);
   let selectedId: string | undefined = $state();
-  let isFocus = $state(false);
   let close: (() => Promise<void>) | undefined;
 
   const listboxId = generateId();
+  const searchTypeId = generateId();
 
   onDestroy(() => {
     searchStore.isSearchEnabled = false;
@@ -161,12 +161,10 @@
 
   const openDropdown = () => {
     showSuggestions = true;
-    isFocus = true;
   };
 
   const closeDropdown = () => {
     showSuggestions = false;
-    isFocus = false;
     searchHistoryBox?.clearSelection();
   };
 
@@ -251,6 +249,7 @@
         aria-activedescendant={selectedId ?? ''}
         aria-expanded={showSuggestions && isSearchSuggestions}
         aria-autocomplete="list"
+        aria-describedby={searchTypeId}
         use:shortcuts={[
           { shortcut: { key: 'Escape' }, onShortcut: onEscape },
           { shortcut: { ctrl: true, shift: true, key: 'k' }, onShortcut: onFilterClick },
@@ -287,12 +286,12 @@
       />
     </div>
 
-    {#if isFocus}
+    {#if searchStore.isSearchEnabled}
       <div
-        class="absolute inset-y-0 flex items-center"
+        id={searchTypeId}
+        class="absolute inset-y-0 flex items-center end-16"
         class:max-md:hidden={value}
-        class:end-16={isFocus}
-        class:end-28={isFocus && value.length > 0}
+        class:end-28={value.length > 0}
       >
         <p
           class="bg-immich-primary text-white dark:bg-immich-dark-primary/90 dark:text-black/75 rounded-full px-3 py-1 text-xs"

From 517c3e1d4c418e70312ce74efba7c3e0ef558470 Mon Sep 17 00:00:00 2001
From: Daniel Dietzler <36593685+danieldietzler@users.noreply.github.com>
Date: Mon, 3 Nov 2025 15:02:41 +0100
Subject: [PATCH 22/84] fix: exif gps parsing of malformed data (#23551)

* fix: exif gps parsing of malformed data

* chore: e2e test
---
 e2e/src/api/specs/asset.e2e-spec.ts     | 10 ++++++++++
 e2e/test-assets                         |  2 +-
 server/src/services/metadata.service.ts | 14 ++++++--------
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/e2e/src/api/specs/asset.e2e-spec.ts b/e2e/src/api/specs/asset.e2e-spec.ts
index 5c30ff5cbe..90d51e7fef 100644
--- a/e2e/src/api/specs/asset.e2e-spec.ts
+++ b/e2e/src/api/specs/asset.e2e-spec.ts
@@ -1140,6 +1140,16 @@ describe('/asset', () => {
           },
         },
       },
+      {
+        input: 'metadata/gps-position/empty_gps.jpg',
+        expected: {
+          type: AssetTypeEnum.Image,
+          exifInfo: {
+            latitude: null,
+            longitude: null,
+          },
+        },
+      },
     ];
 
     it.each(tests)(`should upload and generate a thumbnail for different file types`, async ({ input, expected }) => {
diff --git a/e2e/test-assets b/e2e/test-assets
index 37f60ea537..68e8b5853c 160000
--- a/e2e/test-assets
+++ b/e2e/test-assets
@@ -1 +1 @@
-Subproject commit 37f60ea537c0228f5f92e4f42dc42f0bb39a6d7f
+Subproject commit 68e8b5853cdc2d76c5e6f18a6d1773793728c491
diff --git a/server/src/services/metadata.service.ts b/server/src/services/metadata.service.ts
index b73a9b6bf0..e76b335c90 100644
--- a/server/src/services/metadata.service.ts
+++ b/server/src/services/metadata.service.ts
@@ -236,8 +236,8 @@ export class MetadataService extends BaseService {
       latitude: number | null = null,
       longitude: number | null = null;
     if (this.hasGeo(exifTags)) {
-      latitude = exifTags.GPSLatitude;
-      longitude = exifTags.GPSLongitude;
+      latitude = Number(exifTags.GPSLatitude);
+      longitude = Number(exifTags.GPSLongitude);
       if (reverseGeocoding.enabled) {
         geo = await this.mapRepository.reverseGeocode({ latitude, longitude });
       }
@@ -894,12 +894,10 @@ export class MetadataService extends BaseService {
     };
   }
 
-  private hasGeo(tags: ImmichTags): tags is ImmichTags & { GPSLatitude: number; GPSLongitude: number } {
-    return (
-      tags.GPSLatitude !== undefined &&
-      tags.GPSLongitude !== undefined &&
-      (tags.GPSLatitude !== 0 || tags.GPSLatitude !== 0)
-    );
+  private hasGeo(tags: ImmichTags) {
+    const lat = Number(tags.GPSLatitude);
+    const lng = Number(tags.GPSLongitude);
+    return !Number.isNaN(lat) && !Number.isNaN(lng) && (lat !== 0 || lng !== 0);
   }
 
   private getAutoStackId(tags: ImmichTags | null): string | null {

From d94cb9641b79938dda3b4711e6e88a334249217b Mon Sep 17 00:00:00 2001
From: Jonathan S <gereeter+code@protonmail.com>
Date: Mon, 3 Nov 2025 08:35:56 -0600
Subject: [PATCH 23/84] chore: correct hosted isar paths in
 fdroid_build_isar.sh (#23529)

This should hopefully unblock F-Droid builds, which are a few versions behind.

Based on the suggestion in https://github.com/immich-app/immich/pull/22757#issuecomment-3404516987
---
 mobile/scripts/fdroid_build_isar.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/mobile/scripts/fdroid_build_isar.sh b/mobile/scripts/fdroid_build_isar.sh
index f42bc51d9a..a145268356 100755
--- a/mobile/scripts/fdroid_build_isar.sh
+++ b/mobile/scripts/fdroid_build_isar.sh
@@ -8,11 +8,11 @@ bash tool/build_android.sh x64
 bash tool/build_android.sh armv7
 bash tool/build_android.sh arm64
 mv libisar_android_arm64.so libisar.so
-mv libisar.so ../.pub-cache/hosted/pub.isar-community.dev/isar_flutter_libs-*/android/src/main/jniLibs/arm64-v8a/
+mv libisar.so ../.pub-cache/hosted/pub.dev/isar_community_flutter_libs-*/android/src/main/jniLibs/arm64-v8a/
 mv libisar_android_armv7.so libisar.so
-mv libisar.so ../.pub-cache/hosted/pub.isar-community.dev/isar_flutter_libs-*/android/src/main/jniLibs/armeabi-v7a/
+mv libisar.so ../.pub-cache/hosted/pub.dev/isar_community_flutter_libs-*/android/src/main/jniLibs/armeabi-v7a/
 mv libisar_android_x64.so libisar.so
-mv libisar.so ../.pub-cache/hosted/pub.isar-community.dev/isar_flutter_libs-*/android/src/main/jniLibs/x86_64/
+mv libisar.so ../.pub-cache/hosted/pub.dev/isar_community_flutter_libs-*/android/src/main/jniLibs/x86_64/
 mv libisar_android_x86.so libisar.so
-mv libisar.so ../.pub-cache/hosted/pub.isar-community.dev/isar_flutter_libs-*/android/src/main/jniLibs/x86/
-)
\ No newline at end of file
+mv libisar.so ../.pub-cache/hosted/pub.dev/isar_community_flutter_libs-*/android/src/main/jniLibs/x86/
+)

From b8087b4fa23ee7f0d2c0518aa34c4a3c110823e9 Mon Sep 17 00:00:00 2001
From: Alex <alex.tran1502@gmail.com>
Date: Mon, 3 Nov 2025 10:11:11 -0600
Subject: [PATCH 24/84] chore: ios prod build with correct argument, get
 version number from pubspec (#23554)

* chore: ios prod build with correct argument, get version number from pubspec

* Update mobile/ios/fastlane/Fastfile

Co-authored-by: bo0tzz <git@bo0tzz.me>

---------

Co-authored-by: bo0tzz <git@bo0tzz.me>
---
 misc/release/pump-version.sh |  1 -
 mobile/ios/fastlane/Fastfile | 17 +++++++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/misc/release/pump-version.sh b/misc/release/pump-version.sh
index 65a2e70e50..d0db83b946 100755
--- a/misc/release/pump-version.sh
+++ b/misc/release/pump-version.sh
@@ -88,7 +88,6 @@ if [ "$CURRENT_MOBILE" != "$NEXT_MOBILE" ]; then
 fi
 
 sed -i "s/\"android\.injected\.version\.name\" => \"$CURRENT_SERVER\",/\"android\.injected\.version\.name\" => \"$NEXT_SERVER\",/" mobile/android/fastlane/Fastfile
-sed -i "s/version_number: \"$CURRENT_SERVER\"$/version_number: \"$NEXT_SERVER\"/" mobile/ios/fastlane/Fastfile
 sed -i "s/\"android\.injected\.version\.code\" => $CURRENT_MOBILE,/\"android\.injected\.version\.code\" => $NEXT_MOBILE,/" mobile/android/fastlane/Fastfile
 sed -i "s/^version: $CURRENT_SERVER+$CURRENT_MOBILE$/version: $NEXT_SERVER+$NEXT_MOBILE/" mobile/pubspec.yaml
 
diff --git a/mobile/ios/fastlane/Fastfile b/mobile/ios/fastlane/Fastfile
index 8229c65534..c3dfea5f66 100644
--- a/mobile/ios/fastlane/Fastfile
+++ b/mobile/ios/fastlane/Fastfile
@@ -32,6 +32,17 @@ platform :ios do
     )
   end
   
+  # Helper method to get version from pubspec.yaml
+def get_version_from_pubspec
+  require 'yaml'
+  
+  pubspec_path = File.join(Dir.pwd, "../..", "pubspec.yaml")
+  pubspec = YAML.load_file(pubspec_path)
+  
+  version_string = pubspec['version']
+  version_string ? version_string.split('+').first : nil
+end
+  
   # Helper method to configure code signing for all targets
   def configure_code_signing(bundle_id_suffix: "")
     bundle_suffix = bundle_id_suffix.empty? ? "" : ".#{bundle_id_suffix}"
@@ -158,7 +169,8 @@ platform :ios do
     # Build and upload with version number
     build_and_upload(
       api_key: api_key,
-      version_number: "2.1.0"
+      version_number: get_version_from_pubspec,
+      distribute_external: false,
     )
   end
 
@@ -168,8 +180,9 @@ platform :ios do
       path: "./Runner.xcodeproj",
       targets: ["Runner", "ShareExtension", "WidgetExtension"]
     )
+
     increment_version_number(
-      version_number: "2.2.2"
+      version_number: get_version_from_pubspec
     )
     increment_build_number(
       build_number: latest_testflight_build_number + 1,

From 0647c22956d46b2c249d55680a6df5781014ae29 Mon Sep 17 00:00:00 2001
From: Sergey Katsubo <skatsubo@gmail.com>
Date: Tue, 4 Nov 2025 06:09:18 +0300
Subject: [PATCH 25/84] fix(mobile): handle empty original filename (#23469)

* Handle empty original filename

* Handle TypeError from photo_manager titleAsync

* More compact exception log
---
 mobile/lib/repositories/asset_media.repository.dart | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/mobile/lib/repositories/asset_media.repository.dart b/mobile/lib/repositories/asset_media.repository.dart
index e377ff22d6..2e4bdfd32c 100644
--- a/mobile/lib/repositories/asset_media.repository.dart
+++ b/mobile/lib/repositories/asset_media.repository.dart
@@ -89,9 +89,16 @@ class AssetMediaRepository {
       return null;
     }
 
-    // titleAsync gets the correct original filename for some assets on iOS
-    // otherwise using the `entity.title` would return a random GUID
-    return await entity.titleAsync;
+    try {
+      // titleAsync gets the correct original filename for some assets on iOS
+      // otherwise using the `entity.title` would return a random GUID
+      final originalFilename = await entity.titleAsync;
+      // treat empty filename as missing
+      return originalFilename.isNotEmpty ? originalFilename : null;
+    } catch (e) {
+      _log.warning("Failed to get original filename for asset: $id. Error: $e");
+      return null;
+    }
   }
 
   // TODO: make this more efficient

From 1e4779cf4898a6f27949a684c3a5c5dd45bc403f Mon Sep 17 00:00:00 2001
From: Brandon Wees <brandonwees@gmail.com>
Date: Mon, 3 Nov 2025 21:09:32 -0600
Subject: [PATCH 26/84] fix(mobile): ignore patch releases for app version
 alerts (#23565)

* fix(mobile): ignore patch releases for app version alerts

* chore: make difference type nullable to indicate when versions match

* chore: add error handling for semver parsing

* chore: tests
---
 .../lib/providers/server_info.provider.dart   |  2 +-
 mobile/lib/utils/semver.dart                  | 30 +++++-
 mobile/test/utils/semver_test.dart            | 92 +++++++++++++++++++
 3 files changed, 122 insertions(+), 2 deletions(-)
 create mode 100644 mobile/test/utils/semver_test.dart

diff --git a/mobile/lib/providers/server_info.provider.dart b/mobile/lib/providers/server_info.provider.dart
index 7a424c332d..9619ba86a1 100644
--- a/mobile/lib/providers/server_info.provider.dart
+++ b/mobile/lib/providers/server_info.provider.dart
@@ -67,7 +67,7 @@ class ServerInfoNotifier extends StateNotifier<ServerInfo> {
       return;
     }
 
-    if (clientVersion < serverVersion) {
+    if (clientVersion < serverVersion && clientVersion.differenceType(serverVersion) != SemVerType.patch) {
       state = state.copyWith(versionStatus: VersionStatus.clientOutOfDate);
       return;
     }
diff --git a/mobile/lib/utils/semver.dart b/mobile/lib/utils/semver.dart
index 0eb6726b65..aebfd2fe4c 100644
--- a/mobile/lib/utils/semver.dart
+++ b/mobile/lib/utils/semver.dart
@@ -1,3 +1,5 @@
+enum SemVerType { major, minor, patch }
+
 class SemVer {
   final int major;
   final int minor;
@@ -15,8 +17,20 @@ class SemVer {
   }
 
   factory SemVer.fromString(String version) {
+    if (version.toLowerCase().startsWith("v")) {
+      version = version.substring(1);
+    }
+
     final parts = version.split("-")[0].split('.');
-    return SemVer(major: int.parse(parts[0]), minor: int.parse(parts[1]), patch: int.parse(parts[2]));
+    if (parts.length != 3) {
+      throw FormatException('Invalid semantic version string: $version');
+    }
+
+    try {
+      return SemVer(major: int.parse(parts[0]), minor: int.parse(parts[1]), patch: int.parse(parts[2]));
+    } catch (e) {
+      throw FormatException('Invalid semantic version string: $version');
+    }
   }
 
   bool operator >(SemVer other) {
@@ -54,6 +68,20 @@ class SemVer {
     return other is SemVer && other.major == major && other.minor == minor && other.patch == patch;
   }
 
+  SemVerType? differenceType(SemVer other) {
+    if (major != other.major) {
+      return SemVerType.major;
+    }
+    if (minor != other.minor) {
+      return SemVerType.minor;
+    }
+    if (patch != other.patch) {
+      return SemVerType.patch;
+    }
+
+    return null;
+  }
+
   @override
   int get hashCode => major.hashCode ^ minor.hashCode ^ patch.hashCode;
 }
diff --git a/mobile/test/utils/semver_test.dart b/mobile/test/utils/semver_test.dart
new file mode 100644
index 0000000000..8f1958a879
--- /dev/null
+++ b/mobile/test/utils/semver_test.dart
@@ -0,0 +1,92 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:immich_mobile/utils/semver.dart';
+
+void main() {
+  group('SemVer', () {
+    test('Parses valid semantic version strings correctly', () {
+      final version = SemVer.fromString('1.2.3');
+      expect(version.major, 1);
+      expect(version.minor, 2);
+      expect(version.patch, 3);
+    });
+
+    test('Throws FormatException for invalid version strings', () {
+      expect(() => SemVer.fromString('1.2'), throwsFormatException);
+      expect(() => SemVer.fromString('a.b.c'), throwsFormatException);
+      expect(() => SemVer.fromString('1.2.3.4'), throwsFormatException);
+    });
+
+    test('Compares equal versons correctly', () {
+      final v1 = SemVer.fromString('1.2.3');
+      final v2 = SemVer.fromString('1.2.3');
+      expect(v1 == v2, isTrue);
+      expect(v1 > v2, isFalse);
+      expect(v1 < v2, isFalse);
+    });
+
+    test('Compares major version correctly', () {
+      final v1 = SemVer.fromString('2.0.0');
+      final v2 = SemVer.fromString('1.9.9');
+      expect(v1 == v2, isFalse);
+      expect(v1 > v2, isTrue);
+      expect(v1 < v2, isFalse);
+    });
+
+    test('Compares minor version correctly', () {
+      final v1 = SemVer.fromString('1.3.0');
+      final v2 = SemVer.fromString('1.2.9');
+      expect(v1 == v2, isFalse);
+      expect(v1 > v2, isTrue);
+      expect(v1 < v2, isFalse);
+    });
+
+    test('Compares patch version correctly', () {
+      final v1 = SemVer.fromString('1.2.4');
+      final v2 = SemVer.fromString('1.2.3');
+      expect(v1 == v2, isFalse);
+      expect(v1 > v2, isTrue);
+      expect(v1 < v2, isFalse);
+    });
+
+    test('Gives correct major difference type', () {
+      final v1 = SemVer.fromString('2.0.0');
+      final v2 = SemVer.fromString('1.9.9');
+      expect(v1.differenceType(v2), SemVerType.major);
+    });
+
+    test('Gives correct minor difference type', () {
+      final v1 = SemVer.fromString('1.3.0');
+      final v2 = SemVer.fromString('1.2.9');
+      expect(v1.differenceType(v2), SemVerType.minor);
+    });
+
+    test('Gives correct patch difference type', () {
+      final v1 = SemVer.fromString('1.2.4');
+      final v2 = SemVer.fromString('1.2.3');
+      expect(v1.differenceType(v2), SemVerType.patch);
+    });
+
+    test('Gives null difference type for equal versions', () {
+      final v1 = SemVer.fromString('1.2.3');
+      final v2 = SemVer.fromString('1.2.3');
+      expect(v1.differenceType(v2), isNull);
+    });
+
+    test('toString returns correct format', () {
+      final version = SemVer.fromString('1.2.3');
+      expect(version.toString(), '1.2.3');
+    });
+
+    test('Parses versions with leading v correctly', () {
+      final version1 = SemVer.fromString('v1.2.3');
+      expect(version1.major, 1);
+      expect(version1.minor, 2);
+      expect(version1.patch, 3);
+
+      final version2 = SemVer.fromString('V1.2.3');
+      expect(version2.major, 1);
+      expect(version2.minor, 2);
+      expect(version2.patch, 3);
+    });
+  });
+}

From 28eb1bc13cfd4642fe90fd8cf724ba7acf94f675 Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 4 Nov 2025 03:14:34 +0000
Subject: [PATCH 27/84] chore: version v2.2.3

---
 cli/package.json                            | 2 +-
 docs/static/archived-versions.json          | 4 ++++
 e2e/package.json                            | 2 +-
 machine-learning/pyproject.toml             | 2 +-
 mobile/android/fastlane/Fastfile            | 4 ++--
 mobile/openapi/README.md                    | 2 +-
 mobile/pubspec.yaml                         | 2 +-
 open-api/immich-openapi-specs.json          | 2 +-
 open-api/typescript-sdk/package.json        | 2 +-
 open-api/typescript-sdk/src/fetch-client.ts | 2 +-
 server/package.json                         | 2 +-
 web/package.json                            | 2 +-
 12 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/cli/package.json b/cli/package.json
index 0dc0136cf2..49b6767542 100644
--- a/cli/package.json
+++ b/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@immich/cli",
-  "version": "2.2.100",
+  "version": "2.2.101",
   "description": "Command Line Interface (CLI) for Immich",
   "type": "module",
   "exports": "./dist/index.js",
diff --git a/docs/static/archived-versions.json b/docs/static/archived-versions.json
index 1d50ae54f8..6affb532c9 100644
--- a/docs/static/archived-versions.json
+++ b/docs/static/archived-versions.json
@@ -1,4 +1,8 @@
 [
+  {
+    "label": "v2.2.3",
+    "url": "https://docs.v2.2.3.archive.immich.app"
+  },
   {
     "label": "v2.2.2",
     "url": "https://docs.v2.2.2.archive.immich.app"
diff --git a/e2e/package.json b/e2e/package.json
index a6721a1bec..a070f16181 100644
--- a/e2e/package.json
+++ b/e2e/package.json
@@ -1,6 +1,6 @@
 {
   "name": "immich-e2e",
-  "version": "2.2.2",
+  "version": "2.2.3",
   "description": "",
   "main": "index.js",
   "type": "module",
diff --git a/machine-learning/pyproject.toml b/machine-learning/pyproject.toml
index 1d36648c3d..a93ab1c2af 100644
--- a/machine-learning/pyproject.toml
+++ b/machine-learning/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "immich-ml"
-version = "2.2.2"
+version = "2.2.3"
 description = ""
 authors = [{ name = "Hau Tran", email = "alex.tran1502@gmail.com" }]
 requires-python = ">=3.10,<4.0"
diff --git a/mobile/android/fastlane/Fastfile b/mobile/android/fastlane/Fastfile
index 1c22a83dc3..6b9ce07465 100644
--- 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" => 3025,
-        "android.injected.version.name" => "2.2.2",
+        "android.injected.version.code" => 3026,
+        "android.injected.version.name" => "2.2.3",
       }
     )
     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')
diff --git a/mobile/openapi/README.md b/mobile/openapi/README.md
index efde847034..85ec031736 100644
--- 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.2.2
+- API version: 2.2.3
 - Generator version: 7.8.0
 - Build package: org.openapitools.codegen.languages.DartClientCodegen
 
diff --git a/mobile/pubspec.yaml b/mobile/pubspec.yaml
index b47038b7e5..617516b94a 100644
--- 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.2.2+3025
+version: 2.2.3+3026
 
 environment:
   sdk: '>=3.8.0 <4.0.0'
diff --git a/open-api/immich-openapi-specs.json b/open-api/immich-openapi-specs.json
index f2b225769a..d16e4c4e10 100644
--- a/open-api/immich-openapi-specs.json
+++ b/open-api/immich-openapi-specs.json
@@ -10006,7 +10006,7 @@
   "info": {
     "title": "Immich",
     "description": "Immich API",
-    "version": "2.2.2",
+    "version": "2.2.3",
     "contact": {}
   },
   "tags": [],
diff --git a/open-api/typescript-sdk/package.json b/open-api/typescript-sdk/package.json
index 9e62898cee..50499278a2 100644
--- a/open-api/typescript-sdk/package.json
+++ b/open-api/typescript-sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@immich/sdk",
-  "version": "2.2.2",
+  "version": "2.2.3",
   "description": "Auto-generated TypeScript SDK for the Immich API",
   "type": "module",
   "main": "./build/index.js",
diff --git a/open-api/typescript-sdk/src/fetch-client.ts b/open-api/typescript-sdk/src/fetch-client.ts
index f6a68ee8df..435e10046a 100644
--- a/open-api/typescript-sdk/src/fetch-client.ts
+++ b/open-api/typescript-sdk/src/fetch-client.ts
@@ -1,6 +1,6 @@
 /**
  * Immich
- * 2.2.2
+ * 2.2.3
  * DO NOT MODIFY - This file has been generated using oazapfts.
  * See https://www.npmjs.com/package/oazapfts
  */
diff --git a/server/package.json b/server/package.json
index 69fb98d0ed..9ec7351e1f 100644
--- a/server/package.json
+++ b/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "immich",
-  "version": "2.2.2",
+  "version": "2.2.3",
   "description": "",
   "author": "",
   "private": true,
diff --git a/web/package.json b/web/package.json
index dd582af438..24d489a7d8 100644
--- a/web/package.json
+++ b/web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "immich-web",
-  "version": "2.2.2",
+  "version": "2.2.3",
   "license": "GNU Affero General Public License version 3",
   "type": "module",
   "scripts": {

From cad654586f6d4845752e44d993e51b825617e5fc Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 4 Nov 2025 11:47:54 +0100
Subject: [PATCH 28/84] chore(deps): update dependency @types/node to ^22.18.13
 (#23581)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 cli/package.json                     | 2 +-
 e2e/package.json                     | 2 +-
 open-api/typescript-sdk/package.json | 2 +-
 pnpm-lock.yaml                       | 8 ++++----
 server/package.json                  | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/cli/package.json b/cli/package.json
index 49b6767542..83be681284 100644
--- a/cli/package.json
+++ b/cli/package.json
@@ -20,7 +20,7 @@
     "@types/lodash-es": "^4.17.12",
     "@types/micromatch": "^4.0.9",
     "@types/mock-fs": "^4.13.1",
-    "@types/node": "^22.18.12",
+    "@types/node": "^22.18.13",
     "@vitest/coverage-v8": "^3.0.0",
     "byte-size": "^9.0.0",
     "cli-progress": "^3.12.0",
diff --git a/e2e/package.json b/e2e/package.json
index a070f16181..b94fd7f6e2 100644
--- a/e2e/package.json
+++ b/e2e/package.json
@@ -25,7 +25,7 @@
     "@playwright/test": "^1.44.1",
     "@socket.io/component-emitter": "^3.1.2",
     "@types/luxon": "^3.4.2",
-    "@types/node": "^22.18.12",
+    "@types/node": "^22.18.13",
     "@types/oidc-provider": "^9.0.0",
     "@types/pg": "^8.15.1",
     "@types/pngjs": "^6.0.4",
diff --git a/open-api/typescript-sdk/package.json b/open-api/typescript-sdk/package.json
index 50499278a2..a751bb7d1b 100644
--- a/open-api/typescript-sdk/package.json
+++ b/open-api/typescript-sdk/package.json
@@ -19,7 +19,7 @@
     "@oazapfts/runtime": "^1.0.2"
   },
   "devDependencies": {
-    "@types/node": "^22.18.12",
+    "@types/node": "^22.18.13",
     "typescript": "^5.3.3"
   },
   "repository": {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 6faccf6ab6..463c7ccb46 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -63,7 +63,7 @@ importers:
         specifier: ^4.13.1
         version: 4.13.4
       '@types/node':
-        specifier: ^22.18.12
+        specifier: ^22.18.13
         version: 22.18.13
       '@vitest/coverage-v8':
         specifier: ^3.0.0
@@ -211,7 +211,7 @@ importers:
         specifier: ^3.4.2
         version: 3.7.1
       '@types/node':
-        specifier: ^22.18.12
+        specifier: ^22.18.13
         version: 22.18.13
       '@types/oidc-provider':
         specifier: ^9.0.0
@@ -293,7 +293,7 @@ importers:
         version: 1.0.4
     devDependencies:
       '@types/node':
-        specifier: ^22.18.12
+        specifier: ^22.18.13
         version: 22.18.13
       typescript:
         specifier: ^5.3.3
@@ -582,7 +582,7 @@ importers:
         specifier: ^2.0.0
         version: 2.0.0
       '@types/node':
-        specifier: ^22.18.12
+        specifier: ^22.18.13
         version: 22.18.13
       '@types/nodemailer':
         specifier: ^7.0.0
diff --git a/server/package.json b/server/package.json
index 9ec7351e1f..5b36efb2c4 100644
--- a/server/package.json
+++ b/server/package.json
@@ -129,7 +129,7 @@
     "@types/luxon": "^3.6.2",
     "@types/mock-fs": "^4.13.1",
     "@types/multer": "^2.0.0",
-    "@types/node": "^22.18.12",
+    "@types/node": "^22.18.13",
     "@types/nodemailer": "^7.0.0",
     "@types/picomatch": "^4.0.0",
     "@types/pngjs": "^6.0.5",

From 821a9d4691a97e4dbec7db062d9dd516de252546 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 4 Nov 2025 11:48:21 +0100
Subject: [PATCH 29/84] chore(deps): update redis:6.2-alpine docker digest to
 37e0024 (#23579)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 e2e/docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/e2e/docker-compose.yml b/e2e/docker-compose.yml
index 9aef2288f6..3d62c8a34a 100644
--- a/e2e/docker-compose.yml
+++ b/e2e/docker-compose.yml
@@ -35,7 +35,7 @@ services:
       - 2285:2285
 
   redis:
-    image: redis:6.2-alpine@sha256:77697a75da9f94e9357b61fcaf8345f69e3d9d32e9d15032c8415c21263977dc
+    image: redis:6.2-alpine@sha256:37e002448575b32a599109664107e374c8709546905c372a34d64919043b9ceb
 
   database:
     image: ghcr.io/immich-app/postgres:14-vectorchord0.3.0@sha256:6f3e9d2c2177af16c2988ff71425d79d89ca630ec2f9c8db03209ab716542338

From f396e9e3744f1ed67a645be31d67bac335553ea7 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 4 Nov 2025 11:49:12 +0100
Subject: [PATCH 30/84] chore(deps): update prom/prometheus docker digest to
 4921475 (#23578)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 docker/docker-compose.prod.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/docker-compose.prod.yml b/docker/docker-compose.prod.yml
index a8c0de7454..e01f4ead22 100644
--- a/docker/docker-compose.prod.yml
+++ b/docker/docker-compose.prod.yml
@@ -83,7 +83,7 @@ services:
     container_name: immich_prometheus
     ports:
       - 9090:9090
-    image: prom/prometheus@sha256:23031bfe0e74a13004252caaa74eccd0d62b6c6e7a04711d5b8bf5b7e113adc7
+    image: prom/prometheus@sha256:49214755b6153f90a597adcbff0252cc61069f8ab69ce8411285cd4a560e8038
     volumes:
       - ./prometheus.yml:/etc/prometheus/prometheus.yml
       - prometheus-data:/prometheus

From c34be73d817d33721961cb0a6d0ba5299ee968cc Mon Sep 17 00:00:00 2001
From: Mees Frensel <33722705+meesfrensel@users.noreply.github.com>
Date: Tue, 4 Nov 2025 12:12:47 +0100
Subject: [PATCH 31/84] fix(web): consistently use mdiMotionPauseOutline icon
 (#23595)

---
 .../asset-viewer/actions/motion-photo-action.svelte           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/src/lib/components/asset-viewer/actions/motion-photo-action.svelte b/web/src/lib/components/asset-viewer/actions/motion-photo-action.svelte
index 440cdeb2a6..ee09c2976b 100644
--- a/web/src/lib/components/asset-viewer/actions/motion-photo-action.svelte
+++ b/web/src/lib/components/asset-viewer/actions/motion-photo-action.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import { IconButton } from '@immich/ui';
-  import { mdiMotionPauseOutline, mdiPlaySpeed } from '@mdi/js';
+  import { mdiMotionPauseOutline, mdiMotionPlayOutline } from '@mdi/js';
   import { t } from 'svelte-i18n';
 
   interface Props {
@@ -15,7 +15,7 @@
   color="secondary"
   variant="ghost"
   shape="round"
-  icon={isPlaying ? mdiMotionPauseOutline : mdiPlaySpeed}
+  icon={isPlaying ? mdiMotionPauseOutline : mdiMotionPlayOutline}
   aria-label={isPlaying ? $t('stop_motion_photo') : $t('play_motion_photo')}
   onclick={() => onClick(!isPlaying)}
 />

From 0df70365d725e128530fac8a09f092e72b7f54a7 Mon Sep 17 00:00:00 2001
From: Jason Rasmussen <jason@rasm.me>
Date: Tue, 4 Nov 2025 16:03:02 -0500
Subject: [PATCH 32/84] feat: exif medium tests (#23561)

---
 .github/workflows/test.yml                    |   1 +
 e2e/src/api/specs/asset.e2e-spec.ts           | 450 ------------------
 e2e/src/generate-date-tag-test-images.ts      | 178 -------
 e2e/test-assets                               |   2 +-
 server/src/services/metadata.service.spec.ts  |  16 +-
 server/src/services/metadata.service.ts       |  29 +-
 server/test/medium.factory.ts                 |  74 +++
 .../medium/specs/exif/exif-date-time.spec.ts  |  65 +++
 .../test/medium/specs/exif/exif-gps.spec.ts   |  31 ++
 .../test/medium/specs/exif/exif-tags.spec.ts  |  34 ++
 .../specs/services/metadata.service.spec.ts   |  36 --
 11 files changed, 234 insertions(+), 682 deletions(-)
 delete mode 100644 e2e/src/generate-date-tag-test-images.ts
 create mode 100644 server/test/medium/specs/exif/exif-date-time.spec.ts
 create mode 100644 server/test/medium/specs/exif/exif-gps.spec.ts
 create mode 100644 server/test/medium/specs/exif/exif-tags.spec.ts

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 8c7eae6532..0a63046c0e 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -382,6 +382,7 @@ jobs:
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
+          submodules: 'recursive'
           token: ${{ steps.token.outputs.token }}
       - name: Setup pnpm
         uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
diff --git a/e2e/src/api/specs/asset.e2e-spec.ts b/e2e/src/api/specs/asset.e2e-spec.ts
index 90d51e7fef..ab3252c40b 100644
--- a/e2e/src/api/specs/asset.e2e-spec.ts
+++ b/e2e/src/api/specs/asset.e2e-spec.ts
@@ -15,7 +15,6 @@ import { DateTime } from 'luxon';
 import { randomBytes } from 'node:crypto';
 import { readFile, writeFile } from 'node:fs/promises';
 import { basename, join } from 'node:path';
-import sharp from 'sharp';
 import { Socket } from 'socket.io-client';
 import { createUserDto, uuidDto } from 'src/fixtures';
 import { makeRandomImage } from 'src/generators';
@@ -41,40 +40,6 @@ const today = DateTime.fromObject({
 }) as DateTime<true>;
 const yesterday = today.minus({ days: 1 });
 
-const createTestImageWithExif = async (filename: string, exifData: Record<string, any>) => {
-  // Generate unique color to ensure different checksums for each image
-  const r = Math.floor(Math.random() * 256);
-  const g = Math.floor(Math.random() * 256);
-  const b = Math.floor(Math.random() * 256);
-
-  // Create a 100x100 solid color JPEG using Sharp
-  const imageBytes = await sharp({
-    create: {
-      width: 100,
-      height: 100,
-      channels: 3,
-      background: { r, g, b },
-    },
-  })
-    .jpeg({ quality: 90 })
-    .toBuffer();
-
-  // Add random suffix to filename to avoid collisions
-  const uniqueFilename = filename.replace('.jpg', `-${randomBytes(4).toString('hex')}.jpg`);
-  const filepath = join(tempDir, uniqueFilename);
-  await writeFile(filepath, imageBytes);
-
-  // Filter out undefined values before writing EXIF
-  const cleanExifData = Object.fromEntries(Object.entries(exifData).filter(([, value]) => value !== undefined));
-
-  await exiftool.write(filepath, cleanExifData);
-
-  // Re-read the image bytes after EXIF has been written
-  const finalImageBytes = await readFile(filepath);
-
-  return { filepath, imageBytes: finalImageBytes, filename: uniqueFilename };
-};
-
 describe('/asset', () => {
   let admin: LoginResponseDto;
   let websocket: Socket;
@@ -1140,16 +1105,6 @@ describe('/asset', () => {
           },
         },
       },
-      {
-        input: 'metadata/gps-position/empty_gps.jpg',
-        expected: {
-          type: AssetTypeEnum.Image,
-          exifInfo: {
-            latitude: null,
-            longitude: null,
-          },
-        },
-      },
     ];
 
     it.each(tests)(`should upload and generate a thumbnail for different file types`, async ({ input, expected }) => {
@@ -1259,411 +1214,6 @@ describe('/asset', () => {
     });
   });
 
-  describe('EXIF metadata extraction', () => {
-    describe('Additional date tag extraction', () => {
-      describe('Date-time vs time-only tag handling', () => {
-        it('should fall back to file timestamps when only time-only tags are available', async () => {
-          const { imageBytes, filename } = await createTestImageWithExif('time-only-fallback.jpg', {
-            TimeCreated: '2023:11:15 14:30:00', // Time-only tag, should not be used for dateTimeOriginal
-            // Exclude all date-time tags to force fallback to file timestamps
-            SubSecDateTimeOriginal: undefined,
-            DateTimeOriginal: undefined,
-            SubSecCreateDate: undefined,
-            SubSecMediaCreateDate: undefined,
-            CreateDate: undefined,
-            MediaCreateDate: undefined,
-            CreationDate: undefined,
-            DateTimeCreated: undefined,
-            GPSDateTime: undefined,
-            DateTimeUTC: undefined,
-            SonyDateTime2: undefined,
-            GPSDateStamp: undefined,
-          });
-
-          const oldDate = new Date('2020-01-01T00:00:00.000Z');
-          const asset = await utils.createAsset(admin.accessToken, {
-            assetData: {
-              filename,
-              bytes: imageBytes,
-            },
-            fileCreatedAt: oldDate.toISOString(),
-            fileModifiedAt: oldDate.toISOString(),
-          });
-
-          await utils.waitForWebsocketEvent({ event: 'assetUpload', id: asset.id });
-
-          const assetInfo = await getAssetInfo({ id: asset.id }, { headers: asBearerAuth(admin.accessToken) });
-
-          expect(assetInfo.exifInfo?.dateTimeOriginal).toBeDefined();
-          // Should fall back to file timestamps, which we set to 2020-01-01
-          expect(new Date(assetInfo.exifInfo!.dateTimeOriginal!).getTime()).toBe(
-            new Date('2020-01-01T00:00:00.000Z').getTime(),
-          );
-        });
-
-        it('should prefer DateTimeOriginal over time-only tags', async () => {
-          const { imageBytes, filename } = await createTestImageWithExif('datetime-over-time.jpg', {
-            DateTimeOriginal: '2023:10:10 10:00:00', // Should be preferred
-            TimeCreated: '2023:11:15 14:30:00', // Should be ignored (time-only)
-          });
-
-          const asset = await utils.createAsset(admin.accessToken, {
-            assetData: {
-              filename,
-              bytes: imageBytes,
-            },
-          });
-
-          await utils.waitForWebsocketEvent({ event: 'assetUpload', id: asset.id });
-
-          const assetInfo = await getAssetInfo({ id: asset.id }, { headers: asBearerAuth(admin.accessToken) });
-
-          expect(assetInfo.exifInfo?.dateTimeOriginal).toBeDefined();
-          // Should use DateTimeOriginal, not TimeCreated
-          expect(new Date(assetInfo.exifInfo!.dateTimeOriginal!).getTime()).toBe(
-            new Date('2023-10-10T10:00:00.000Z').getTime(),
-          );
-        });
-      });
-
-      describe('GPSDateTime tag extraction', () => {
-        it('should extract GPSDateTime with GPS coordinates', async () => {
-          const { imageBytes, filename } = await createTestImageWithExif('gps-datetime.jpg', {
-            GPSDateTime: '2023:11:15 12:30:00Z',
-            GPSLatitude: 37.7749,
-            GPSLongitude: -122.4194,
-            // Exclude other date tags
-            SubSecDateTimeOriginal: undefined,
-            DateTimeOriginal: undefined,
-            SubSecCreateDate: undefined,
-            SubSecMediaCreateDate: undefined,
-            CreateDate: undefined,
-            MediaCreateDate: undefined,
-            CreationDate: undefined,
-            DateTimeCreated: undefined,
-            TimeCreated: undefined,
-          });
-
-          const asset = await utils.createAsset(admin.accessToken, {
-            assetData: {
-              filename,
-              bytes: imageBytes,
-            },
-          });
-
-          await utils.waitForWebsocketEvent({ event: 'assetUpload', id: asset.id });
-
-          const assetInfo = await getAssetInfo({ id: asset.id }, { headers: asBearerAuth(admin.accessToken) });
-
-          expect(assetInfo.exifInfo?.dateTimeOriginal).toBeDefined();
-          expect(assetInfo.exifInfo?.latitude).toBeCloseTo(37.7749, 4);
-          expect(assetInfo.exifInfo?.longitude).toBeCloseTo(-122.4194, 4);
-          expect(new Date(assetInfo.exifInfo!.dateTimeOriginal!).getTime()).toBe(
-            new Date('2023-11-15T12:30:00.000Z').getTime(),
-          );
-        });
-      });
-
-      describe('CreateDate tag extraction', () => {
-        it('should extract CreateDate when available', async () => {
-          const { imageBytes, filename } = await createTestImageWithExif('create-date.jpg', {
-            CreateDate: '2023:11:15 10:30:00',
-            // Exclude other higher priority date tags
-            SubSecDateTimeOriginal: undefined,
-            DateTimeOriginal: undefined,
-            SubSecCreateDate: undefined,
-            SubSecMediaCreateDate: undefined,
-            MediaCreateDate: undefined,
-            CreationDate: undefined,
-            DateTimeCreated: undefined,
-            TimeCreated: undefined,
-            GPSDateTime: undefined,
-          });
-
-          const asset = await utils.createAsset(admin.accessToken, {
-            assetData: {
-              filename,
-              bytes: imageBytes,
-            },
-          });
-
-          await utils.waitForWebsocketEvent({ event: 'assetUpload', id: asset.id });
-
-          const assetInfo = await getAssetInfo({ id: asset.id }, { headers: asBearerAuth(admin.accessToken) });
-
-          expect(assetInfo.exifInfo?.dateTimeOriginal).toBeDefined();
-          expect(new Date(assetInfo.exifInfo!.dateTimeOriginal!).getTime()).toBe(
-            new Date('2023-11-15T10:30:00.000Z').getTime(),
-          );
-        });
-      });
-
-      describe('GPSDateStamp tag extraction', () => {
-        it('should fall back to file timestamps when only date-only tags are available', async () => {
-          const { imageBytes, filename } = await createTestImageWithExif('gps-datestamp.jpg', {
-            GPSDateStamp: '2023:11:15', // Date-only tag, should not be used for dateTimeOriginal
-            // Note: NOT including GPSTimeStamp to avoid automatic GPSDateTime creation
-            GPSLatitude: 51.5074,
-            GPSLongitude: -0.1278,
-            // Explicitly exclude all testable date-time tags to force fallback to file timestamps
-            DateTimeOriginal: undefined,
-            CreateDate: undefined,
-            CreationDate: undefined,
-            GPSDateTime: undefined,
-          });
-
-          const oldDate = new Date('2020-01-01T00:00:00.000Z');
-          const asset = await utils.createAsset(admin.accessToken, {
-            assetData: {
-              filename,
-              bytes: imageBytes,
-            },
-            fileCreatedAt: oldDate.toISOString(),
-            fileModifiedAt: oldDate.toISOString(),
-          });
-
-          await utils.waitForWebsocketEvent({ event: 'assetUpload', id: asset.id });
-
-          const assetInfo = await getAssetInfo({ id: asset.id }, { headers: asBearerAuth(admin.accessToken) });
-
-          expect(assetInfo.exifInfo?.dateTimeOriginal).toBeDefined();
-          expect(assetInfo.exifInfo?.latitude).toBeCloseTo(51.5074, 4);
-          expect(assetInfo.exifInfo?.longitude).toBeCloseTo(-0.1278, 4);
-          // Should fall back to file timestamps, which we set to 2020-01-01
-          expect(new Date(assetInfo.exifInfo!.dateTimeOriginal!).getTime()).toBe(
-            new Date('2020-01-01T00:00:00.000Z').getTime(),
-          );
-        });
-      });
-
-      /*
-       * NOTE: The following EXIF date tags are NOT effectively usable with JPEG test files:
-       *
-       * NOT WRITABLE to JPEG:
-       * - MediaCreateDate: Can be read from video files but not written to JPEG
-       * - DateTimeCreated: Read-only tag in JPEG format
-       * - DateTimeUTC: Cannot be written to JPEG files
-       * - SonyDateTime2: Proprietary Sony tag, not writable to JPEG
-       * - SubSecMediaCreateDate: Tag not defined for JPEG format
-       * - SourceImageCreateTime: Non-standard insta360 tag, not writable to JPEG
-       *
-       * WRITABLE but NOT READABLE from JPEG:
-       * - SubSecDateTimeOriginal: Can be written but not read back from JPEG
-       * - SubSecCreateDate: Can be written but not read back from JPEG
-       *
-       * EFFECTIVELY TESTABLE TAGS (writable and readable):
-       * - DateTimeOriginal ✓
-       * - CreateDate ✓
-       * - CreationDate ✓
-       * - GPSDateTime ✓
-       *
-       * The metadata service correctly handles non-readable tags and will fall back to
-       * file timestamps when only non-readable tags are present.
-       */
-
-      describe('Date tag priority order', () => {
-        it('should respect the complete date tag priority order', async () => {
-          // Test cases using only EFFECTIVELY TESTABLE tags (writable AND readable from JPEG)
-          const testCases = [
-            {
-              name: 'DateTimeOriginal has highest priority among testable tags',
-              exifData: {
-                DateTimeOriginal: '2023:04:04 04:00:00', // TESTABLE - highest priority among readable tags
-                CreateDate: '2023:05:05 05:00:00', // TESTABLE
-                CreationDate: '2023:07:07 07:00:00', // TESTABLE
-                GPSDateTime: '2023:10:10 10:00:00', // TESTABLE
-              },
-              expectedDate: '2023-04-04T04:00:00.000Z',
-            },
-            {
-              name: 'CreationDate when DateTimeOriginal missing',
-              exifData: {
-                CreationDate: '2023:05:05 05:00:00', // TESTABLE
-                CreateDate: '2023:07:07 07:00:00', // TESTABLE
-                GPSDateTime: '2023:10:10 10:00:00', // TESTABLE
-              },
-              expectedDate: '2023-05-05T05:00:00.000Z',
-            },
-            {
-              name: 'CreationDate when standard EXIF tags missing',
-              exifData: {
-                CreationDate: '2023:07:07 07:00:00', // TESTABLE
-                GPSDateTime: '2023:10:10 10:00:00', // TESTABLE
-              },
-              expectedDate: '2023-07-07T07:00:00.000Z',
-            },
-            {
-              name: 'GPSDateTime when no other testable date tags present',
-              exifData: {
-                GPSDateTime: '2023:10:10 10:00:00', // TESTABLE
-                Make: 'SONY',
-              },
-              expectedDate: '2023-10-10T10:00:00.000Z',
-            },
-          ];
-
-          for (const testCase of testCases) {
-            const { imageBytes, filename } = await createTestImageWithExif(
-              `${testCase.name.replaceAll(/\s+/g, '-').toLowerCase()}.jpg`,
-              testCase.exifData,
-            );
-
-            const asset = await utils.createAsset(admin.accessToken, {
-              assetData: {
-                filename,
-                bytes: imageBytes,
-              },
-            });
-
-            await utils.waitForWebsocketEvent({ event: 'assetUpload', id: asset.id });
-
-            const assetInfo = await getAssetInfo({ id: asset.id }, { headers: asBearerAuth(admin.accessToken) });
-
-            expect(assetInfo.exifInfo?.dateTimeOriginal, `Failed for: ${testCase.name}`).toBeDefined();
-            expect(
-              new Date(assetInfo.exifInfo!.dateTimeOriginal!).getTime(),
-              `Date mismatch for: ${testCase.name}`,
-            ).toBe(new Date(testCase.expectedDate).getTime());
-          }
-        });
-      });
-
-      describe('Edge cases for date tag handling', () => {
-        it('should fall back to file timestamps with GPSDateStamp alone', async () => {
-          const { imageBytes, filename } = await createTestImageWithExif('gps-datestamp-only.jpg', {
-            GPSDateStamp: '2023:08:08', // Date-only tag, should not be used for dateTimeOriginal
-            // Intentionally no GPSTimeStamp
-            // Exclude all other date tags
-            SubSecDateTimeOriginal: undefined,
-            DateTimeOriginal: undefined,
-            SubSecCreateDate: undefined,
-            SubSecMediaCreateDate: undefined,
-            CreateDate: undefined,
-            MediaCreateDate: undefined,
-            CreationDate: undefined,
-            DateTimeCreated: undefined,
-            TimeCreated: undefined,
-            GPSDateTime: undefined,
-            DateTimeUTC: undefined,
-          });
-
-          const oldDate = new Date('2020-01-01T00:00:00.000Z');
-          const asset = await utils.createAsset(admin.accessToken, {
-            assetData: {
-              filename,
-              bytes: imageBytes,
-            },
-            fileCreatedAt: oldDate.toISOString(),
-            fileModifiedAt: oldDate.toISOString(),
-          });
-
-          await utils.waitForWebsocketEvent({ event: 'assetUpload', id: asset.id });
-
-          const assetInfo = await getAssetInfo({ id: asset.id }, { headers: asBearerAuth(admin.accessToken) });
-
-          expect(assetInfo.exifInfo?.dateTimeOriginal).toBeDefined();
-          // Should fall back to file timestamps, which we set to 2020-01-01
-          expect(new Date(assetInfo.exifInfo!.dateTimeOriginal!).getTime()).toBe(
-            new Date('2020-01-01T00:00:00.000Z').getTime(),
-          );
-        });
-
-        it('should handle all testable date tags present to verify complete priority order', async () => {
-          const { imageBytes, filename } = await createTestImageWithExif('all-testable-date-tags.jpg', {
-            // All TESTABLE date tags to JPEG format (writable AND readable)
-            DateTimeOriginal: '2023:04:04 04:00:00', // TESTABLE - highest priority among readable tags
-            CreateDate: '2023:05:05 05:00:00', // TESTABLE
-            CreationDate: '2023:07:07 07:00:00', // TESTABLE
-            GPSDateTime: '2023:10:10 10:00:00', // TESTABLE
-            // Note: Excluded non-testable tags:
-            // SubSec tags: writable but not readable from JPEG
-            // Non-writable tags: MediaCreateDate, DateTimeCreated, DateTimeUTC, SonyDateTime2, etc.
-            // Time-only/date-only tags: already excluded from EXIF_DATE_TAGS
-          });
-
-          const asset = await utils.createAsset(admin.accessToken, {
-            assetData: {
-              filename,
-              bytes: imageBytes,
-            },
-          });
-
-          await utils.waitForWebsocketEvent({ event: 'assetUpload', id: asset.id });
-
-          const assetInfo = await getAssetInfo({ id: asset.id }, { headers: asBearerAuth(admin.accessToken) });
-
-          expect(assetInfo.exifInfo?.dateTimeOriginal).toBeDefined();
-          // Should use DateTimeOriginal as it has the highest priority among testable tags
-          expect(new Date(assetInfo.exifInfo!.dateTimeOriginal!).getTime()).toBe(
-            new Date('2023-04-04T04:00:00.000Z').getTime(),
-          );
-        });
-
-        it('should use CreationDate when SubSec tags are missing', async () => {
-          const { imageBytes, filename } = await createTestImageWithExif('creation-date-priority.jpg', {
-            CreationDate: '2023:07:07 07:00:00', // WRITABLE
-            GPSDateTime: '2023:10:10 10:00:00', // WRITABLE
-            // Note: DateTimeCreated, DateTimeUTC, SonyDateTime2 are NOT writable to JPEG
-            // Note: TimeCreated and GPSDateStamp are excluded from EXIF_DATE_TAGS (time-only/date-only)
-            // Exclude SubSec and standard EXIF tags
-            SubSecDateTimeOriginal: undefined,
-            DateTimeOriginal: undefined,
-            SubSecCreateDate: undefined,
-            CreateDate: undefined,
-          });
-
-          const asset = await utils.createAsset(admin.accessToken, {
-            assetData: {
-              filename,
-              bytes: imageBytes,
-            },
-          });
-
-          await utils.waitForWebsocketEvent({ event: 'assetUpload', id: asset.id });
-
-          const assetInfo = await getAssetInfo({ id: asset.id }, { headers: asBearerAuth(admin.accessToken) });
-
-          expect(assetInfo.exifInfo?.dateTimeOriginal).toBeDefined();
-          // Should use CreationDate when available
-          expect(new Date(assetInfo.exifInfo!.dateTimeOriginal!).getTime()).toBe(
-            new Date('2023-07-07T07:00:00.000Z').getTime(),
-          );
-        });
-
-        it('should skip invalid date formats and use next valid tag', async () => {
-          const { imageBytes, filename } = await createTestImageWithExif('invalid-date-handling.jpg', {
-            // Note: Testing invalid date handling with only WRITABLE tags
-            GPSDateTime: '2023:10:10 10:00:00', // WRITABLE - Valid date
-            CreationDate: '2023:13:13 13:00:00', // WRITABLE - Valid date
-            // Note: TimeCreated excluded (time-only), DateTimeCreated not writable to JPEG
-            // Exclude other date tags
-            SubSecDateTimeOriginal: undefined,
-            DateTimeOriginal: undefined,
-            SubSecCreateDate: undefined,
-            CreateDate: undefined,
-          });
-
-          const asset = await utils.createAsset(admin.accessToken, {
-            assetData: {
-              filename,
-              bytes: imageBytes,
-            },
-          });
-
-          await utils.waitForWebsocketEvent({ event: 'assetUpload', id: asset.id });
-
-          const assetInfo = await getAssetInfo({ id: asset.id }, { headers: asBearerAuth(admin.accessToken) });
-
-          expect(assetInfo.exifInfo?.dateTimeOriginal).toBeDefined();
-          // Should skip invalid dates and use the first valid one (GPSDateTime)
-          expect(new Date(assetInfo.exifInfo!.dateTimeOriginal!).getTime()).toBe(
-            new Date('2023-10-10T10:00:00.000Z').getTime(),
-          );
-        });
-      });
-    });
-  });
-
   describe('POST /assets/exist', () => {
     it('ignores invalid deviceAssetIds', async () => {
       const response = await utils.checkExistingAssets(user1.accessToken, {
diff --git a/e2e/src/generate-date-tag-test-images.ts b/e2e/src/generate-date-tag-test-images.ts
deleted file mode 100644
index 34cc956416..0000000000
--- a/e2e/src/generate-date-tag-test-images.ts
+++ /dev/null
@@ -1,178 +0,0 @@
-#!/usr/bin/env node
-
-/**
- * Script to generate test images with additional EXIF date tags
- * This creates actual JPEG images with embedded metadata for testing
- * Images are generated into e2e/test-assets/metadata/dates/
- */
-
-import { execSync } from 'node:child_process';
-import { writeFileSync } from 'node:fs';
-import { dirname, join } from 'node:path';
-import { fileURLToPath } from 'node:url';
-import sharp from 'sharp';
-
-interface TestImage {
-  filename: string;
-  description: string;
-  exifTags: Record<string, string>;
-}
-
-const testImages: TestImage[] = [
-  {
-    filename: 'time-created.jpg',
-    description: 'Image with TimeCreated tag',
-    exifTags: {
-      TimeCreated: '2023:11:15 14:30:00',
-      Make: 'Canon',
-      Model: 'EOS R5',
-    },
-  },
-  {
-    filename: 'gps-datetime.jpg',
-    description: 'Image with GPSDateTime and coordinates',
-    exifTags: {
-      GPSDateTime: '2023:11:15 12:30:00Z',
-      GPSLatitude: '37.7749',
-      GPSLongitude: '-122.4194',
-      GPSLatitudeRef: 'N',
-      GPSLongitudeRef: 'W',
-    },
-  },
-  {
-    filename: 'datetime-utc.jpg',
-    description: 'Image with DateTimeUTC tag',
-    exifTags: {
-      DateTimeUTC: '2023:11:15 10:30:00',
-      Make: 'Nikon',
-      Model: 'D850',
-    },
-  },
-  {
-    filename: 'gps-datestamp.jpg',
-    description: 'Image with GPSDateStamp and GPSTimeStamp',
-    exifTags: {
-      GPSDateStamp: '2023:11:15',
-      GPSTimeStamp: '08:30:00',
-      GPSLatitude: '51.5074',
-      GPSLongitude: '-0.1278',
-      GPSLatitudeRef: 'N',
-      GPSLongitudeRef: 'W',
-    },
-  },
-  {
-    filename: 'sony-datetime2.jpg',
-    description: 'Sony camera image with SonyDateTime2 tag',
-    exifTags: {
-      SonyDateTime2: '2023:11:15 06:30:00',
-      Make: 'SONY',
-      Model: 'ILCE-7RM5',
-    },
-  },
-  {
-    filename: 'date-priority-test.jpg',
-    description: 'Image with multiple date tags to test priority',
-    exifTags: {
-      SubSecDateTimeOriginal: '2023:01:01 01:00:00',
-      DateTimeOriginal: '2023:02:02 02:00:00',
-      SubSecCreateDate: '2023:03:03 03:00:00',
-      CreateDate: '2023:04:04 04:00:00',
-      CreationDate: '2023:05:05 05:00:00',
-      DateTimeCreated: '2023:06:06 06:00:00',
-      TimeCreated: '2023:07:07 07:00:00',
-      GPSDateTime: '2023:08:08 08:00:00',
-      DateTimeUTC: '2023:09:09 09:00:00',
-      GPSDateStamp: '2023:10:10',
-      SonyDateTime2: '2023:11:11 11:00:00',
-    },
-  },
-  {
-    filename: 'new-tags-only.jpg',
-    description: 'Image with only additional date tags (no standard tags)',
-    exifTags: {
-      TimeCreated: '2023:12:01 15:45:30',
-      GPSDateTime: '2023:12:01 13:45:30Z',
-      DateTimeUTC: '2023:12:01 13:45:30',
-      GPSDateStamp: '2023:12:01',
-      SonyDateTime2: '2023:12:01 08:45:30',
-      GPSLatitude: '40.7128',
-      GPSLongitude: '-74.0060',
-      GPSLatitudeRef: 'N',
-      GPSLongitudeRef: 'W',
-    },
-  },
-];
-
-const generateTestImages = async (): Promise<void> => {
-  // Target directory: e2e/test-assets/metadata/dates/
-  // Current file is in: e2e/src/
-  const __filename = fileURLToPath(import.meta.url);
-  const __dirname = dirname(__filename);
-  const targetDir = join(__dirname, '..', 'test-assets', 'metadata', 'dates');
-
-  console.log('Generating test images with additional EXIF date tags...');
-  console.log(`Target directory: ${targetDir}`);
-
-  for (const image of testImages) {
-    try {
-      const imagePath = join(targetDir, image.filename);
-
-      // Create unique JPEG file using Sharp
-      const r = Math.floor(Math.random() * 256);
-      const g = Math.floor(Math.random() * 256);
-      const b = Math.floor(Math.random() * 256);
-
-      const jpegData = await sharp({
-        create: {
-          width: 100,
-          height: 100,
-          channels: 3,
-          background: { r, g, b },
-        },
-      })
-        .jpeg({ quality: 90 })
-        .toBuffer();
-
-      writeFileSync(imagePath, jpegData);
-
-      // Build exiftool command to add EXIF data
-      const exifArgs = Object.entries(image.exifTags)
-        .map(([tag, value]) => `-${tag}="${value}"`)
-        .join(' ');
-
-      const command = `exiftool ${exifArgs} -overwrite_original "${imagePath}"`;
-
-      console.log(`Creating ${image.filename}: ${image.description}`);
-      execSync(command, { stdio: 'pipe' });
-
-      // Verify the tags were written
-      const verifyCommand = `exiftool -json "${imagePath}"`;
-      const result = execSync(verifyCommand, { encoding: 'utf8' });
-      const metadata = JSON.parse(result)[0];
-
-      console.log(`  ✓ Created with ${Object.keys(image.exifTags).length} EXIF tags`);
-
-      // Log first date tag found for verification
-      const firstDateTag = Object.keys(image.exifTags).find(
-        (tag) => tag.includes('Date') || tag.includes('Time') || tag.includes('Created'),
-      );
-      if (firstDateTag && metadata[firstDateTag]) {
-        console.log(`  ✓ Verified ${firstDateTag}: ${metadata[firstDateTag]}`);
-      }
-    } catch (error) {
-      console.error(`Failed to create ${image.filename}:`, (error as Error).message);
-    }
-  }
-
-  console.log('\nTest image generation complete!');
-  console.log('Files created in:', targetDir);
-  console.log('\nTo test these images:');
-  console.log(`cd ${targetDir} && exiftool -time:all -gps:all *.jpg`);
-};
-
-export { generateTestImages };
-
-// Run the generator if this file is executed directly
-if (import.meta.url === `file://${process.argv[1]}`) {
-  generateTestImages().catch(console.error);
-}
diff --git a/e2e/test-assets b/e2e/test-assets
index 68e8b5853c..163c251744 160000
--- a/e2e/test-assets
+++ b/e2e/test-assets
@@ -1 +1 @@
-Subproject commit 68e8b5853cdc2d76c5e6f18a6d1773793728c491
+Subproject commit 163c251744e0a35d7ecfd02682452043f149fc2b
diff --git a/server/src/services/metadata.service.spec.ts b/server/src/services/metadata.service.spec.ts
index 0adb390f6a..220216a2c8 100644
--- a/server/src/services/metadata.service.spec.ts
+++ b/server/src/services/metadata.service.spec.ts
@@ -1,4 +1,5 @@
 import { BinaryField, ExifDateTime } from 'exiftool-vendored';
+import { DateTime } from 'luxon';
 import { randomBytes } from 'node:crypto';
 import { Stats } from 'node:fs';
 import { defaults } from 'src/config';
@@ -231,7 +232,7 @@ describe(MetadataService.name, () => {
       });
     });
 
-    it('should account for the server being in a non-UTC timezone', async () => {
+    it('should determine dateTimeOriginal regardless of the server time zone', async () => {
       process.env.TZ = 'America/Los_Angeles';
       mocks.assetJob.getForMetadataExtraction.mockResolvedValue(assetStub.sidecar);
       mockReadTags({ DateTimeOriginal: '2022:01:01 00:00:00' });
@@ -239,7 +240,7 @@ describe(MetadataService.name, () => {
       await sut.handleMetadataExtraction({ id: assetStub.image.id });
       expect(mocks.asset.upsertExif).toHaveBeenCalledWith(
         expect.objectContaining({
-          dateTimeOriginal: new Date('2022-01-01T08:00:00.000Z'),
+          dateTimeOriginal: new Date('2022-01-01T00:00:00.000Z'),
         }),
       );
 
@@ -856,6 +857,7 @@ describe(MetadataService.name, () => {
         tz: 'UTC-11:30',
         Rating: 3,
       };
+
       mocks.assetJob.getForMetadataExtraction.mockResolvedValue(assetStub.image);
       mockReadTags(tags);
 
@@ -897,7 +899,7 @@ describe(MetadataService.name, () => {
           id: assetStub.image.id,
           duration: null,
           fileCreatedAt: dateForTest,
-          localDateTime: dateForTest,
+          localDateTime: DateTime.fromISO('1970-01-01T00:00:00.000Z').toJSDate(),
         }),
       );
     });
@@ -1595,7 +1597,7 @@ describe(MetadataService.name, () => {
 
       const result = firstDateTime(tags);
       expect(result?.tag).toBe('SonyDateTime2');
-      expect(result?.dateTime?.toDate()?.toISOString()).toBe('2023-07-07T07:00:00.000Z');
+      expect(result?.dateTime?.toISOString()).toBe('2023-07-07T07:00:00');
     });
 
     it('should respect full priority order with all date tags present', () => {
@@ -1624,7 +1626,7 @@ describe(MetadataService.name, () => {
       const result = firstDateTime(tags);
       // Should use SubSecDateTimeOriginal as it has highest priority
       expect(result?.tag).toBe('SubSecDateTimeOriginal');
-      expect(result?.dateTime?.toDate()?.toISOString()).toBe('2023-01-01T01:00:00.000Z');
+      expect(result?.dateTime?.toISOString()).toBe('2023-01-01T01:00:00');
     });
 
     it('should handle missing SubSec tags and use available date tags', () => {
@@ -1644,7 +1646,7 @@ describe(MetadataService.name, () => {
       const result = firstDateTime(tags);
       // Should use CreationDate when available
       expect(result?.tag).toBe('CreationDate');
-      expect(result?.dateTime?.toDate()?.toISOString()).toBe('2023-07-07T07:00:00.000Z');
+      expect(result?.dateTime?.toISOString()).toBe('2023-07-07T07:00:00');
     });
 
     it('should handle invalid date formats gracefully', () => {
@@ -1658,7 +1660,7 @@ describe(MetadataService.name, () => {
       const result = firstDateTime(tags);
       // Should skip invalid dates and use the first valid one
       expect(result?.tag).toBe('GPSDateTime');
-      expect(result?.dateTime?.toDate()?.toISOString()).toBe('2023-10-10T10:00:00.000Z');
+      expect(result?.dateTime?.toISOString()).toBe('2023-10-10T10:00:00');
     });
 
     it('should prefer CreationDate over CreateDate', () => {
diff --git a/server/src/services/metadata.service.ts b/server/src/services/metadata.service.ts
index e76b335c90..746f62a944 100644
--- a/server/src/services/metadata.service.ts
+++ b/server/src/services/metadata.service.ts
@@ -2,7 +2,7 @@ import { Injectable } from '@nestjs/common';
 import { ContainerDirectoryItem, ExifDateTime, Tags } from 'exiftool-vendored';
 import { Insertable } from 'kysely';
 import _ from 'lodash';
-import { Duration } from 'luxon';
+import { DateTime, Duration } from 'luxon';
 import { Stats } from 'node:fs';
 import { constants } from 'node:fs/promises';
 import { join, parse } from 'node:path';
@@ -866,31 +866,40 @@ export class MetadataService extends BaseService {
       this.logger.debug(`No timezone information found for asset ${asset.id}: ${asset.originalPath}`);
     }
 
-    let dateTimeOriginal = dateTime?.toDate();
-    let localDateTime = dateTime?.toDateTime().setZone('UTC', { keepLocalTime: true }).toJSDate();
+    let dateTimeOriginal = dateTime?.toDateTime();
+
+    // do not let JavaScript use local timezone
+    if (dateTimeOriginal && !dateTime?.hasZone) {
+      dateTimeOriginal = dateTimeOriginal.setZone('UTC', { keepLocalTime: true });
+    }
+
+    // align with whatever timeZone we chose
+    dateTimeOriginal = dateTimeOriginal?.setZone(timeZone ?? 'UTC');
+
+    // store as "local time"
+    let localDateTime = dateTimeOriginal?.setZone('UTC', { keepLocalTime: true });
+
     if (!localDateTime || !dateTimeOriginal) {
       // FileCreateDate is not available on linux, likely because exiftool hasn't integrated the statx syscall yet
       // birthtime is not available in Docker on macOS, so it appears as 0
-      const earliestDate = new Date(
+      const earliestDate = DateTime.fromMillis(
         Math.min(
           asset.fileCreatedAt.getTime(),
           stats.birthtimeMs ? Math.min(stats.mtimeMs, stats.birthtimeMs) : stats.mtime.getTime(),
         ),
       );
       this.logger.debug(
-        `No exif date time found, falling back on ${earliestDate.toISOString()}, earliest of file creation and modification for asset ${asset.id}: ${asset.originalPath}`,
+        `No exif date time found, falling back on ${earliestDate.toISO()}, earliest of file creation and modification for asset ${asset.id}: ${asset.originalPath}`,
       );
       dateTimeOriginal = localDateTime = earliestDate;
     }
 
-    this.logger.verbose(
-      `Found local date time ${localDateTime.toISOString()} for asset ${asset.id}: ${asset.originalPath}`,
-    );
+    this.logger.verbose(`Found local date time ${localDateTime.toISO()} for asset ${asset.id}: ${asset.originalPath}`);
 
     return {
-      dateTimeOriginal,
       timeZone,
-      localDateTime,
+      localDateTime: localDateTime.toJSDate(),
+      dateTimeOriginal: dateTimeOriginal.toJSDate(),
     };
   }
 
diff --git a/server/test/medium.factory.ts b/server/test/medium.factory.ts
index f332cc02e6..35bcb45413 100644
--- a/server/test/medium.factory.ts
+++ b/server/test/medium.factory.ts
@@ -2,6 +2,7 @@
 import { Insertable, Kysely } from 'kysely';
 import { DateTime } from 'luxon';
 import { createHash, randomBytes } from 'node:crypto';
+import { Stats } from 'node:fs';
 import { Writable } from 'node:stream';
 import { AssetFace } from 'src/database';
 import { AuthDto, LoginResponseDto } from 'src/dtos/auth.dto';
@@ -28,7 +29,9 @@ import { EventRepository } from 'src/repositories/event.repository';
 import { JobRepository } from 'src/repositories/job.repository';
 import { LoggingRepository } from 'src/repositories/logging.repository';
 import { MachineLearningRepository } from 'src/repositories/machine-learning.repository';
+import { MapRepository } from 'src/repositories/map.repository';
 import { MemoryRepository } from 'src/repositories/memory.repository';
+import { MetadataRepository } from 'src/repositories/metadata.repository';
 import { NotificationRepository } from 'src/repositories/notification.repository';
 import { OcrRepository } from 'src/repositories/ocr.repository';
 import { PartnerRepository } from 'src/repositories/partner.repository';
@@ -61,7 +64,9 @@ import { TagAssetTable } from 'src/schema/tables/tag-asset.table';
 import { TagTable } from 'src/schema/tables/tag.table';
 import { UserTable } from 'src/schema/tables/user.table';
 import { BASE_SERVICE_DEPENDENCIES, BaseService } from 'src/services/base.service';
+import { MetadataService } from 'src/services/metadata.service';
 import { SyncService } from 'src/services/sync.service';
+import { mockEnvData } from 'test/repositories/config.repository.mock';
 import { newTelemetryRepositoryMock } from 'test/repositories/telemetry.repository.mock';
 import { factory, newDate, newEmbedding, newUuid } from 'test/small.factory';
 import { automock, wait } from 'test/utils';
@@ -305,6 +310,63 @@ export class SyncTestContext extends MediumTestContext<SyncService> {
   }
 }
 
+const mockDate = new Date('2024-06-01T12:00:00.000Z');
+const mockStats = {
+  mtime: mockDate,
+  atime: mockDate,
+  ctime: mockDate,
+  birthtime: mockDate,
+  atimeMs: 0,
+  mtimeMs: 0,
+  ctimeMs: 0,
+  birthtimeMs: 0,
+};
+
+export class ExifTestContext extends MediumTestContext<MetadataService> {
+  constructor(database: Kysely<DB>) {
+    super(MetadataService, {
+      database,
+      real: [AssetRepository, AssetJobRepository, MetadataRepository, SystemMetadataRepository, TagRepository],
+      mock: [ConfigRepository, EventRepository, LoggingRepository, MapRepository, StorageRepository],
+    });
+
+    this.getMock(ConfigRepository).getEnv.mockReturnValue(mockEnvData({}));
+    this.getMock(EventRepository).emit.mockResolvedValue();
+    this.getMock(MapRepository).reverseGeocode.mockResolvedValue({ country: null, state: null, city: null });
+    this.getMock(StorageRepository).stat.mockResolvedValue(mockStats as Stats);
+  }
+
+  getMockStats() {
+    return mockStats;
+  }
+
+  getGps(assetId: string) {
+    return this.database
+      .selectFrom('asset_exif')
+      .select(['latitude', 'longitude'])
+      .where('assetId', '=', assetId)
+      .executeTakeFirstOrThrow();
+  }
+
+  getTags(assetId: string) {
+    return this.database
+      .selectFrom('tag')
+      .innerJoin('tag_asset', 'tag.id', 'tag_asset.tagsId')
+      .where('tag_asset.assetsId', '=', assetId)
+      .selectAll()
+      .execute();
+  }
+
+  getDates(assetId: string) {
+    return this.database
+      .selectFrom('asset')
+      .innerJoin('asset_exif', 'asset.id', 'asset_exif.assetId')
+      .where('id', '=', assetId)
+      .select(['asset.fileCreatedAt', 'asset.localDateTime', 'asset_exif.dateTimeOriginal', 'asset_exif.timeZone'])
+      .executeTakeFirstOrThrow();
+  }
+}
+
 const newRealRepository = <T>(key: ClassConstructor<T>, db: Kysely<DB>): T => {
   switch (key) {
     case AccessRepository:
@@ -344,6 +406,14 @@ const newRealRepository = <T>(key: ClassConstructor<T>, db: Kysely<DB>): T => {
       return new key(LoggingRepository.create());
     }
 
+    case MetadataRepository: {
+      return new key(LoggingRepository.create());
+    }
+
+    case StorageRepository: {
+      return new key(LoggingRepository.create());
+    }
+
     case TagRepository: {
       return new key(db, LoggingRepository.create());
     }
@@ -381,6 +451,10 @@ const newMockRepository = <T>(key: ClassConstructor<T>) => {
       return automock(key);
     }
 
+    case MapRepository: {
+      return automock(MapRepository, { args: [undefined, undefined, { setContext: () => {} }] });
+    }
+
     case TelemetryRepository: {
       return newTelemetryRepositoryMock();
     }
diff --git a/server/test/medium/specs/exif/exif-date-time.spec.ts b/server/test/medium/specs/exif/exif-date-time.spec.ts
new file mode 100644
index 0000000000..e46f17855e
--- /dev/null
+++ b/server/test/medium/specs/exif/exif-date-time.spec.ts
@@ -0,0 +1,65 @@
+import { Kysely } from 'kysely';
+import { DateTime } from 'luxon';
+import { resolve } from 'node:path';
+import { DB } from 'src/schema';
+import { ExifTestContext } from 'test/medium.factory';
+import { getKyselyDB } from 'test/utils';
+
+let database: Kysely<DB>;
+
+const setup = async (testAssetPath: string) => {
+  const ctx = new ExifTestContext(database);
+
+  const { user } = await ctx.newUser();
+  const originalPath = resolve(`../e2e/test-assets/${testAssetPath}`);
+  const { asset } = await ctx.newAsset({ ownerId: user.id, originalPath });
+
+  return { ctx, sut: ctx.sut, asset };
+};
+
+beforeAll(async () => {
+  database = await getKyselyDB();
+});
+
+describe('exif date time', () => {
+  it('should prioritize DateTimeOriginal', async () => {
+    const { ctx, sut, asset } = await setup('metadata/dates/date-priority-test.jpg');
+
+    await sut.handleMetadataExtraction({ id: asset.id });
+
+    await expect(ctx.getDates(asset.id)).resolves.toEqual({
+      timeZone: null,
+      dateTimeOriginal: DateTime.fromISO('2023-02-02T02:00:00.000Z').toJSDate(),
+      localDateTime: DateTime.fromISO('2023-02-02T02:00:00.000Z').toJSDate(),
+      fileCreatedAt: DateTime.fromISO('2023-02-02T02:00:00.000Z').toJSDate(),
+    });
+  });
+
+  it('should extract GPSDateTime with GPS coordinates ', async () => {
+    const { ctx, sut, asset } = await setup('metadata/dates/gps-datetime.jpg');
+
+    await sut.handleMetadataExtraction({ id: asset.id });
+
+    await expect(ctx.getDates(asset.id)).resolves.toEqual({
+      timeZone: 'America/Los_Angeles',
+      dateTimeOriginal: DateTime.fromISO('2023-11-15T12:30:00.000Z').toJSDate(),
+      localDateTime: DateTime.fromISO('2023-11-15T04:30:00.000Z').toJSDate(),
+      fileCreatedAt: DateTime.fromISO('2023-11-15T12:30:00.000Z').toJSDate(),
+    });
+  });
+
+  it('should ignore the TimeCreated tag', async () => {
+    const { ctx, sut, asset } = await setup('metadata/dates/time-created.jpg');
+
+    await sut.handleMetadataExtraction({ id: asset.id });
+
+    const stats = ctx.getMockStats();
+
+    await expect(ctx.getDates(asset.id)).resolves.toEqual({
+      timeZone: null,
+      dateTimeOriginal: stats.mtime,
+      localDateTime: stats.mtime,
+      fileCreatedAt: stats.mtime,
+    });
+  });
+});
diff --git a/server/test/medium/specs/exif/exif-gps.spec.ts b/server/test/medium/specs/exif/exif-gps.spec.ts
new file mode 100644
index 0000000000..651321b599
--- /dev/null
+++ b/server/test/medium/specs/exif/exif-gps.spec.ts
@@ -0,0 +1,31 @@
+import { Kysely } from 'kysely';
+import { resolve } from 'node:path';
+import { DB } from 'src/schema';
+import { ExifTestContext } from 'test/medium.factory';
+import { getKyselyDB } from 'test/utils';
+
+let database: Kysely<DB>;
+
+const setup = async (testAssetPath: string) => {
+  const ctx = new ExifTestContext(database);
+
+  const { user } = await ctx.newUser();
+  const originalPath = resolve(`../e2e/test-assets/${testAssetPath}`);
+  const { asset } = await ctx.newAsset({ ownerId: user.id, originalPath });
+
+  return { ctx, sut: ctx.sut, asset };
+};
+
+beforeAll(async () => {
+  database = await getKyselyDB();
+});
+
+describe('exif gps', () => {
+  it('should handle empty strings', async () => {
+    const { ctx, sut, asset } = await setup('metadata/gps-position/empty_gps.jpg');
+
+    await sut.handleMetadataExtraction({ id: asset.id });
+
+    await expect(ctx.getGps(asset.id)).resolves.toEqual({ latitude: null, longitude: null });
+  });
+});
diff --git a/server/test/medium/specs/exif/exif-tags.spec.ts b/server/test/medium/specs/exif/exif-tags.spec.ts
new file mode 100644
index 0000000000..aee79f4ec1
--- /dev/null
+++ b/server/test/medium/specs/exif/exif-tags.spec.ts
@@ -0,0 +1,34 @@
+import { Kysely } from 'kysely';
+import { resolve } from 'node:path';
+import { DB } from 'src/schema';
+import { ExifTestContext } from 'test/medium.factory';
+import { getKyselyDB } from 'test/utils';
+
+let database: Kysely<DB>;
+
+const setup = async (testAssetPath: string) => {
+  const ctx = new ExifTestContext(database);
+
+  const { user } = await ctx.newUser();
+  const originalPath = resolve(`../e2e/test-assets/${testAssetPath}`);
+  const { asset } = await ctx.newAsset({ ownerId: user.id, originalPath });
+
+  return { ctx, sut: ctx.sut, asset };
+};
+
+beforeAll(async () => {
+  database = await getKyselyDB();
+});
+
+describe('exif tags', () => {
+  it('should detect and regular tags', async () => {
+    const { ctx, sut, asset } = await setup('metadata/tags/picasa.jpg');
+
+    await sut.handleMetadataExtraction({ id: asset.id });
+
+    await expect(ctx.getTags(asset.id)).resolves.toEqual([
+      expect.objectContaining({ assetsId: asset.id, value: 'Frost', parentId: null }),
+      expect.objectContaining({ assetsId: asset.id, value: 'Yard', parentId: null }),
+    ]);
+  });
+});
diff --git a/server/test/medium/specs/services/metadata.service.spec.ts b/server/test/medium/specs/services/metadata.service.spec.ts
index 13b9867373..5d44079be5 100644
--- a/server/test/medium/specs/services/metadata.service.spec.ts
+++ b/server/test/medium/specs/services/metadata.service.spec.ts
@@ -65,42 +65,6 @@ describe(MetadataService.name, () => {
           timeZone: null,
         },
       },
-      {
-        description: 'should handle no time zone information and server behind UTC',
-        serverTimeZone: 'America/Los_Angeles',
-        exifData: {
-          DateTimeOriginal: '2022:01:01 00:00:00',
-        },
-        expected: {
-          localDateTime: '2022-01-01T00:00:00.000Z',
-          dateTimeOriginal: '2022-01-01T08:00:00.000Z',
-          timeZone: null,
-        },
-      },
-      {
-        description: 'should handle no time zone information and server ahead of UTC',
-        serverTimeZone: 'Europe/Brussels',
-        exifData: {
-          DateTimeOriginal: '2022:01:01 00:00:00',
-        },
-        expected: {
-          localDateTime: '2022-01-01T00:00:00.000Z',
-          dateTimeOriginal: '2021-12-31T23:00:00.000Z',
-          timeZone: null,
-        },
-      },
-      {
-        description: 'should handle no time zone information and server ahead of UTC in the summer',
-        serverTimeZone: 'Europe/Brussels',
-        exifData: {
-          DateTimeOriginal: '2022:06:01 00:00:00',
-        },
-        expected: {
-          localDateTime: '2022-06-01T00:00:00.000Z',
-          dateTimeOriginal: '2022-05-31T22:00:00.000Z',
-          timeZone: null,
-        },
-      },
       {
         description: 'should handle a +13:00 time zone',
         exifData: {

From 29c14a3f5855c3d73bfd74982f75c4d25c447131 Mon Sep 17 00:00:00 2001
From: Jason Rasmussen <jason@rasm.me>
Date: Tue, 4 Nov 2025 16:03:21 -0500
Subject: [PATCH 33/84] refactor: database column names (#23356)

---
 docs/docs/guides/database-queries.md          |  4 +-
 server/src/database.ts                        |  2 +-
 server/src/queries/access.repository.sql      | 24 ++---
 server/src/queries/album.repository.sql       | 58 +++++------
 server/src/queries/album.user.repository.sql  | 14 +--
 server/src/queries/asset.job.repository.sql   |  4 +-
 server/src/queries/asset.repository.sql       |  4 +-
 server/src/queries/map.repository.sql         |  4 +-
 server/src/queries/memory.repository.sql      | 14 +--
 .../queries/shared.link.asset.repository.sql  |  6 +-
 server/src/queries/shared.link.repository.sql | 12 +--
 server/src/queries/stack.repository.sql       |  4 +-
 server/src/queries/sync.repository.sql        | 90 ++++++++---------
 server/src/queries/tag.repository.sql         | 10 +-
 server/src/repositories/access.repository.ts  | 24 ++---
 .../src/repositories/album-user.repository.ts | 22 ++---
 server/src/repositories/album.repository.ts   | 64 ++++++------
 .../src/repositories/asset-job.repository.ts  |  4 +-
 server/src/repositories/asset.repository.ts   |  8 +-
 .../src/repositories/download.repository.ts   |  4 +-
 server/src/repositories/map.repository.ts     |  4 +-
 server/src/repositories/memory.repository.ts  | 18 ++--
 .../shared-link-asset.repository.ts           | 14 +--
 .../repositories/shared-link.repository.ts    | 20 ++--
 server/src/repositories/stack.repository.ts   |  4 +-
 server/src/repositories/sync.repository.ts    | 78 +++++++--------
 server/src/repositories/tag.repository.ts     | 16 +--
 server/src/schema/functions.ts                | 12 +--
 .../1761755618862-FixColumnNames.ts           | 99 +++++++++++++++++++
 server/src/schema/tables/activity.table.ts    |  2 +-
 server/src/schema/tables/album-asset.table.ts |  4 +-
 server/src/schema/tables/album-user.table.ts  |  4 +-
 .../src/schema/tables/memory-asset.table.ts   |  2 +-
 .../schema/tables/shared-link-asset.table.ts  |  4 +-
 server/src/schema/tables/tag-asset.table.ts   |  6 +-
 server/src/services/album.service.spec.ts     | 82 +++++++--------
 server/src/services/album.service.ts          | 10 +-
 server/src/services/tag.service.spec.ts       | 24 ++---
 server/src/services/tag.service.ts            |  8 +-
 server/src/utils/database.ts                  | 30 +++---
 server/test/medium.factory.ts                 |  8 +-
 .../medium/specs/sync/sync-album-user.spec.ts |  8 +-
 .../test/medium/specs/sync/sync-album.spec.ts |  2 +-
 43 files changed, 467 insertions(+), 368 deletions(-)
 create mode 100644 server/src/schema/migrations/1761755618862-FixColumnNames.ts

diff --git a/docs/docs/guides/database-queries.md b/docs/docs/guides/database-queries.md
index 5cdcdc04c4..c2328d2bb8 100644
--- a/docs/docs/guides/database-queries.md
+++ b/docs/docs/guides/database-queries.md
@@ -106,14 +106,14 @@ SELECT "user"."email", "asset"."type", COUNT(*) FROM "asset"
 
 ```sql title="Count by tag"
 SELECT "t"."value" AS "tag_name", COUNT(*) AS "number_assets" FROM "tag" "t"
-  JOIN "tag_asset" "ta" ON "t"."id" = "ta"."tagsId" JOIN "asset" "a" ON "ta"."assetsId" = "a"."id"
+  JOIN "tag_asset" "ta" ON "t"."id" = "ta"."tagId" JOIN "asset" "a" ON "ta"."assetId" = "a"."id"
   WHERE "a"."visibility" != 'hidden'
   GROUP BY "t"."value" ORDER BY "number_assets" DESC;
 ```
 
 ```sql title="Count by tag (per user)"
 SELECT "t"."value" AS "tag_name", "u"."email" as "user_email", COUNT(*) AS "number_assets" FROM "tag" "t"
-  JOIN "tag_asset" "ta" ON "t"."id" = "ta"."tagsId" JOIN "asset" "a" ON "ta"."assetsId" = "a"."id" JOIN "user" "u" ON "a"."ownerId" = "u"."id"
+  JOIN "tag_asset" "ta" ON "t"."id" = "ta"."tagId" JOIN "asset" "a" ON "ta"."assetId" = "a"."id" JOIN "user" "u" ON "a"."ownerId" = "u"."id"
   WHERE "a"."visibility" != 'hidden'
   GROUP BY "t"."value", "u"."email" ORDER BY "number_assets" DESC;
 ```
diff --git a/server/src/database.ts b/server/src/database.ts
index f60c2c228c..b62cb70347 100644
--- a/server/src/database.ts
+++ b/server/src/database.ts
@@ -356,7 +356,7 @@ export const columns = {
     'asset.stackId',
     'asset.libraryId',
   ],
-  syncAlbumUser: ['album_user.albumsId as albumId', 'album_user.usersId as userId', 'album_user.role'],
+  syncAlbumUser: ['album_user.albumId as albumId', 'album_user.userId as userId', 'album_user.role'],
   syncStack: ['stack.id', 'stack.createdAt', 'stack.updatedAt', 'stack.primaryAssetId', 'stack.ownerId'],
   syncUser: ['id', 'name', 'email', 'avatarColor', 'deletedAt', 'updateId', 'profileImagePath', 'profileChangedAt'],
   stack: ['stack.id', 'stack.primaryAssetId', 'ownerId'],
diff --git a/server/src/queries/access.repository.sql b/server/src/queries/access.repository.sql
index e98c5c6d98..9ce6d845da 100644
--- a/server/src/queries/access.repository.sql
+++ b/server/src/queries/access.repository.sql
@@ -25,8 +25,8 @@ select
   "album"."id"
 from
   "album"
-  left join "album_user" as "albumUsers" on "albumUsers"."albumsId" = "album"."id"
-  left join "user" on "user"."id" = "albumUsers"."usersId"
+  left join "album_user" as "albumUsers" on "albumUsers"."albumId" = "album"."id"
+  left join "user" on "user"."id" = "albumUsers"."userId"
   and "user"."deletedAt" is null
 where
   "album"."id" in ($1)
@@ -52,8 +52,8 @@ select
   "album"."id"
 from
   "album"
-  left join "album_user" on "album_user"."albumsId" = "album"."id"
-  left join "user" on "user"."id" = "album_user"."usersId"
+  left join "album_user" on "album_user"."albumId" = "album"."id"
+  left join "user" on "user"."id" = "album_user"."userId"
   and "user"."deletedAt" is null
 where
   "album"."id" in ($1)
@@ -81,11 +81,11 @@ select
   "asset"."livePhotoVideoId"
 from
   "album"
-  inner join "album_asset" as "albumAssets" on "album"."id" = "albumAssets"."albumsId"
-  inner join "asset" on "asset"."id" = "albumAssets"."assetsId"
+  inner join "album_asset" as "albumAssets" on "album"."id" = "albumAssets"."albumId"
+  inner join "asset" on "asset"."id" = "albumAssets"."assetId"
   and "asset"."deletedAt" is null
-  left join "album_user" as "albumUsers" on "albumUsers"."albumsId" = "album"."id"
-  left join "user" on "user"."id" = "albumUsers"."usersId"
+  left join "album_user" as "albumUsers" on "albumUsers"."albumId" = "album"."id"
+  left join "user" on "user"."id" = "albumUsers"."userId"
   and "user"."deletedAt" is null
   cross join "target"
 where
@@ -136,11 +136,11 @@ from
   "shared_link"
   left join "album" on "album"."id" = "shared_link"."albumId"
   and "album"."deletedAt" is null
-  left join "shared_link_asset" on "shared_link_asset"."sharedLinksId" = "shared_link"."id"
-  left join "asset" on "asset"."id" = "shared_link_asset"."assetsId"
+  left join "shared_link_asset" on "shared_link_asset"."sharedLinkId" = "shared_link"."id"
+  left join "asset" on "asset"."id" = "shared_link_asset"."assetId"
   and "asset"."deletedAt" is null
-  left join "album_asset" on "album_asset"."albumsId" = "album"."id"
-  left join "asset" as "albumAssets" on "albumAssets"."id" = "album_asset"."assetsId"
+  left join "album_asset" on "album_asset"."albumId" = "album"."id"
+  left join "asset" as "albumAssets" on "albumAssets"."id" = "album_asset"."assetId"
   and "albumAssets"."deletedAt" is null
 where
   "shared_link"."id" = $1
diff --git a/server/src/queries/album.repository.sql b/server/src/queries/album.repository.sql
index 1f4eda96a1..f62e769a17 100644
--- a/server/src/queries/album.repository.sql
+++ b/server/src/queries/album.repository.sql
@@ -43,13 +43,13 @@ select
                 from
                   "user"
                 where
-                  "user"."id" = "album_user"."usersId"
+                  "user"."id" = "album_user"."userId"
               ) as obj
           ) as "user"
         from
           "album_user"
         where
-          "album_user"."albumsId" = "album"."id"
+          "album_user"."albumId" = "album"."id"
       ) as agg
   ) as "albumUsers",
   (
@@ -76,9 +76,9 @@ select
         from
           "asset"
           left join "asset_exif" on "asset"."id" = "asset_exif"."assetId"
-          inner join "album_asset" on "album_asset"."assetsId" = "asset"."id"
+          inner join "album_asset" on "album_asset"."assetId" = "asset"."id"
         where
-          "album_asset"."albumsId" = "album"."id"
+          "album_asset"."albumId" = "album"."id"
           and "asset"."deletedAt" is null
           and "asset"."visibility" in ('archive', 'timeline')
         order by
@@ -134,18 +134,18 @@ select
                 from
                   "user"
                 where
-                  "user"."id" = "album_user"."usersId"
+                  "user"."id" = "album_user"."userId"
               ) as obj
           ) as "user"
         from
           "album_user"
         where
-          "album_user"."albumsId" = "album"."id"
+          "album_user"."albumId" = "album"."id"
       ) as agg
   ) as "albumUsers"
 from
   "album"
-  inner join "album_asset" on "album_asset"."albumsId" = "album"."id"
+  inner join "album_asset" on "album_asset"."albumId" = "album"."id"
 where
   (
     "album"."ownerId" = $1
@@ -154,11 +154,11 @@ where
       from
         "album_user"
       where
-        "album_user"."albumsId" = "album"."id"
-        and "album_user"."usersId" = $2
+        "album_user"."albumId" = "album"."id"
+        and "album_user"."userId" = $2
     )
   )
-  and "album_asset"."assetsId" = $3
+  and "album_asset"."assetId" = $3
   and "album"."deletedAt" is null
 order by
   "album"."createdAt" desc,
@@ -166,7 +166,7 @@ order by
 
 -- AlbumRepository.getMetadataForIds
 select
-  "album_asset"."albumsId" as "albumId",
+  "album_asset"."albumId" as "albumId",
   min(
     ("asset"."localDateTime" AT TIME ZONE 'UTC'::text)::date
   ) as "startDate",
@@ -177,13 +177,13 @@ select
   count("asset"."id")::int as "assetCount"
 from
   "asset"
-  inner join "album_asset" on "album_asset"."assetsId" = "asset"."id"
+  inner join "album_asset" on "album_asset"."assetId" = "asset"."id"
 where
   "asset"."visibility" in ('archive', 'timeline')
-  and "album_asset"."albumsId" in ($1)
+  and "album_asset"."albumId" in ($1)
   and "asset"."deletedAt" is null
 group by
-  "album_asset"."albumsId"
+  "album_asset"."albumId"
 
 -- AlbumRepository.getOwned
 select
@@ -228,13 +228,13 @@ select
                 from
                   "user"
                 where
-                  "user"."id" = "album_user"."usersId"
+                  "user"."id" = "album_user"."userId"
               ) as obj
           ) as "user"
         from
           "album_user"
         where
-          "album_user"."albumsId" = "album"."id"
+          "album_user"."albumId" = "album"."id"
       ) as agg
   ) as "albumUsers",
   (
@@ -283,13 +283,13 @@ select
                 from
                   "user"
                 where
-                  "user"."id" = "album_user"."usersId"
+                  "user"."id" = "album_user"."userId"
               ) as obj
           ) as "user"
         from
           "album_user"
         where
-          "album_user"."albumsId" = "album"."id"
+          "album_user"."albumId" = "album"."id"
       ) as agg
   ) as "albumUsers",
   (
@@ -332,10 +332,10 @@ where
       from
         "album_user"
       where
-        "album_user"."albumsId" = "album"."id"
+        "album_user"."albumId" = "album"."id"
         and (
           "album"."ownerId" = $1
-          or "album_user"."usersId" = $2
+          or "album_user"."userId" = $2
         )
     )
     or exists (
@@ -382,7 +382,7 @@ where
     from
       "album_user"
     where
-      "album_user"."albumsId" = "album"."id"
+      "album_user"."albumId" = "album"."id"
   )
   and not exists (
     select
@@ -397,7 +397,7 @@ order by
 -- AlbumRepository.removeAssetsFromAll
 delete from "album_asset"
 where
-  "album_asset"."assetsId" in ($1)
+  "album_asset"."assetId" in ($1)
 
 -- AlbumRepository.getAssetIds
 select
@@ -405,8 +405,8 @@ select
 from
   "album_asset"
 where
-  "album_asset"."albumsId" = $1
-  and "album_asset"."assetsId" in ($2)
+  "album_asset"."albumId" = $1
+  and "album_asset"."assetId" in ($2)
 
 -- AlbumRepository.getContributorCounts
 select
@@ -414,10 +414,10 @@ select
   count(*) as "assetCount"
 from
   "album_asset"
-  inner join "asset" on "asset"."id" = "assetsId"
+  inner join "asset" on "asset"."id" = "assetId"
 where
   "asset"."deletedAt" is null
-  and "album_asset"."albumsId" = $1
+  and "album_asset"."albumId" = $1
 group by
   "asset"."ownerId"
 order by
@@ -427,10 +427,10 @@ order by
 insert into
   "album_asset"
 select
-  "album_asset"."albumsId",
-  $1 as "assetsId"
+  "album_asset"."albumId",
+  $1 as "assetId"
 from
   "album_asset"
 where
-  "album_asset"."assetsId" = $2
+  "album_asset"."assetId" = $2
 on conflict do nothing
diff --git a/server/src/queries/album.user.repository.sql b/server/src/queries/album.user.repository.sql
index e0fc0e7b74..a758ba1cf4 100644
--- a/server/src/queries/album.user.repository.sql
+++ b/server/src/queries/album.user.repository.sql
@@ -2,12 +2,12 @@
 
 -- AlbumUserRepository.create
 insert into
-  "album_user" ("usersId", "albumsId")
+  "album_user" ("userId", "albumId")
 values
   ($1, $2)
 returning
-  "usersId",
-  "albumsId",
+  "userId",
+  "albumId",
   "role"
 
 -- AlbumUserRepository.update
@@ -15,13 +15,13 @@ update "album_user"
 set
   "role" = $1
 where
-  "usersId" = $2
-  and "albumsId" = $3
+  "userId" = $2
+  and "albumId" = $3
 returning
   *
 
 -- AlbumUserRepository.delete
 delete from "album_user"
 where
-  "usersId" = $1
-  and "albumsId" = $2
+  "userId" = $1
+  and "albumId" = $2
diff --git a/server/src/queries/asset.job.repository.sql b/server/src/queries/asset.job.repository.sql
index b55be413ea..ebfd1a08c9 100644
--- a/server/src/queries/asset.job.repository.sql
+++ b/server/src/queries/asset.job.repository.sql
@@ -31,9 +31,9 @@ select
           "tag"."value"
         from
           "tag"
-          inner join "tag_asset" on "tag"."id" = "tag_asset"."tagsId"
+          inner join "tag_asset" on "tag"."id" = "tag_asset"."tagId"
         where
-          "asset"."id" = "tag_asset"."assetsId"
+          "asset"."id" = "tag_asset"."assetId"
       ) as agg
   ) as "tags"
 from
diff --git a/server/src/queries/asset.repository.sql b/server/src/queries/asset.repository.sql
index e3a0eb8c06..23fd3caf3c 100644
--- a/server/src/queries/asset.repository.sql
+++ b/server/src/queries/asset.repository.sql
@@ -160,9 +160,9 @@ select
           "tag"."parentId"
         from
           "tag"
-          inner join "tag_asset" on "tag"."id" = "tag_asset"."tagsId"
+          inner join "tag_asset" on "tag"."id" = "tag_asset"."tagId"
         where
-          "asset"."id" = "tag_asset"."assetsId"
+          "asset"."id" = "tag_asset"."assetId"
       ) as agg
   ) as "tags",
   to_json("asset_exif") as "exifInfo"
diff --git a/server/src/queries/map.repository.sql b/server/src/queries/map.repository.sql
index df2136a422..d7e98b1cd2 100644
--- a/server/src/queries/map.repository.sql
+++ b/server/src/queries/map.repository.sql
@@ -23,8 +23,8 @@ where
       from
         "album_asset"
       where
-        "asset"."id" = "album_asset"."assetsId"
-        and "album_asset"."albumsId" in ($3)
+        "asset"."id" = "album_asset"."assetId"
+        and "album_asset"."albumId" in ($3)
     )
   )
 order by
diff --git a/server/src/queries/memory.repository.sql b/server/src/queries/memory.repository.sql
index b3cc7240ae..da970c2c78 100644
--- a/server/src/queries/memory.repository.sql
+++ b/server/src/queries/memory.repository.sql
@@ -37,7 +37,7 @@ select
           "asset".*
         from
           "asset"
-          inner join "memory_asset" on "asset"."id" = "memory_asset"."assetsId"
+          inner join "memory_asset" on "asset"."id" = "memory_asset"."assetId"
         where
           "memory_asset"."memoriesId" = "memory"."id"
           and "asset"."visibility" = 'timeline'
@@ -66,7 +66,7 @@ select
           "asset".*
         from
           "asset"
-          inner join "memory_asset" on "asset"."id" = "memory_asset"."assetsId"
+          inner join "memory_asset" on "asset"."id" = "memory_asset"."assetId"
         where
           "memory_asset"."memoriesId" = "memory"."id"
           and "asset"."visibility" = 'timeline'
@@ -104,7 +104,7 @@ select
           "asset".*
         from
           "asset"
-          inner join "memory_asset" on "asset"."id" = "memory_asset"."assetsId"
+          inner join "memory_asset" on "asset"."id" = "memory_asset"."assetId"
         where
           "memory_asset"."memoriesId" = "memory"."id"
           and "asset"."visibility" = 'timeline'
@@ -137,7 +137,7 @@ select
           "asset".*
         from
           "asset"
-          inner join "memory_asset" on "asset"."id" = "memory_asset"."assetsId"
+          inner join "memory_asset" on "asset"."id" = "memory_asset"."assetId"
         where
           "memory_asset"."memoriesId" = "memory"."id"
           and "asset"."visibility" = 'timeline'
@@ -159,15 +159,15 @@ where
 
 -- MemoryRepository.getAssetIds
 select
-  "assetsId"
+  "assetId"
 from
   "memory_asset"
 where
   "memoriesId" = $1
-  and "assetsId" in ($2)
+  and "assetId" in ($2)
 
 -- MemoryRepository.addAssetIds
 insert into
-  "memory_asset" ("memoriesId", "assetsId")
+  "memory_asset" ("memoriesId", "assetId")
 values
   ($1, $2)
diff --git a/server/src/queries/shared.link.asset.repository.sql b/server/src/queries/shared.link.asset.repository.sql
index 7acee50812..7f9ebc03d1 100644
--- a/server/src/queries/shared.link.asset.repository.sql
+++ b/server/src/queries/shared.link.asset.repository.sql
@@ -4,10 +4,10 @@
 insert into
   "shared_link_asset"
 select
-  $1 as "assetsId",
-  "shared_link_asset"."sharedLinksId"
+  $1 as "assetId",
+  "shared_link_asset"."sharedLinkId"
 from
   "shared_link_asset"
 where
-  "shared_link_asset"."assetsId" = $2
+  "shared_link_asset"."assetId" = $2
 on conflict do nothing
diff --git a/server/src/queries/shared.link.repository.sql b/server/src/queries/shared.link.repository.sql
index 0f46846c14..8540da91c8 100644
--- a/server/src/queries/shared.link.repository.sql
+++ b/server/src/queries/shared.link.repository.sql
@@ -19,7 +19,7 @@ from
       to_json("exifInfo") as "exifInfo"
     from
       "shared_link_asset"
-      inner join "asset" on "asset"."id" = "shared_link_asset"."assetsId"
+      inner join "asset" on "asset"."id" = "shared_link_asset"."assetId"
       inner join lateral (
         select
           "asset_exif".*
@@ -29,7 +29,7 @@ from
           "asset_exif"."assetId" = "asset"."id"
       ) as "exifInfo" on true
     where
-      "shared_link"."id" = "shared_link_asset"."sharedLinksId"
+      "shared_link"."id" = "shared_link_asset"."sharedLinkId"
       and "asset"."deletedAt" is null
     order by
       "asset"."fileCreatedAt" asc
@@ -51,7 +51,7 @@ from
       to_json("owner") as "owner"
     from
       "album"
-      left join "album_asset" on "album_asset"."albumsId" = "album"."id"
+      left join "album_asset" on "album_asset"."albumId" = "album"."id"
       left join lateral (
         select
           "asset".*,
@@ -67,7 +67,7 @@ from
               "asset_exif"."assetId" = "asset"."id"
           ) as "exifInfo" on true
         where
-          "album_asset"."assetsId" = "asset"."id"
+          "album_asset"."assetId" = "asset"."id"
           and "asset"."deletedAt" is null
         order by
           "asset"."fileCreatedAt" asc
@@ -108,14 +108,14 @@ select distinct
   to_json("album") as "album"
 from
   "shared_link"
-  left join "shared_link_asset" on "shared_link_asset"."sharedLinksId" = "shared_link"."id"
+  left join "shared_link_asset" on "shared_link_asset"."sharedLinkId" = "shared_link"."id"
   left join lateral (
     select
       json_agg("asset") as "assets"
     from
       "asset"
     where
-      "asset"."id" = "shared_link_asset"."assetsId"
+      "asset"."id" = "shared_link_asset"."assetId"
       and "asset"."deletedAt" is null
   ) as "assets" on true
   left join lateral (
diff --git a/server/src/queries/stack.repository.sql b/server/src/queries/stack.repository.sql
index 0bfb5df2fb..64714e5665 100644
--- a/server/src/queries/stack.repository.sql
+++ b/server/src/queries/stack.repository.sql
@@ -89,9 +89,9 @@ select
                   "tag"."parentId"
                 from
                   "tag"
-                  inner join "tag_asset" on "tag"."id" = "tag_asset"."tagsId"
+                  inner join "tag_asset" on "tag"."id" = "tag_asset"."tagId"
                 where
-                  "tag_asset"."assetsId" = "asset"."id"
+                  "tag_asset"."assetId" = "asset"."id"
               ) as agg
           ) as "tags",
           to_json("exifInfo") as "exifInfo"
diff --git a/server/src/queries/sync.repository.sql b/server/src/queries/sync.repository.sql
index 809b59df10..7c1dc3b6b4 100644
--- a/server/src/queries/sync.repository.sql
+++ b/server/src/queries/sync.repository.sql
@@ -2,12 +2,12 @@
 
 -- SyncRepository.album.getCreatedAfter
 select
-  "albumsId" as "id",
+  "albumId" as "id",
   "createId"
 from
   "album_user"
 where
-  "usersId" = $1
+  "userId" = $1
   and "createId" >= $2
   and "createId" < $3
 order by
@@ -40,13 +40,13 @@ select distinct
   "album"."updateId"
 from
   "album" as "album"
-  left join "album_user" as "album_users" on "album"."id" = "album_users"."albumsId"
+  left join "album_user" as "album_users" on "album"."id" = "album_users"."albumId"
 where
   "album"."updateId" < $1
   and "album"."updateId" > $2
   and (
     "album"."ownerId" = $3
-    or "album_users"."usersId" = $4
+    or "album_users"."userId" = $4
   )
 order by
   "album"."updateId" asc
@@ -72,12 +72,12 @@ select
   "album_asset"."updateId"
 from
   "album_asset" as "album_asset"
-  inner join "asset" on "asset"."id" = "album_asset"."assetsId"
+  inner join "asset" on "asset"."id" = "album_asset"."assetId"
 where
   "album_asset"."updateId" < $1
   and "album_asset"."updateId" <= $2
   and "album_asset"."updateId" >= $3
-  and "album_asset"."albumsId" = $4
+  and "album_asset"."albumId" = $4
 order by
   "album_asset"."updateId" asc
 
@@ -102,16 +102,16 @@ select
   "asset"."updateId"
 from
   "asset" as "asset"
-  inner join "album_asset" on "album_asset"."assetsId" = "asset"."id"
-  inner join "album" on "album"."id" = "album_asset"."albumsId"
-  left join "album_user" on "album_user"."albumsId" = "album_asset"."albumsId"
+  inner join "album_asset" on "album_asset"."assetId" = "asset"."id"
+  inner join "album" on "album"."id" = "album_asset"."albumId"
+  left join "album_user" on "album_user"."albumId" = "album_asset"."albumId"
 where
   "asset"."updateId" < $1
   and "asset"."updateId" > $2
   and "album_asset"."updateId" <= $3
   and (
     "album"."ownerId" = $4
-    or "album_user"."usersId" = $5
+    or "album_user"."userId" = $5
   )
 order by
   "asset"."updateId" asc
@@ -137,15 +137,15 @@ select
   "asset"."libraryId"
 from
   "album_asset" as "album_asset"
-  inner join "asset" on "asset"."id" = "album_asset"."assetsId"
-  inner join "album" on "album"."id" = "album_asset"."albumsId"
-  left join "album_user" on "album_user"."albumsId" = "album_asset"."albumsId"
+  inner join "asset" on "asset"."id" = "album_asset"."assetId"
+  inner join "album" on "album"."id" = "album_asset"."albumId"
+  left join "album_user" on "album_user"."albumId" = "album_asset"."albumId"
 where
   "album_asset"."updateId" < $1
   and "album_asset"."updateId" > $2
   and (
     "album"."ownerId" = $3
-    or "album_user"."usersId" = $4
+    or "album_user"."userId" = $4
   )
 order by
   "album_asset"."updateId" asc
@@ -180,12 +180,12 @@ select
   "album_asset"."updateId"
 from
   "album_asset" as "album_asset"
-  inner join "asset_exif" on "asset_exif"."assetId" = "album_asset"."assetsId"
+  inner join "asset_exif" on "asset_exif"."assetId" = "album_asset"."assetId"
 where
   "album_asset"."updateId" < $1
   and "album_asset"."updateId" <= $2
   and "album_asset"."updateId" >= $3
-  and "album_asset"."albumsId" = $4
+  and "album_asset"."albumId" = $4
 order by
   "album_asset"."updateId" asc
 
@@ -219,16 +219,16 @@ select
   "asset_exif"."updateId"
 from
   "asset_exif" as "asset_exif"
-  inner join "album_asset" on "album_asset"."assetsId" = "asset_exif"."assetId"
-  inner join "album" on "album"."id" = "album_asset"."albumsId"
-  left join "album_user" on "album_user"."albumsId" = "album_asset"."albumsId"
+  inner join "album_asset" on "album_asset"."assetId" = "asset_exif"."assetId"
+  inner join "album" on "album"."id" = "album_asset"."albumId"
+  left join "album_user" on "album_user"."albumId" = "album_asset"."albumId"
 where
   "asset_exif"."updateId" < $1
   and "asset_exif"."updateId" > $2
   and "album_asset"."updateId" <= $3
   and (
     "album"."ownerId" = $4
-    or "album_user"."usersId" = $5
+    or "album_user"."userId" = $5
   )
 order by
   "asset_exif"."updateId" asc
@@ -263,23 +263,23 @@ select
   "asset_exif"."fps"
 from
   "album_asset" as "album_asset"
-  inner join "asset_exif" on "asset_exif"."assetId" = "album_asset"."assetsId"
-  inner join "album" on "album"."id" = "album_asset"."albumsId"
-  left join "album_user" on "album_user"."albumsId" = "album_asset"."albumsId"
+  inner join "asset_exif" on "asset_exif"."assetId" = "album_asset"."assetId"
+  inner join "album" on "album"."id" = "album_asset"."albumId"
+  left join "album_user" on "album_user"."albumId" = "album_asset"."albumId"
 where
   "album_asset"."updateId" < $1
   and "album_asset"."updateId" > $2
   and (
     "album"."ownerId" = $3
-    or "album_user"."usersId" = $4
+    or "album_user"."userId" = $4
   )
 order by
   "album_asset"."updateId" asc
 
 -- SyncRepository.albumToAsset.getBackfill
 select
-  "album_asset"."assetsId" as "assetId",
-  "album_asset"."albumsId" as "albumId",
+  "album_asset"."assetId" as "assetId",
+  "album_asset"."albumId" as "albumId",
   "album_asset"."updateId"
 from
   "album_asset" as "album_asset"
@@ -287,7 +287,7 @@ where
   "album_asset"."updateId" < $1
   and "album_asset"."updateId" <= $2
   and "album_asset"."updateId" >= $3
-  and "album_asset"."albumsId" = $4
+  and "album_asset"."albumId" = $4
 order by
   "album_asset"."updateId" asc
 
@@ -311,11 +311,11 @@ where
     union
     (
       select
-        "album_user"."albumsId" as "id"
+        "album_user"."albumId" as "id"
       from
         "album_user"
       where
-        "album_user"."usersId" = $4
+        "album_user"."userId" = $4
     )
   )
 order by
@@ -323,27 +323,27 @@ order by
 
 -- SyncRepository.albumToAsset.getUpserts
 select
-  "album_asset"."assetsId" as "assetId",
-  "album_asset"."albumsId" as "albumId",
+  "album_asset"."assetId" as "assetId",
+  "album_asset"."albumId" as "albumId",
   "album_asset"."updateId"
 from
   "album_asset" as "album_asset"
-  inner join "album" on "album"."id" = "album_asset"."albumsId"
-  left join "album_user" on "album_user"."albumsId" = "album_asset"."albumsId"
+  inner join "album" on "album"."id" = "album_asset"."albumId"
+  left join "album_user" on "album_user"."albumId" = "album_asset"."albumId"
 where
   "album_asset"."updateId" < $1
   and "album_asset"."updateId" > $2
   and (
     "album"."ownerId" = $3
-    or "album_user"."usersId" = $4
+    or "album_user"."userId" = $4
   )
 order by
   "album_asset"."updateId" asc
 
 -- SyncRepository.albumUser.getBackfill
 select
-  "album_user"."albumsId" as "albumId",
-  "album_user"."usersId" as "userId",
+  "album_user"."albumId" as "albumId",
+  "album_user"."userId" as "userId",
   "album_user"."role",
   "album_user"."updateId"
 from
@@ -352,7 +352,7 @@ where
   "album_user"."updateId" < $1
   and "album_user"."updateId" <= $2
   and "album_user"."updateId" >= $3
-  and "albumsId" = $4
+  and "albumId" = $4
 order by
   "album_user"."updateId" asc
 
@@ -376,11 +376,11 @@ where
     union
     (
       select
-        "album_user"."albumsId" as "id"
+        "album_user"."albumId" as "id"
       from
         "album_user"
       where
-        "album_user"."usersId" = $4
+        "album_user"."userId" = $4
     )
   )
 order by
@@ -388,8 +388,8 @@ order by
 
 -- SyncRepository.albumUser.getUpserts
 select
-  "album_user"."albumsId" as "albumId",
-  "album_user"."usersId" as "userId",
+  "album_user"."albumId" as "albumId",
+  "album_user"."userId" as "userId",
   "album_user"."role",
   "album_user"."updateId"
 from
@@ -397,7 +397,7 @@ from
 where
   "album_user"."updateId" < $1
   and "album_user"."updateId" > $2
-  and "album_user"."albumsId" in (
+  and "album_user"."albumId" in (
     select
       "id"
     from
@@ -407,11 +407,11 @@ where
     union
     (
       select
-        "albumUsers"."albumsId" as "id"
+        "albumUsers"."albumId" as "id"
       from
         "album_user" as "albumUsers"
       where
-        "albumUsers"."usersId" = $4
+        "albumUsers"."userId" = $4
     )
   )
 order by
@@ -656,7 +656,7 @@ order by
 -- SyncRepository.memoryToAsset.getUpserts
 select
   "memoriesId" as "memoryId",
-  "assetsId" as "assetId",
+  "assetId" as "assetId",
   "updateId"
 from
   "memory_asset" as "memory_asset"
diff --git a/server/src/queries/tag.repository.sql b/server/src/queries/tag.repository.sql
index ee961f3801..6d7314eab9 100644
--- a/server/src/queries/tag.repository.sql
+++ b/server/src/queries/tag.repository.sql
@@ -84,15 +84,15 @@ where
 
 -- TagRepository.addAssetIds
 insert into
-  "tag_asset" ("tagsId", "assetsId")
+  "tag_asset" ("tagId", "assetId")
 values
   ($1, $2)
 
 -- TagRepository.removeAssetIds
 delete from "tag_asset"
 where
-  "tagsId" = $1
-  and "assetsId" in ($2)
+  "tagId" = $1
+  and "assetId" in ($2)
 
 -- TagRepository.upsertAssetIds
 insert into
@@ -107,9 +107,9 @@ returning
 begin
 delete from "tag_asset"
 where
-  "assetsId" = $1
+  "assetId" = $1
 insert into
-  "tag_asset" ("tagsId", "assetsId")
+  "tag_asset" ("tagId", "assetId")
 values
   ($1, $2)
 on conflict do nothing
diff --git a/server/src/repositories/access.repository.ts b/server/src/repositories/access.repository.ts
index ca12ff040b..a801c046aa 100644
--- a/server/src/repositories/access.repository.ts
+++ b/server/src/repositories/access.repository.ts
@@ -52,8 +52,8 @@ class ActivityAccess {
     return this.db
       .selectFrom('album')
       .select('album.id')
-      .leftJoin('album_user as albumUsers', 'albumUsers.albumsId', 'album.id')
-      .leftJoin('user', (join) => join.onRef('user.id', '=', 'albumUsers.usersId').on('user.deletedAt', 'is', null))
+      .leftJoin('album_user as albumUsers', 'albumUsers.albumId', 'album.id')
+      .leftJoin('user', (join) => join.onRef('user.id', '=', 'albumUsers.userId').on('user.deletedAt', 'is', null))
       .where('album.id', 'in', [...albumIds])
       .where('album.isActivityEnabled', '=', true)
       .where((eb) => eb.or([eb('album.ownerId', '=', userId), eb('user.id', '=', userId)]))
@@ -96,8 +96,8 @@ class AlbumAccess {
     return this.db
       .selectFrom('album')
       .select('album.id')
-      .leftJoin('album_user', 'album_user.albumsId', 'album.id')
-      .leftJoin('user', (join) => join.onRef('user.id', '=', 'album_user.usersId').on('user.deletedAt', 'is', null))
+      .leftJoin('album_user', 'album_user.albumId', 'album.id')
+      .leftJoin('user', (join) => join.onRef('user.id', '=', 'album_user.userId').on('user.deletedAt', 'is', null))
       .where('album.id', 'in', [...albumIds])
       .where('album.deletedAt', 'is', null)
       .where('user.id', '=', userId)
@@ -138,12 +138,12 @@ class AssetAccess {
     return this.db
       .with('target', (qb) => qb.selectNoFrom(sql`array[${sql.join([...assetIds])}]::uuid[]`.as('ids')))
       .selectFrom('album')
-      .innerJoin('album_asset as albumAssets', 'album.id', 'albumAssets.albumsId')
+      .innerJoin('album_asset as albumAssets', 'album.id', 'albumAssets.albumId')
       .innerJoin('asset', (join) =>
-        join.onRef('asset.id', '=', 'albumAssets.assetsId').on('asset.deletedAt', 'is', null),
+        join.onRef('asset.id', '=', 'albumAssets.assetId').on('asset.deletedAt', 'is', null),
       )
-      .leftJoin('album_user as albumUsers', 'albumUsers.albumsId', 'album.id')
-      .leftJoin('user', (join) => join.onRef('user.id', '=', 'albumUsers.usersId').on('user.deletedAt', 'is', null))
+      .leftJoin('album_user as albumUsers', 'albumUsers.albumId', 'album.id')
+      .leftJoin('user', (join) => join.onRef('user.id', '=', 'albumUsers.userId').on('user.deletedAt', 'is', null))
       .crossJoin('target')
       .select(['asset.id', 'asset.livePhotoVideoId'])
       .where((eb) =>
@@ -223,13 +223,13 @@ class AssetAccess {
     return this.db
       .selectFrom('shared_link')
       .leftJoin('album', (join) => join.onRef('album.id', '=', 'shared_link.albumId').on('album.deletedAt', 'is', null))
-      .leftJoin('shared_link_asset', 'shared_link_asset.sharedLinksId', 'shared_link.id')
+      .leftJoin('shared_link_asset', 'shared_link_asset.sharedLinkId', 'shared_link.id')
       .leftJoin('asset', (join) =>
-        join.onRef('asset.id', '=', 'shared_link_asset.assetsId').on('asset.deletedAt', 'is', null),
+        join.onRef('asset.id', '=', 'shared_link_asset.assetId').on('asset.deletedAt', 'is', null),
       )
-      .leftJoin('album_asset', 'album_asset.albumsId', 'album.id')
+      .leftJoin('album_asset', 'album_asset.albumId', 'album.id')
       .leftJoin('asset as albumAssets', (join) =>
-        join.onRef('albumAssets.id', '=', 'album_asset.assetsId').on('albumAssets.deletedAt', 'is', null),
+        join.onRef('albumAssets.id', '=', 'album_asset.assetId').on('albumAssets.deletedAt', 'is', null),
       )
       .select([
         'asset.id as assetId',
diff --git a/server/src/repositories/album-user.repository.ts b/server/src/repositories/album-user.repository.ts
index 2fce797aff..1a1e58a77d 100644
--- a/server/src/repositories/album-user.repository.ts
+++ b/server/src/repositories/album-user.repository.ts
@@ -7,36 +7,36 @@ import { DB } from 'src/schema';
 import { AlbumUserTable } from 'src/schema/tables/album-user.table';
 
 export type AlbumPermissionId = {
-  albumsId: string;
-  usersId: string;
+  albumId: string;
+  userId: string;
 };
 
 @Injectable()
 export class AlbumUserRepository {
   constructor(@InjectKysely() private db: Kysely<DB>) {}
 
-  @GenerateSql({ params: [{ usersId: DummyValue.UUID, albumsId: DummyValue.UUID }] })
+  @GenerateSql({ params: [{ userId: DummyValue.UUID, albumId: DummyValue.UUID }] })
   create(albumUser: Insertable<AlbumUserTable>) {
     return this.db
       .insertInto('album_user')
       .values(albumUser)
-      .returning(['usersId', 'albumsId', 'role'])
+      .returning(['userId', 'albumId', 'role'])
       .executeTakeFirstOrThrow();
   }
 
-  @GenerateSql({ params: [{ usersId: DummyValue.UUID, albumsId: DummyValue.UUID }, { role: AlbumUserRole.Viewer }] })
-  update({ usersId, albumsId }: AlbumPermissionId, dto: Updateable<AlbumUserTable>) {
+  @GenerateSql({ params: [{ userId: DummyValue.UUID, albumId: DummyValue.UUID }, { role: AlbumUserRole.Viewer }] })
+  update({ userId, albumId }: AlbumPermissionId, dto: Updateable<AlbumUserTable>) {
     return this.db
       .updateTable('album_user')
       .set(dto)
-      .where('usersId', '=', usersId)
-      .where('albumsId', '=', albumsId)
+      .where('userId', '=', userId)
+      .where('albumId', '=', albumId)
       .returningAll()
       .executeTakeFirstOrThrow();
   }
 
-  @GenerateSql({ params: [{ usersId: DummyValue.UUID, albumsId: DummyValue.UUID }] })
-  async delete({ usersId, albumsId }: AlbumPermissionId): Promise<void> {
-    await this.db.deleteFrom('album_user').where('usersId', '=', usersId).where('albumsId', '=', albumsId).execute();
+  @GenerateSql({ params: [{ userId: DummyValue.UUID, albumId: DummyValue.UUID }] })
+  async delete({ userId, albumId }: AlbumPermissionId): Promise<void> {
+    await this.db.deleteFrom('album_user').where('userId', '=', userId).where('albumId', '=', albumId).execute();
   }
 }
diff --git a/server/src/repositories/album.repository.ts b/server/src/repositories/album.repository.ts
index f5bfe44efe..100ab908c0 100644
--- a/server/src/repositories/album.repository.ts
+++ b/server/src/repositories/album.repository.ts
@@ -33,11 +33,11 @@ const withAlbumUsers = (eb: ExpressionBuilder<DB, 'album'>) => {
       .selectFrom('album_user')
       .select('album_user.role')
       .select((eb) =>
-        jsonObjectFrom(eb.selectFrom('user').select(columns.user).whereRef('user.id', '=', 'album_user.usersId'))
+        jsonObjectFrom(eb.selectFrom('user').select(columns.user).whereRef('user.id', '=', 'album_user.userId'))
           .$notNull()
           .as('user'),
       )
-      .whereRef('album_user.albumsId', '=', 'album.id'),
+      .whereRef('album_user.albumId', '=', 'album.id'),
   )
     .$notNull()
     .as('albumUsers');
@@ -57,8 +57,8 @@ const withAssets = (eb: ExpressionBuilder<DB, 'album'>) => {
         .selectAll('asset')
         .leftJoin('asset_exif', 'asset.id', 'asset_exif.assetId')
         .select((eb) => eb.table('asset_exif').$castTo<Exif>().as('exifInfo'))
-        .innerJoin('album_asset', 'album_asset.assetsId', 'asset.id')
-        .whereRef('album_asset.albumsId', '=', 'album.id')
+        .innerJoin('album_asset', 'album_asset.assetId', 'asset.id')
+        .whereRef('album_asset.albumId', '=', 'album.id')
         .where('asset.deletedAt', 'is', null)
         .$call(withDefaultVisibility)
         .orderBy('asset.fileCreatedAt', 'desc')
@@ -92,19 +92,19 @@ export class AlbumRepository {
     return this.db
       .selectFrom('album')
       .selectAll('album')
-      .innerJoin('album_asset', 'album_asset.albumsId', 'album.id')
+      .innerJoin('album_asset', 'album_asset.albumId', 'album.id')
       .where((eb) =>
         eb.or([
           eb('album.ownerId', '=', ownerId),
           eb.exists(
             eb
               .selectFrom('album_user')
-              .whereRef('album_user.albumsId', '=', 'album.id')
-              .where('album_user.usersId', '=', ownerId),
+              .whereRef('album_user.albumId', '=', 'album.id')
+              .where('album_user.userId', '=', ownerId),
           ),
         ]),
       )
-      .where('album_asset.assetsId', '=', assetId)
+      .where('album_asset.assetId', '=', assetId)
       .where('album.deletedAt', 'is', null)
       .orderBy('album.createdAt', 'desc')
       .select(withOwner)
@@ -125,16 +125,16 @@ export class AlbumRepository {
       this.db
         .selectFrom('asset')
         .$call(withDefaultVisibility)
-        .innerJoin('album_asset', 'album_asset.assetsId', 'asset.id')
-        .select('album_asset.albumsId as albumId')
+        .innerJoin('album_asset', 'album_asset.assetId', 'asset.id')
+        .select('album_asset.albumId as albumId')
         .select((eb) => eb.fn.min(sql<Date>`("asset"."localDateTime" AT TIME ZONE 'UTC'::text)::date`).as('startDate'))
         .select((eb) => eb.fn.max(sql<Date>`("asset"."localDateTime" AT TIME ZONE 'UTC'::text)::date`).as('endDate'))
         // lastModifiedAssetTimestamp is only used in mobile app, please remove if not need
         .select((eb) => eb.fn.max('asset.updatedAt').as('lastModifiedAssetTimestamp'))
         .select((eb) => sql<number>`${eb.fn.count('asset.id')}::int`.as('assetCount'))
-        .where('album_asset.albumsId', 'in', ids)
+        .where('album_asset.albumId', 'in', ids)
         .where('asset.deletedAt', 'is', null)
-        .groupBy('album_asset.albumsId')
+        .groupBy('album_asset.albumId')
         .execute()
     );
   }
@@ -166,8 +166,8 @@ export class AlbumRepository {
           eb.exists(
             eb
               .selectFrom('album_user')
-              .whereRef('album_user.albumsId', '=', 'album.id')
-              .where((eb) => eb.or([eb('album.ownerId', '=', ownerId), eb('album_user.usersId', '=', ownerId)])),
+              .whereRef('album_user.albumId', '=', 'album.id')
+              .where((eb) => eb.or([eb('album.ownerId', '=', ownerId), eb('album_user.userId', '=', ownerId)])),
           ),
           eb.exists(
             eb
@@ -195,7 +195,7 @@ export class AlbumRepository {
       .selectAll('album')
       .where('album.ownerId', '=', ownerId)
       .where('album.deletedAt', 'is', null)
-      .where((eb) => eb.not(eb.exists(eb.selectFrom('album_user').whereRef('album_user.albumsId', '=', 'album.id'))))
+      .where((eb) => eb.not(eb.exists(eb.selectFrom('album_user').whereRef('album_user.albumId', '=', 'album.id'))))
       .where((eb) => eb.not(eb.exists(eb.selectFrom('shared_link').whereRef('shared_link.albumId', '=', 'album.id'))))
       .select(withOwner)
       .orderBy('album.createdAt', 'desc')
@@ -217,7 +217,7 @@ export class AlbumRepository {
   @GenerateSql({ params: [[DummyValue.UUID]] })
   @Chunked()
   async removeAssetsFromAll(assetIds: string[]): Promise<void> {
-    await this.db.deleteFrom('album_asset').where('album_asset.assetsId', 'in', assetIds).execute();
+    await this.db.deleteFrom('album_asset').where('album_asset.assetId', 'in', assetIds).execute();
   }
 
   @Chunked({ paramIndex: 1 })
@@ -228,8 +228,8 @@ export class AlbumRepository {
 
     await this.db
       .deleteFrom('album_asset')
-      .where('album_asset.albumsId', '=', albumId)
-      .where('album_asset.assetsId', 'in', assetIds)
+      .where('album_asset.albumId', '=', albumId)
+      .where('album_asset.assetId', 'in', assetIds)
       .execute();
   }
 
@@ -250,10 +250,10 @@ export class AlbumRepository {
     return this.db
       .selectFrom('album_asset')
       .selectAll()
-      .where('album_asset.albumsId', '=', albumId)
-      .where('album_asset.assetsId', 'in', assetIds)
+      .where('album_asset.albumId', '=', albumId)
+      .where('album_asset.assetId', 'in', assetIds)
       .execute()
-      .then((results) => new Set(results.map(({ assetsId }) => assetsId)));
+      .then((results) => new Set(results.map(({ assetId }) => assetId)));
   }
 
   async addAssetIds(albumId: string, assetIds: string[]): Promise<void> {
@@ -276,7 +276,7 @@ export class AlbumRepository {
         await tx
           .insertInto('album_user')
           .values(
-            albumUsers.map((albumUser) => ({ albumsId: newAlbum.id, usersId: albumUser.userId, role: albumUser.role })),
+            albumUsers.map((albumUser) => ({ albumId: newAlbum.id, userId: albumUser.userId, role: albumUser.role })),
           )
           .execute();
       }
@@ -317,12 +317,12 @@ export class AlbumRepository {
 
     await db
       .insertInto('album_asset')
-      .values(assetIds.map((assetId) => ({ albumsId: albumId, assetsId: assetId })))
+      .values(assetIds.map((assetId) => ({ albumId, assetId })))
       .execute();
   }
 
   @Chunked({ chunkSize: 30_000 })
-  async addAssetIdsToAlbums(values: { albumsId: string; assetsId: string }[]): Promise<void> {
+  async addAssetIdsToAlbums(values: { albumId: string; assetId: string }[]): Promise<void> {
     if (values.length === 0) {
       return;
     }
@@ -344,7 +344,7 @@ export class AlbumRepository {
       .updateTable('album')
       .set((eb) => ({
         albumThumbnailAssetId: this.updateThumbnailBuilder(eb)
-          .select('album_asset.assetsId')
+          .select('album_asset.assetId')
           .orderBy('asset.fileCreatedAt', 'desc')
           .limit(1),
       }))
@@ -360,7 +360,7 @@ export class AlbumRepository {
               eb.exists(
                 this.updateThumbnailBuilder(eb)
                   .select(sql`1`.as('1'))
-                  .whereRef('album.albumThumbnailAssetId', '=', 'album_asset.assetsId'), // Has invalid assets
+                  .whereRef('album.albumThumbnailAssetId', '=', 'album_asset.assetId'), // Has invalid assets
               ),
             ),
           ]),
@@ -375,9 +375,9 @@ export class AlbumRepository {
     return eb
       .selectFrom('album_asset')
       .innerJoin('asset', (join) =>
-        join.onRef('album_asset.assetsId', '=', 'asset.id').on('asset.deletedAt', 'is', null),
+        join.onRef('album_asset.assetId', '=', 'asset.id').on('asset.deletedAt', 'is', null),
       )
-      .whereRef('album_asset.albumsId', '=', 'album.id');
+      .whereRef('album_asset.albumId', '=', 'album.id');
   }
 
   /**
@@ -388,9 +388,9 @@ export class AlbumRepository {
   getContributorCounts(id: string) {
     return this.db
       .selectFrom('album_asset')
-      .innerJoin('asset', 'asset.id', 'assetsId')
+      .innerJoin('asset', 'asset.id', 'assetId')
       .where('asset.deletedAt', 'is', sql.lit(null))
-      .where('album_asset.albumsId', '=', id)
+      .where('album_asset.albumId', '=', id)
       .select('asset.ownerId as userId')
       .select((eb) => eb.fn.countAll<number>().as('assetCount'))
       .groupBy('asset.ownerId')
@@ -405,8 +405,8 @@ export class AlbumRepository {
       .expression((eb) =>
         eb
           .selectFrom('album_asset')
-          .select((eb) => ['album_asset.albumsId', eb.val(targetAssetId).as('assetsId')])
-          .where('album_asset.assetsId', '=', sourceAssetId),
+          .select((eb) => ['album_asset.albumId', eb.val(targetAssetId).as('assetId')])
+          .where('album_asset.assetId', '=', sourceAssetId),
       )
       .onConflict((oc) => oc.doNothing())
       .execute();
diff --git a/server/src/repositories/asset-job.repository.ts b/server/src/repositories/asset-job.repository.ts
index 6094708d1b..8d54e93c87 100644
--- a/server/src/repositories/asset-job.repository.ts
+++ b/server/src/repositories/asset-job.repository.ts
@@ -46,8 +46,8 @@ export class AssetJobRepository {
           eb
             .selectFrom('tag')
             .select(['tag.value'])
-            .innerJoin('tag_asset', 'tag.id', 'tag_asset.tagsId')
-            .whereRef('asset.id', '=', 'tag_asset.assetsId'),
+            .innerJoin('tag_asset', 'tag.id', 'tag_asset.tagId')
+            .whereRef('asset.id', '=', 'tag_asset.assetId'),
         ).as('tags'),
       )
       .limit(1)
diff --git a/server/src/repositories/asset.repository.ts b/server/src/repositories/asset.repository.ts
index c4227e6412..8e793f9603 100644
--- a/server/src/repositories/asset.repository.ts
+++ b/server/src/repositories/asset.repository.ts
@@ -563,8 +563,8 @@ export class AssetRepository {
           .$if(!!options.visibility, (qb) => qb.where('asset.visibility', '=', options.visibility!))
           .$if(!!options.albumId, (qb) =>
             qb
-              .innerJoin('album_asset', 'asset.id', 'album_asset.assetsId')
-              .where('album_asset.albumsId', '=', asUuid(options.albumId!)),
+              .innerJoin('album_asset', 'asset.id', 'album_asset.assetId')
+              .where('album_asset.albumId', '=', asUuid(options.albumId!)),
           )
           .$if(!!options.personId, (qb) => hasPeople(qb, [options.personId!]))
           .$if(!!options.withStacked, (qb) =>
@@ -641,8 +641,8 @@ export class AssetRepository {
               eb.exists(
                 eb
                   .selectFrom('album_asset')
-                  .whereRef('album_asset.assetsId', '=', 'asset.id')
-                  .where('album_asset.albumsId', '=', asUuid(options.albumId!)),
+                  .whereRef('album_asset.assetId', '=', 'asset.id')
+                  .where('album_asset.albumId', '=', asUuid(options.albumId!)),
               ),
             ),
           )
diff --git a/server/src/repositories/download.repository.ts b/server/src/repositories/download.repository.ts
index ecc1e4d3ab..61a0f23d5e 100644
--- a/server/src/repositories/download.repository.ts
+++ b/server/src/repositories/download.repository.ts
@@ -26,8 +26,8 @@ export class DownloadRepository {
 
   downloadAlbumId(albumId: string) {
     return builder(this.db)
-      .innerJoin('album_asset', 'asset.id', 'album_asset.assetsId')
-      .where('album_asset.albumsId', '=', albumId)
+      .innerJoin('album_asset', 'asset.id', 'album_asset.assetId')
+      .where('album_asset.albumId', '=', albumId)
       .stream();
   }
 
diff --git a/server/src/repositories/map.repository.ts b/server/src/repositories/map.repository.ts
index 7f6e2a967a..304cf89c32 100644
--- a/server/src/repositories/map.repository.ts
+++ b/server/src/repositories/map.repository.ts
@@ -126,8 +126,8 @@ export class MapRepository {
             eb.exists((eb) =>
               eb
                 .selectFrom('album_asset')
-                .whereRef('asset.id', '=', 'album_asset.assetsId')
-                .where('album_asset.albumsId', 'in', albumIds),
+                .whereRef('asset.id', '=', 'album_asset.assetId')
+                .where('album_asset.albumId', 'in', albumIds),
             ),
           );
         }
diff --git a/server/src/repositories/memory.repository.ts b/server/src/repositories/memory.repository.ts
index 65b4cb3df7..c4a9144530 100644
--- a/server/src/repositories/memory.repository.ts
+++ b/server/src/repositories/memory.repository.ts
@@ -18,7 +18,7 @@ export class MemoryRepository implements IBulkAsset {
     await this.db
       .deleteFrom('memory_asset')
       .using('asset')
-      .whereRef('memory_asset.assetsId', '=', 'asset.id')
+      .whereRef('memory_asset.assetId', '=', 'asset.id')
       .where('asset.visibility', '!=', AssetVisibility.Timeline)
       .execute();
 
@@ -64,7 +64,7 @@ export class MemoryRepository implements IBulkAsset {
           eb
             .selectFrom('asset')
             .selectAll('asset')
-            .innerJoin('memory_asset', 'asset.id', 'memory_asset.assetsId')
+            .innerJoin('memory_asset', 'asset.id', 'memory_asset.assetId')
             .whereRef('memory_asset.memoriesId', '=', 'memory.id')
             .orderBy('asset.fileCreatedAt', 'asc')
             .where('asset.visibility', '=', sql.lit(AssetVisibility.Timeline))
@@ -86,7 +86,7 @@ export class MemoryRepository implements IBulkAsset {
       const { id } = await tx.insertInto('memory').values(memory).returning('id').executeTakeFirstOrThrow();
 
       if (assetIds.size > 0) {
-        const values = [...assetIds].map((assetId) => ({ memoriesId: id, assetsId: assetId }));
+        const values = [...assetIds].map((assetId) => ({ memoriesId: id, assetId }));
         await tx.insertInto('memory_asset').values(values).execute();
       }
 
@@ -116,12 +116,12 @@ export class MemoryRepository implements IBulkAsset {
 
     const results = await this.db
       .selectFrom('memory_asset')
-      .select(['assetsId'])
+      .select(['assetId'])
       .where('memoriesId', '=', id)
-      .where('assetsId', 'in', assetIds)
+      .where('assetId', 'in', assetIds)
       .execute();
 
-    return new Set(results.map(({ assetsId }) => assetsId));
+    return new Set(results.map(({ assetId }) => assetId));
   }
 
   @GenerateSql({ params: [DummyValue.UUID, [DummyValue.UUID]] })
@@ -132,7 +132,7 @@ export class MemoryRepository implements IBulkAsset {
 
     await this.db
       .insertInto('memory_asset')
-      .values(assetIds.map((assetId) => ({ memoriesId: id, assetsId: assetId })))
+      .values(assetIds.map((assetId) => ({ memoriesId: id, assetId })))
       .execute();
   }
 
@@ -143,7 +143,7 @@ export class MemoryRepository implements IBulkAsset {
       return;
     }
 
-    await this.db.deleteFrom('memory_asset').where('memoriesId', '=', id).where('assetsId', 'in', assetIds).execute();
+    await this.db.deleteFrom('memory_asset').where('memoriesId', '=', id).where('assetId', 'in', assetIds).execute();
   }
 
   private getByIdBuilder(id: string) {
@@ -155,7 +155,7 @@ export class MemoryRepository implements IBulkAsset {
           eb
             .selectFrom('asset')
             .selectAll('asset')
-            .innerJoin('memory_asset', 'asset.id', 'memory_asset.assetsId')
+            .innerJoin('memory_asset', 'asset.id', 'memory_asset.assetId')
             .whereRef('memory_asset.memoriesId', '=', 'memory.id')
             .orderBy('asset.fileCreatedAt', 'asc')
             .where('asset.visibility', '=', sql.lit(AssetVisibility.Timeline))
diff --git a/server/src/repositories/shared-link-asset.repository.ts b/server/src/repositories/shared-link-asset.repository.ts
index ab164683ca..1136546455 100644
--- a/server/src/repositories/shared-link-asset.repository.ts
+++ b/server/src/repositories/shared-link-asset.repository.ts
@@ -6,15 +6,15 @@ import { DB } from 'src/schema';
 export class SharedLinkAssetRepository {
   constructor(@InjectKysely() private db: Kysely<DB>) {}
 
-  async remove(sharedLinkId: string, assetsId: string[]) {
+  async remove(sharedLinkId: string, assetId: string[]) {
     const deleted = await this.db
       .deleteFrom('shared_link_asset')
-      .where('shared_link_asset.sharedLinksId', '=', sharedLinkId)
-      .where('shared_link_asset.assetsId', 'in', assetsId)
-      .returning('assetsId')
+      .where('shared_link_asset.sharedLinkId', '=', sharedLinkId)
+      .where('shared_link_asset.assetId', 'in', assetId)
+      .returning('assetId')
       .execute();
 
-    return deleted.map((row) => row.assetsId);
+    return deleted.map((row) => row.assetId);
   }
 
   @GenerateSql({ params: [{ sourceAssetId: DummyValue.UUID, targetAssetId: DummyValue.UUID }] })
@@ -24,8 +24,8 @@ export class SharedLinkAssetRepository {
       .expression((eb) =>
         eb
           .selectFrom('shared_link_asset')
-          .select((eb) => [eb.val(targetAssetId).as('assetsId'), 'shared_link_asset.sharedLinksId'])
-          .where('shared_link_asset.assetsId', '=', sourceAssetId),
+          .select((eb) => [eb.val(targetAssetId).as('assetId'), 'shared_link_asset.sharedLinkId'])
+          .where('shared_link_asset.assetId', '=', sourceAssetId),
       )
       .onConflict((oc) => oc.doNothing())
       .execute();
diff --git a/server/src/repositories/shared-link.repository.ts b/server/src/repositories/shared-link.repository.ts
index cdade25f76..7bfa9ac6ae 100644
--- a/server/src/repositories/shared-link.repository.ts
+++ b/server/src/repositories/shared-link.repository.ts
@@ -28,8 +28,8 @@ export class SharedLinkRepository {
         (eb) =>
           eb
             .selectFrom('shared_link_asset')
-            .whereRef('shared_link.id', '=', 'shared_link_asset.sharedLinksId')
-            .innerJoin('asset', 'asset.id', 'shared_link_asset.assetsId')
+            .whereRef('shared_link.id', '=', 'shared_link_asset.sharedLinkId')
+            .innerJoin('asset', 'asset.id', 'shared_link_asset.assetId')
             .where('asset.deletedAt', 'is', null)
             .selectAll('asset')
             .innerJoinLateral(
@@ -53,13 +53,13 @@ export class SharedLinkRepository {
             .selectAll('album')
             .whereRef('album.id', '=', 'shared_link.albumId')
             .where('album.deletedAt', 'is', null)
-            .leftJoin('album_asset', 'album_asset.albumsId', 'album.id')
+            .leftJoin('album_asset', 'album_asset.albumId', 'album.id')
             .leftJoinLateral(
               (eb) =>
                 eb
                   .selectFrom('asset')
                   .selectAll('asset')
-                  .whereRef('album_asset.assetsId', '=', 'asset.id')
+                  .whereRef('album_asset.assetId', '=', 'asset.id')
                   .where('asset.deletedAt', 'is', null)
                   .innerJoinLateral(
                     (eb) =>
@@ -123,13 +123,13 @@ export class SharedLinkRepository {
       .selectFrom('shared_link')
       .selectAll('shared_link')
       .where('shared_link.userId', '=', userId)
-      .leftJoin('shared_link_asset', 'shared_link_asset.sharedLinksId', 'shared_link.id')
+      .leftJoin('shared_link_asset', 'shared_link_asset.sharedLinkId', 'shared_link.id')
       .leftJoinLateral(
         (eb) =>
           eb
             .selectFrom('asset')
             .select((eb) => eb.fn.jsonAgg('asset').as('assets'))
-            .whereRef('asset.id', '=', 'shared_link_asset.assetsId')
+            .whereRef('asset.id', '=', 'shared_link_asset.assetId')
             .where('asset.deletedAt', 'is', null)
             .as('assets'),
         (join) => join.onTrue(),
@@ -215,7 +215,7 @@ export class SharedLinkRepository {
     if (entity.assetIds && entity.assetIds.length > 0) {
       await this.db
         .insertInto('shared_link_asset')
-        .values(entity.assetIds!.map((assetsId) => ({ assetsId, sharedLinksId: id })))
+        .values(entity.assetIds!.map((assetId) => ({ assetId, sharedLinkId: id })))
         .execute();
     }
 
@@ -233,7 +233,7 @@ export class SharedLinkRepository {
     if (entity.assetIds && entity.assetIds.length > 0) {
       await this.db
         .insertInto('shared_link_asset')
-        .values(entity.assetIds!.map((assetsId) => ({ assetsId, sharedLinksId: id })))
+        .values(entity.assetIds!.map((assetId) => ({ assetId, sharedLinkId: id })))
         .execute();
     }
 
@@ -249,12 +249,12 @@ export class SharedLinkRepository {
       .selectFrom('shared_link')
       .selectAll('shared_link')
       .where('shared_link.id', '=', id)
-      .leftJoin('shared_link_asset', 'shared_link_asset.sharedLinksId', 'shared_link.id')
+      .leftJoin('shared_link_asset', 'shared_link_asset.sharedLinkId', 'shared_link.id')
       .leftJoinLateral(
         (eb) =>
           eb
             .selectFrom('asset')
-            .whereRef('asset.id', '=', 'shared_link_asset.assetsId')
+            .whereRef('asset.id', '=', 'shared_link_asset.assetId')
             .selectAll('asset')
             .innerJoinLateral(
               (eb) =>
diff --git a/server/src/repositories/stack.repository.ts b/server/src/repositories/stack.repository.ts
index 44db6fbeb4..d313d682bd 100644
--- a/server/src/repositories/stack.repository.ts
+++ b/server/src/repositories/stack.repository.ts
@@ -33,8 +33,8 @@ const withAssets = (eb: ExpressionBuilder<DB, 'stack'>, withTags = false) => {
             eb
               .selectFrom('tag')
               .select(columns.tag)
-              .innerJoin('tag_asset', 'tag.id', 'tag_asset.tagsId')
-              .whereRef('tag_asset.assetsId', '=', 'asset.id'),
+              .innerJoin('tag_asset', 'tag.id', 'tag_asset.tagId')
+              .whereRef('tag_asset.assetId', '=', 'asset.id'),
           ).as('tags'),
         ),
       )
diff --git a/server/src/repositories/sync.repository.ts b/server/src/repositories/sync.repository.ts
index d8be720f45..437e32da16 100644
--- a/server/src/repositories/sync.repository.ts
+++ b/server/src/repositories/sync.repository.ts
@@ -143,8 +143,8 @@ class AlbumSync extends BaseSync {
   getCreatedAfter({ nowId, userId, afterCreateId }: SyncCreatedAfterOptions) {
     return this.db
       .selectFrom('album_user')
-      .select(['albumsId as id', 'createId'])
-      .where('usersId', '=', userId)
+      .select(['albumId as id', 'createId'])
+      .where('userId', '=', userId)
       .$if(!!afterCreateId, (qb) => qb.where('createId', '>=', afterCreateId!))
       .where('createId', '<', nowId)
       .orderBy('createId', 'asc')
@@ -168,8 +168,8 @@ class AlbumSync extends BaseSync {
     const userId = options.userId;
     return this.upsertQuery('album', options)
       .distinctOn(['album.id', 'album.updateId'])
-      .leftJoin('album_user as album_users', 'album.id', 'album_users.albumsId')
-      .where((eb) => eb.or([eb('album.ownerId', '=', userId), eb('album_users.usersId', '=', userId)]))
+      .leftJoin('album_user as album_users', 'album.id', 'album_users.albumId')
+      .where((eb) => eb.or([eb('album.ownerId', '=', userId), eb('album_users.userId', '=', userId)]))
       .select([
         'album.id',
         'album.ownerId',
@@ -190,10 +190,10 @@ class AlbumAssetSync extends BaseSync {
   @GenerateSql({ params: [dummyBackfillOptions, DummyValue.UUID], stream: true })
   getBackfill(options: SyncBackfillOptions, albumId: string) {
     return this.backfillQuery('album_asset', options)
-      .innerJoin('asset', 'asset.id', 'album_asset.assetsId')
+      .innerJoin('asset', 'asset.id', 'album_asset.assetId')
       .select(columns.syncAsset)
       .select('album_asset.updateId')
-      .where('album_asset.albumsId', '=', albumId)
+      .where('album_asset.albumId', '=', albumId)
       .stream();
   }
 
@@ -201,13 +201,13 @@ class AlbumAssetSync extends BaseSync {
   getUpdates(options: SyncQueryOptions, albumToAssetAck: SyncAck) {
     const userId = options.userId;
     return this.upsertQuery('asset', options)
-      .innerJoin('album_asset', 'album_asset.assetsId', 'asset.id')
+      .innerJoin('album_asset', 'album_asset.assetId', 'asset.id')
       .select(columns.syncAsset)
       .select('asset.updateId')
       .where('album_asset.updateId', '<=', albumToAssetAck.updateId) // Ensure we only send updates for assets that the client already knows about
-      .innerJoin('album', 'album.id', 'album_asset.albumsId')
-      .leftJoin('album_user', 'album_user.albumsId', 'album_asset.albumsId')
-      .where((eb) => eb.or([eb('album.ownerId', '=', userId), eb('album_user.usersId', '=', userId)]))
+      .innerJoin('album', 'album.id', 'album_asset.albumId')
+      .leftJoin('album_user', 'album_user.albumId', 'album_asset.albumId')
+      .where((eb) => eb.or([eb('album.ownerId', '=', userId), eb('album_user.userId', '=', userId)]))
       .stream();
   }
 
@@ -216,11 +216,11 @@ class AlbumAssetSync extends BaseSync {
     const userId = options.userId;
     return this.upsertQuery('album_asset', options)
       .select('album_asset.updateId')
-      .innerJoin('asset', 'asset.id', 'album_asset.assetsId')
+      .innerJoin('asset', 'asset.id', 'album_asset.assetId')
       .select(columns.syncAsset)
-      .innerJoin('album', 'album.id', 'album_asset.albumsId')
-      .leftJoin('album_user', 'album_user.albumsId', 'album_asset.albumsId')
-      .where((eb) => eb.or([eb('album.ownerId', '=', userId), eb('album_user.usersId', '=', userId)]))
+      .innerJoin('album', 'album.id', 'album_asset.albumId')
+      .leftJoin('album_user', 'album_user.albumId', 'album_asset.albumId')
+      .where((eb) => eb.or([eb('album.ownerId', '=', userId), eb('album_user.userId', '=', userId)]))
       .stream();
   }
 }
@@ -229,10 +229,10 @@ class AlbumAssetExifSync extends BaseSync {
   @GenerateSql({ params: [dummyBackfillOptions, DummyValue.UUID], stream: true })
   getBackfill(options: SyncBackfillOptions, albumId: string) {
     return this.backfillQuery('album_asset', options)
-      .innerJoin('asset_exif', 'asset_exif.assetId', 'album_asset.assetsId')
+      .innerJoin('asset_exif', 'asset_exif.assetId', 'album_asset.assetId')
       .select(columns.syncAssetExif)
       .select('album_asset.updateId')
-      .where('album_asset.albumsId', '=', albumId)
+      .where('album_asset.albumId', '=', albumId)
       .stream();
   }
 
@@ -240,13 +240,13 @@ class AlbumAssetExifSync extends BaseSync {
   getUpdates(options: SyncQueryOptions, albumToAssetAck: SyncAck) {
     const userId = options.userId;
     return this.upsertQuery('asset_exif', options)
-      .innerJoin('album_asset', 'album_asset.assetsId', 'asset_exif.assetId')
+      .innerJoin('album_asset', 'album_asset.assetId', 'asset_exif.assetId')
       .select(columns.syncAssetExif)
       .select('asset_exif.updateId')
       .where('album_asset.updateId', '<=', albumToAssetAck.updateId) // Ensure we only send exif updates for assets that the client already knows about
-      .innerJoin('album', 'album.id', 'album_asset.albumsId')
-      .leftJoin('album_user', 'album_user.albumsId', 'album_asset.albumsId')
-      .where((eb) => eb.or([eb('album.ownerId', '=', userId), eb('album_user.usersId', '=', userId)]))
+      .innerJoin('album', 'album.id', 'album_asset.albumId')
+      .leftJoin('album_user', 'album_user.albumId', 'album_asset.albumId')
+      .where((eb) => eb.or([eb('album.ownerId', '=', userId), eb('album_user.userId', '=', userId)]))
       .stream();
   }
 
@@ -255,11 +255,11 @@ class AlbumAssetExifSync extends BaseSync {
     const userId = options.userId;
     return this.upsertQuery('album_asset', options)
       .select('album_asset.updateId')
-      .innerJoin('asset_exif', 'asset_exif.assetId', 'album_asset.assetsId')
+      .innerJoin('asset_exif', 'asset_exif.assetId', 'album_asset.assetId')
       .select(columns.syncAssetExif)
-      .innerJoin('album', 'album.id', 'album_asset.albumsId')
-      .leftJoin('album_user', 'album_user.albumsId', 'album_asset.albumsId')
-      .where((eb) => eb.or([eb('album.ownerId', '=', userId), eb('album_user.usersId', '=', userId)]))
+      .innerJoin('album', 'album.id', 'album_asset.albumId')
+      .leftJoin('album_user', 'album_user.albumId', 'album_asset.albumId')
+      .where((eb) => eb.or([eb('album.ownerId', '=', userId), eb('album_user.userId', '=', userId)]))
       .stream();
   }
 }
@@ -268,8 +268,8 @@ class AlbumToAssetSync extends BaseSync {
   @GenerateSql({ params: [dummyBackfillOptions, DummyValue.UUID], stream: true })
   getBackfill(options: SyncBackfillOptions, albumId: string) {
     return this.backfillQuery('album_asset', options)
-      .select(['album_asset.assetsId as assetId', 'album_asset.albumsId as albumId', 'album_asset.updateId'])
-      .where('album_asset.albumsId', '=', albumId)
+      .select(['album_asset.assetId as assetId', 'album_asset.albumId as albumId', 'album_asset.updateId'])
+      .where('album_asset.albumId', '=', albumId)
       .stream();
   }
 
@@ -290,8 +290,8 @@ class AlbumToAssetSync extends BaseSync {
               eb.parens(
                 eb
                   .selectFrom('album_user')
-                  .select(['album_user.albumsId as id'])
-                  .where('album_user.usersId', '=', userId),
+                  .select(['album_user.albumId as id'])
+                  .where('album_user.userId', '=', userId),
               ),
             ),
         ),
@@ -307,10 +307,10 @@ class AlbumToAssetSync extends BaseSync {
   getUpserts(options: SyncQueryOptions) {
     const userId = options.userId;
     return this.upsertQuery('album_asset', options)
-      .select(['album_asset.assetsId as assetId', 'album_asset.albumsId as albumId', 'album_asset.updateId'])
-      .innerJoin('album', 'album.id', 'album_asset.albumsId')
-      .leftJoin('album_user', 'album_user.albumsId', 'album_asset.albumsId')
-      .where((eb) => eb.or([eb('album.ownerId', '=', userId), eb('album_user.usersId', '=', userId)]))
+      .select(['album_asset.assetId as assetId', 'album_asset.albumId as albumId', 'album_asset.updateId'])
+      .innerJoin('album', 'album.id', 'album_asset.albumId')
+      .leftJoin('album_user', 'album_user.albumId', 'album_asset.albumId')
+      .where((eb) => eb.or([eb('album.ownerId', '=', userId), eb('album_user.userId', '=', userId)]))
       .stream();
   }
 }
@@ -321,7 +321,7 @@ class AlbumUserSync extends BaseSync {
     return this.backfillQuery('album_user', options)
       .select(columns.syncAlbumUser)
       .select('album_user.updateId')
-      .where('albumsId', '=', albumId)
+      .where('albumId', '=', albumId)
       .stream();
   }
 
@@ -342,8 +342,8 @@ class AlbumUserSync extends BaseSync {
               eb.parens(
                 eb
                   .selectFrom('album_user')
-                  .select(['album_user.albumsId as id'])
-                  .where('album_user.usersId', '=', userId),
+                  .select(['album_user.albumId as id'])
+                  .where('album_user.userId', '=', userId),
               ),
             ),
         ),
@@ -363,7 +363,7 @@ class AlbumUserSync extends BaseSync {
       .select('album_user.updateId')
       .where((eb) =>
         eb(
-          'album_user.albumsId',
+          'album_user.albumId',
           'in',
           eb
             .selectFrom('album')
@@ -373,8 +373,8 @@ class AlbumUserSync extends BaseSync {
               eb.parens(
                 eb
                   .selectFrom('album_user as albumUsers')
-                  .select(['albumUsers.albumsId as id'])
-                  .where('albumUsers.usersId', '=', userId),
+                  .select(['albumUsers.albumId as id'])
+                  .where('albumUsers.userId', '=', userId),
               ),
             ),
         ),
@@ -550,7 +550,7 @@ class MemoryToAssetSync extends BaseSync {
   @GenerateSql({ params: [dummyQueryOptions], stream: true })
   getUpserts(options: SyncQueryOptions) {
     return this.upsertQuery('memory_asset', options)
-      .select(['memoriesId as memoryId', 'assetsId as assetId'])
+      .select(['memoriesId as memoryId', 'assetId as assetId'])
       .select('updateId')
       .where('memoriesId', 'in', (eb) => eb.selectFrom('memory').select('id').where('ownerId', '=', options.userId))
       .stream();
diff --git a/server/src/repositories/tag.repository.ts b/server/src/repositories/tag.repository.ts
index d9c44f4ba4..2fec0777cc 100644
--- a/server/src/repositories/tag.repository.ts
+++ b/server/src/repositories/tag.repository.ts
@@ -97,9 +97,9 @@ export class TagRepository {
 
     const results = await this.db
       .selectFrom('tag_asset')
-      .select(['assetsId as assetId'])
-      .where('tagsId', '=', tagId)
-      .where('assetsId', 'in', assetIds)
+      .select(['assetId as assetId'])
+      .where('tagId', '=', tagId)
+      .where('assetId', 'in', assetIds)
       .execute();
 
     return new Set(results.map(({ assetId }) => assetId));
@@ -114,7 +114,7 @@ export class TagRepository {
 
     await this.db
       .insertInto('tag_asset')
-      .values(assetIds.map((assetId) => ({ tagsId: tagId, assetsId: assetId })))
+      .values(assetIds.map((assetId) => ({ tagId, assetId })))
       .execute();
   }
 
@@ -125,7 +125,7 @@ export class TagRepository {
       return;
     }
 
-    await this.db.deleteFrom('tag_asset').where('tagsId', '=', tagId).where('assetsId', 'in', assetIds).execute();
+    await this.db.deleteFrom('tag_asset').where('tagId', '=', tagId).where('assetId', 'in', assetIds).execute();
   }
 
   @GenerateSql({ params: [[{ assetId: DummyValue.UUID, tagsIds: [DummyValue.UUID] }]] })
@@ -147,7 +147,7 @@ export class TagRepository {
   @Chunked({ paramIndex: 1 })
   replaceAssetTags(assetId: string, tagIds: string[]) {
     return this.db.transaction().execute(async (tx) => {
-      await tx.deleteFrom('tag_asset').where('assetsId', '=', assetId).execute();
+      await tx.deleteFrom('tag_asset').where('assetId', '=', assetId).execute();
 
       if (tagIds.length === 0) {
         return;
@@ -155,7 +155,7 @@ export class TagRepository {
 
       return tx
         .insertInto('tag_asset')
-        .values(tagIds.map((tagId) => ({ tagsId: tagId, assetsId: assetId })))
+        .values(tagIds.map((tagId) => ({ tagId, assetId })))
         .onConflict((oc) => oc.doNothing())
         .returningAll()
         .execute();
@@ -170,7 +170,7 @@ export class TagRepository {
           exists(
             selectFrom('tag_closure')
               .whereRef('tag.id', '=', 'tag_closure.id_ancestor')
-              .innerJoin('tag_asset', 'tag_closure.id_descendant', 'tag_asset.tagsId'),
+              .innerJoin('tag_asset', 'tag_closure.id_descendant', 'tag_asset.tagId'),
           ),
         ),
       )
diff --git a/server/src/schema/functions.ts b/server/src/schema/functions.ts
index e255742b5d..385db37cf8 100644
--- a/server/src/schema/functions.ts
+++ b/server/src/schema/functions.ts
@@ -29,7 +29,7 @@ export const album_user_after_insert = registerFunction({
   body: `
     BEGIN
       UPDATE album SET "updatedAt" = clock_timestamp(), "updateId" = immich_uuid_v7(clock_timestamp())
-      WHERE "id" IN (SELECT DISTINCT "albumsId" FROM inserted_rows);
+      WHERE "id" IN (SELECT DISTINCT "albumId" FROM inserted_rows);
       RETURN NULL;
     END`,
 });
@@ -139,8 +139,8 @@ export const album_asset_delete_audit = registerFunction({
   body: `
     BEGIN
       INSERT INTO album_asset_audit ("albumId", "assetId")
-      SELECT "albumsId", "assetsId" FROM OLD
-      WHERE "albumsId" IN (SELECT "id" FROM album WHERE "id" IN (SELECT "albumsId" FROM OLD));
+      SELECT "albumId", "assetId" FROM OLD
+      WHERE "albumId" IN (SELECT "id" FROM album WHERE "id" IN (SELECT "albumId" FROM OLD));
       RETURN NULL;
     END`,
 });
@@ -152,12 +152,12 @@ export const album_user_delete_audit = registerFunction({
   body: `
     BEGIN
       INSERT INTO album_audit ("albumId", "userId")
-      SELECT "albumsId", "usersId"
+      SELECT "albumId", "userId"
       FROM OLD;
 
       IF pg_trigger_depth() = 1 THEN
         INSERT INTO album_user_audit ("albumId", "userId")
-        SELECT "albumsId", "usersId"
+        SELECT "albumId", "userId"
         FROM OLD;
       END IF;
 
@@ -185,7 +185,7 @@ export const memory_asset_delete_audit = registerFunction({
   body: `
     BEGIN
       INSERT INTO memory_asset_audit ("memoryId", "assetId")
-      SELECT "memoriesId", "assetsId" FROM OLD
+      SELECT "memoriesId", "assetId" FROM OLD
       WHERE "memoriesId" IN (SELECT "id" FROM memory WHERE "id" IN (SELECT "memoriesId" FROM OLD));
       RETURN NULL;
     END`,
diff --git a/server/src/schema/migrations/1761755618862-FixColumnNames.ts b/server/src/schema/migrations/1761755618862-FixColumnNames.ts
new file mode 100644
index 0000000000..25131a1640
--- /dev/null
+++ b/server/src/schema/migrations/1761755618862-FixColumnNames.ts
@@ -0,0 +1,99 @@
+import { Kysely, sql } from 'kysely';
+
+export async function up(db: Kysely<any>): Promise<void> {
+    // rename columns
+  await sql`ALTER TABLE "album_asset" RENAME COLUMN "albumsId" TO "albumId";`.execute(db);
+  await sql`ALTER TABLE "album_asset" RENAME COLUMN "assetsId" TO "assetId";`.execute(db);
+  await sql`ALTER TABLE "album_user" RENAME COLUMN "albumsId" TO "albumId";`.execute(db);
+  await sql`ALTER TABLE "album_user" RENAME COLUMN "usersId" TO "userId";`.execute(db);
+  await sql`ALTER TABLE "memory_asset" RENAME COLUMN "assetsId" TO "assetId";`.execute(db);
+  await sql`ALTER TABLE "shared_link_asset" RENAME COLUMN "assetsId" TO "assetId";`.execute(db);
+  await sql`ALTER TABLE "shared_link_asset" RENAME COLUMN "sharedLinksId" TO "sharedLinkId";`.execute(db);
+  await sql`ALTER TABLE "tag_asset" RENAME COLUMN "assetsId" TO "assetId";`.execute(db);
+  await sql`ALTER TABLE "tag_asset" RENAME COLUMN "tagsId" TO "tagId";`.execute(db);
+
+  // rename constraints
+  await sql`ALTER TABLE "album_asset" RENAME CONSTRAINT "album_asset_albumsId_fkey" TO "album_asset_albumId_fkey";`.execute(db);
+  await sql`ALTER TABLE "album_asset" RENAME CONSTRAINT "album_asset_assetsId_fkey" TO "album_asset_assetId_fkey";`.execute(db);
+  await sql`ALTER TABLE "album_user" RENAME CONSTRAINT "album_user_albumsId_fkey" TO "album_user_albumId_fkey";`.execute(db);
+  await sql`ALTER TABLE "album_user" RENAME CONSTRAINT "album_user_usersId_fkey" TO "album_user_userId_fkey";`.execute(db);
+  await sql`ALTER TABLE "memory_asset" RENAME CONSTRAINT "memory_asset_assetsId_fkey" TO "memory_asset_assetId_fkey";`.execute(db);
+  await sql`ALTER TABLE "shared_link_asset" RENAME CONSTRAINT "shared_link_asset_assetsId_fkey" TO "shared_link_asset_assetId_fkey";`.execute(db);
+  await sql`ALTER TABLE "shared_link_asset" RENAME CONSTRAINT "shared_link_asset_sharedLinksId_fkey" TO "shared_link_asset_sharedLinkId_fkey";`.execute(db);
+  await sql`ALTER TABLE "tag_asset" RENAME CONSTRAINT "tag_asset_assetsId_fkey" TO "tag_asset_assetId_fkey";`.execute(db);
+  await sql`ALTER TABLE "tag_asset" RENAME CONSTRAINT "tag_asset_tagsId_fkey" TO "tag_asset_tagId_fkey";`.execute(db);
+
+  // rename indexes
+  await sql`ALTER INDEX "album_asset_albumsId_idx" RENAME TO "album_asset_albumId_idx";`.execute(db);
+  await sql`ALTER INDEX "album_asset_assetsId_idx" RENAME TO "album_asset_assetId_idx";`.execute(db);
+  await sql`ALTER INDEX "album_user_usersId_idx" RENAME TO "album_user_userId_idx";`.execute(db);
+  await sql`ALTER INDEX "album_user_albumsId_idx" RENAME TO "album_user_albumId_idx";`.execute(db);
+  await sql`ALTER INDEX "memory_asset_assetsId_idx" RENAME TO "memory_asset_assetId_idx";`.execute(db);
+  await sql`ALTER INDEX "shared_link_asset_sharedLinksId_idx" RENAME TO "shared_link_asset_sharedLinkId_idx";`.execute(db);
+  await sql`ALTER INDEX "shared_link_asset_assetsId_idx" RENAME TO "shared_link_asset_assetId_idx";`.execute(db);
+  await sql`ALTER INDEX "tag_asset_assetsId_idx" RENAME TO "tag_asset_assetId_idx";`.execute(db);
+  await sql`ALTER INDEX "tag_asset_tagsId_idx" RENAME TO "tag_asset_tagId_idx";`.execute(db);
+  await sql`ALTER INDEX "tag_asset_assetsId_tagsId_idx" RENAME TO "tag_asset_assetId_tagId_idx";`.execute(db);
+
+  // update triggers and functions
+  await sql`CREATE OR REPLACE FUNCTION album_user_after_insert()
+  RETURNS TRIGGER
+  LANGUAGE PLPGSQL
+  AS $$
+    BEGIN
+      UPDATE album SET "updatedAt" = clock_timestamp(), "updateId" = immich_uuid_v7(clock_timestamp())
+      WHERE "id" IN (SELECT DISTINCT "albumId" FROM inserted_rows);
+      RETURN NULL;
+    END
+  $$;`.execute(db);
+  await sql`CREATE OR REPLACE FUNCTION album_asset_delete_audit()
+  RETURNS TRIGGER
+  LANGUAGE PLPGSQL
+  AS $$
+    BEGIN
+      INSERT INTO album_asset_audit ("albumId", "assetId")
+      SELECT "albumId", "assetId" FROM OLD
+      WHERE "albumId" IN (SELECT "id" FROM album WHERE "id" IN (SELECT "albumId" FROM OLD));
+      RETURN NULL;
+    END
+  $$;`.execute(db);
+  await sql`CREATE OR REPLACE FUNCTION album_user_delete_audit()
+  RETURNS TRIGGER
+  LANGUAGE PLPGSQL
+  AS $$
+    BEGIN
+      INSERT INTO album_audit ("albumId", "userId")
+      SELECT "albumId", "userId"
+      FROM OLD;
+
+      IF pg_trigger_depth() = 1 THEN
+        INSERT INTO album_user_audit ("albumId", "userId")
+        SELECT "albumId", "userId"
+        FROM OLD;
+      END IF;
+
+      RETURN NULL;
+    END
+  $$;`.execute(db);
+  await sql`CREATE OR REPLACE FUNCTION memory_asset_delete_audit()
+  RETURNS TRIGGER
+  LANGUAGE PLPGSQL
+  AS $$
+    BEGIN
+      INSERT INTO memory_asset_audit ("memoryId", "assetId")
+      SELECT "memoriesId", "assetId" FROM OLD
+      WHERE "memoriesId" IN (SELECT "id" FROM memory WHERE "id" IN (SELECT "memoriesId" FROM OLD));
+      RETURN NULL;
+    END
+  $$;`.execute(db);
+
+  // update overrides
+  await sql`UPDATE "migration_overrides" SET "value" = '{"type":"function","name":"album_user_after_insert","sql":"CREATE OR REPLACE FUNCTION album_user_after_insert()\\n  RETURNS TRIGGER\\n  LANGUAGE PLPGSQL\\n  AS $$\\n    BEGIN\\n      UPDATE album SET \\"updatedAt\\" = clock_timestamp(), \\"updateId\\" = immich_uuid_v7(clock_timestamp())\\n      WHERE \\"id\\" IN (SELECT DISTINCT \\"albumId\\" FROM inserted_rows);\\n      RETURN NULL;\\n    END\\n  $$;"}'::jsonb WHERE "name" = 'function_album_user_after_insert';`.execute(db);
+  await sql`UPDATE "migration_overrides" SET "value" = '{"type":"function","name":"album_asset_delete_audit","sql":"CREATE OR REPLACE FUNCTION album_asset_delete_audit()\\n  RETURNS TRIGGER\\n  LANGUAGE PLPGSQL\\n  AS $$\\n    BEGIN\\n      INSERT INTO album_asset_audit (\\"albumId\\", \\"assetId\\")\\n      SELECT \\"albumId\\", \\"assetId\\" FROM OLD\\n      WHERE \\"albumId\\" IN (SELECT \\"id\\" FROM album WHERE \\"id\\" IN (SELECT \\"albumId\\" FROM OLD));\\n      RETURN NULL;\\n    END\\n  $$;"}'::jsonb WHERE "name" = 'function_album_asset_delete_audit';`.execute(db);
+  await sql`UPDATE "migration_overrides" SET "value" = '{"type":"function","name":"album_user_delete_audit","sql":"CREATE OR REPLACE FUNCTION album_user_delete_audit()\\n  RETURNS TRIGGER\\n  LANGUAGE PLPGSQL\\n  AS $$\\n    BEGIN\\n      INSERT INTO album_audit (\\"albumId\\", \\"userId\\")\\n      SELECT \\"albumId\\", \\"userId\\"\\n      FROM OLD;\\n\\n      IF pg_trigger_depth() = 1 THEN\\n        INSERT INTO album_user_audit (\\"albumId\\", \\"userId\\")\\n        SELECT \\"albumId\\", \\"userId\\"\\n        FROM OLD;\\n      END IF;\\n\\n      RETURN NULL;\\n    END\\n  $$;"}'::jsonb WHERE "name" = 'function_album_user_delete_audit';`.execute(db);
+  await sql`UPDATE "migration_overrides" SET "value" = '{"type":"function","name":"memory_asset_delete_audit","sql":"CREATE OR REPLACE FUNCTION memory_asset_delete_audit()\\n  RETURNS TRIGGER\\n  LANGUAGE PLPGSQL\\n  AS $$\\n    BEGIN\\n      INSERT INTO memory_asset_audit (\\"memoryId\\", \\"assetId\\")\\n      SELECT \\"memoriesId\\", \\"assetId\\" FROM OLD\\n      WHERE \\"memoriesId\\" IN (SELECT \\"id\\" FROM memory WHERE \\"id\\" IN (SELECT \\"memoriesId\\" FROM OLD));\\n      RETURN NULL;\\n    END\\n  $$;"}'::jsonb WHERE "name" = 'function_memory_asset_delete_audit';`.execute(db);
+}
+
+export function down() {
+  // not implemented
+}
diff --git a/server/src/schema/tables/activity.table.ts b/server/src/schema/tables/activity.table.ts
index 128cf2eabd..dfa7c98e42 100644
--- a/server/src/schema/tables/activity.table.ts
+++ b/server/src/schema/tables/activity.table.ts
@@ -32,7 +32,7 @@ import {
 @ForeignKeyConstraint({
   columns: ['albumId', 'assetId'],
   referenceTable: () => AlbumAssetTable,
-  referenceColumns: ['albumsId', 'assetsId'],
+  referenceColumns: ['albumId', 'assetId'],
   onUpdate: 'NO ACTION',
   onDelete: 'CASCADE',
 })
diff --git a/server/src/schema/tables/album-asset.table.ts b/server/src/schema/tables/album-asset.table.ts
index c34546c3f3..dea271239b 100644
--- a/server/src/schema/tables/album-asset.table.ts
+++ b/server/src/schema/tables/album-asset.table.ts
@@ -22,10 +22,10 @@ import {
 })
 export class AlbumAssetTable {
   @ForeignKeyColumn(() => AlbumTable, { onDelete: 'CASCADE', onUpdate: 'CASCADE', nullable: false, primary: true })
-  albumsId!: string;
+  albumId!: string;
 
   @ForeignKeyColumn(() => AssetTable, { onDelete: 'CASCADE', onUpdate: 'CASCADE', nullable: false, primary: true })
-  assetsId!: string;
+  assetId!: string;
 
   @CreateDateColumn()
   createdAt!: Generated<Timestamp>;
diff --git a/server/src/schema/tables/album-user.table.ts b/server/src/schema/tables/album-user.table.ts
index 94383218da..761aabc1af 100644
--- a/server/src/schema/tables/album-user.table.ts
+++ b/server/src/schema/tables/album-user.table.ts
@@ -37,7 +37,7 @@ export class AlbumUserTable {
     nullable: false,
     primary: true,
   })
-  albumsId!: string;
+  albumId!: string;
 
   @ForeignKeyColumn(() => UserTable, {
     onDelete: 'CASCADE',
@@ -45,7 +45,7 @@ export class AlbumUserTable {
     nullable: false,
     primary: true,
   })
-  usersId!: string;
+  userId!: string;
 
   @Column({ type: 'character varying', default: AlbumUserRole.Editor })
   role!: Generated<AlbumUserRole>;
diff --git a/server/src/schema/tables/memory-asset.table.ts b/server/src/schema/tables/memory-asset.table.ts
index f535155233..b162000ca0 100644
--- a/server/src/schema/tables/memory-asset.table.ts
+++ b/server/src/schema/tables/memory-asset.table.ts
@@ -25,7 +25,7 @@ export class MemoryAssetTable {
   memoriesId!: string;
 
   @ForeignKeyColumn(() => AssetTable, { onUpdate: 'CASCADE', onDelete: 'CASCADE', primary: true })
-  assetsId!: string;
+  assetId!: string;
 
   @CreateDateColumn()
   createdAt!: Generated<Timestamp>;
diff --git a/server/src/schema/tables/shared-link-asset.table.ts b/server/src/schema/tables/shared-link-asset.table.ts
index 37b652c4ab..37e6a3d9f0 100644
--- a/server/src/schema/tables/shared-link-asset.table.ts
+++ b/server/src/schema/tables/shared-link-asset.table.ts
@@ -5,8 +5,8 @@ import { ForeignKeyColumn, Table } from 'src/sql-tools';
 @Table('shared_link_asset')
 export class SharedLinkAssetTable {
   @ForeignKeyColumn(() => AssetTable, { onUpdate: 'CASCADE', onDelete: 'CASCADE', primary: true })
-  assetsId!: string;
+  assetId!: string;
 
   @ForeignKeyColumn(() => SharedLinkTable, { onUpdate: 'CASCADE', onDelete: 'CASCADE', primary: true })
-  sharedLinksId!: string;
+  sharedLinkId!: string;
 }
diff --git a/server/src/schema/tables/tag-asset.table.ts b/server/src/schema/tables/tag-asset.table.ts
index bc02129217..3ea2361b4f 100644
--- a/server/src/schema/tables/tag-asset.table.ts
+++ b/server/src/schema/tables/tag-asset.table.ts
@@ -2,12 +2,12 @@ import { AssetTable } from 'src/schema/tables/asset.table';
 import { TagTable } from 'src/schema/tables/tag.table';
 import { ForeignKeyColumn, Index, Table } from 'src/sql-tools';
 
-@Index({ columns: ['assetsId', 'tagsId'] })
+@Index({ columns: ['assetId', 'tagId'] })
 @Table('tag_asset')
 export class TagAssetTable {
   @ForeignKeyColumn(() => AssetTable, { onUpdate: 'CASCADE', onDelete: 'CASCADE', primary: true, index: true })
-  assetsId!: string;
+  assetId!: string;
 
   @ForeignKeyColumn(() => TagTable, { onUpdate: 'CASCADE', onDelete: 'CASCADE', primary: true, index: true })
-  tagsId!: string;
+  tagId!: string;
 }
diff --git a/server/src/services/album.service.spec.ts b/server/src/services/album.service.spec.ts
index e22d486bba..fa8a9c6450 100644
--- a/server/src/services/album.service.spec.ts
+++ b/server/src/services/album.service.spec.ts
@@ -402,16 +402,16 @@ describe(AlbumService.name, () => {
       mocks.album.update.mockResolvedValue(albumStub.sharedWithAdmin);
       mocks.user.get.mockResolvedValue(userStub.user2);
       mocks.albumUser.create.mockResolvedValue({
-        usersId: userStub.user2.id,
-        albumsId: albumStub.sharedWithAdmin.id,
+        userId: userStub.user2.id,
+        albumId: albumStub.sharedWithAdmin.id,
         role: AlbumUserRole.Editor,
       });
       await sut.addUsers(authStub.user1, albumStub.sharedWithAdmin.id, {
         albumUsers: [{ userId: authStub.user2.user.id }],
       });
       expect(mocks.albumUser.create).toHaveBeenCalledWith({
-        usersId: authStub.user2.user.id,
-        albumsId: albumStub.sharedWithAdmin.id,
+        userId: authStub.user2.user.id,
+        albumId: albumStub.sharedWithAdmin.id,
       });
       expect(mocks.event.emit).toHaveBeenCalledWith('AlbumInvite', {
         id: albumStub.sharedWithAdmin.id,
@@ -439,8 +439,8 @@ describe(AlbumService.name, () => {
 
       expect(mocks.albumUser.delete).toHaveBeenCalledTimes(1);
       expect(mocks.albumUser.delete).toHaveBeenCalledWith({
-        albumsId: albumStub.sharedWithUser.id,
-        usersId: userStub.user1.id,
+        albumId: albumStub.sharedWithUser.id,
+        userId: userStub.user1.id,
       });
       expect(mocks.album.getById).toHaveBeenCalledWith(albumStub.sharedWithUser.id, { withAssets: false });
     });
@@ -467,8 +467,8 @@ describe(AlbumService.name, () => {
 
       expect(mocks.albumUser.delete).toHaveBeenCalledTimes(1);
       expect(mocks.albumUser.delete).toHaveBeenCalledWith({
-        albumsId: albumStub.sharedWithUser.id,
-        usersId: authStub.user1.user.id,
+        albumId: albumStub.sharedWithUser.id,
+        userId: authStub.user1.user.id,
       });
     });
 
@@ -480,8 +480,8 @@ describe(AlbumService.name, () => {
 
       expect(mocks.albumUser.delete).toHaveBeenCalledTimes(1);
       expect(mocks.albumUser.delete).toHaveBeenCalledWith({
-        albumsId: albumStub.sharedWithUser.id,
-        usersId: authStub.user1.user.id,
+        albumId: albumStub.sharedWithUser.id,
+        userId: authStub.user1.user.id,
       });
     });
 
@@ -515,7 +515,7 @@ describe(AlbumService.name, () => {
         role: AlbumUserRole.Editor,
       });
       expect(mocks.albumUser.update).toHaveBeenCalledWith(
-        { albumsId: albumStub.sharedWithAdmin.id, usersId: userStub.admin.id },
+        { albumId: albumStub.sharedWithAdmin.id, userId: userStub.admin.id },
         { role: AlbumUserRole.Editor },
       );
     });
@@ -804,12 +804,12 @@ describe(AlbumService.name, () => {
         albumThumbnailAssetId: 'asset-1',
       });
       expect(mocks.album.addAssetIdsToAlbums).toHaveBeenCalledWith([
-        { albumsId: 'album-123', assetsId: 'asset-1' },
-        { albumsId: 'album-123', assetsId: 'asset-2' },
-        { albumsId: 'album-123', assetsId: 'asset-3' },
-        { albumsId: 'album-321', assetsId: 'asset-1' },
-        { albumsId: 'album-321', assetsId: 'asset-2' },
-        { albumsId: 'album-321', assetsId: 'asset-3' },
+        { albumId: 'album-123', assetId: 'asset-1' },
+        { albumId: 'album-123', assetId: 'asset-2' },
+        { albumId: 'album-123', assetId: 'asset-3' },
+        { albumId: 'album-321', assetId: 'asset-1' },
+        { albumId: 'album-321', assetId: 'asset-2' },
+        { albumId: 'album-321', assetId: 'asset-3' },
       ]);
     });
 
@@ -840,12 +840,12 @@ describe(AlbumService.name, () => {
         albumThumbnailAssetId: 'asset-id',
       });
       expect(mocks.album.addAssetIdsToAlbums).toHaveBeenCalledWith([
-        { albumsId: 'album-123', assetsId: 'asset-1' },
-        { albumsId: 'album-123', assetsId: 'asset-2' },
-        { albumsId: 'album-123', assetsId: 'asset-3' },
-        { albumsId: 'album-321', assetsId: 'asset-1' },
-        { albumsId: 'album-321', assetsId: 'asset-2' },
-        { albumsId: 'album-321', assetsId: 'asset-3' },
+        { albumId: 'album-123', assetId: 'asset-1' },
+        { albumId: 'album-123', assetId: 'asset-2' },
+        { albumId: 'album-123', assetId: 'asset-3' },
+        { albumId: 'album-321', assetId: 'asset-1' },
+        { albumId: 'album-321', assetId: 'asset-2' },
+        { albumId: 'album-321', assetId: 'asset-3' },
       ]);
     });
 
@@ -876,12 +876,12 @@ describe(AlbumService.name, () => {
         albumThumbnailAssetId: 'asset-1',
       });
       expect(mocks.album.addAssetIdsToAlbums).toHaveBeenCalledWith([
-        { albumsId: 'album-123', assetsId: 'asset-1' },
-        { albumsId: 'album-123', assetsId: 'asset-2' },
-        { albumsId: 'album-123', assetsId: 'asset-3' },
-        { albumsId: 'album-321', assetsId: 'asset-1' },
-        { albumsId: 'album-321', assetsId: 'asset-2' },
-        { albumsId: 'album-321', assetsId: 'asset-3' },
+        { albumId: 'album-123', assetId: 'asset-1' },
+        { albumId: 'album-123', assetId: 'asset-2' },
+        { albumId: 'album-123', assetId: 'asset-3' },
+        { albumId: 'album-321', assetId: 'asset-1' },
+        { albumId: 'album-321', assetId: 'asset-2' },
+        { albumId: 'album-321', assetId: 'asset-3' },
       ]);
       expect(mocks.event.emit).toHaveBeenCalledWith('AlbumUpdate', {
         id: 'album-123',
@@ -936,9 +936,9 @@ describe(AlbumService.name, () => {
         albumThumbnailAssetId: 'asset-1',
       });
       expect(mocks.album.addAssetIdsToAlbums).toHaveBeenCalledWith([
-        { albumsId: 'album-123', assetsId: 'asset-1' },
-        { albumsId: 'album-123', assetsId: 'asset-2' },
-        { albumsId: 'album-123', assetsId: 'asset-3' },
+        { albumId: 'album-123', assetId: 'asset-1' },
+        { albumId: 'album-123', assetId: 'asset-2' },
+        { albumId: 'album-123', assetId: 'asset-3' },
       ]);
       expect(mocks.event.emit).toHaveBeenCalledWith('AlbumUpdate', {
         id: 'album-123',
@@ -977,12 +977,12 @@ describe(AlbumService.name, () => {
         albumThumbnailAssetId: 'asset-1',
       });
       expect(mocks.album.addAssetIdsToAlbums).toHaveBeenCalledWith([
-        { albumsId: 'album-123', assetsId: 'asset-1' },
-        { albumsId: 'album-123', assetsId: 'asset-2' },
-        { albumsId: 'album-123', assetsId: 'asset-3' },
-        { albumsId: 'album-321', assetsId: 'asset-1' },
-        { albumsId: 'album-321', assetsId: 'asset-2' },
-        { albumsId: 'album-321', assetsId: 'asset-3' },
+        { albumId: 'album-123', assetId: 'asset-1' },
+        { albumId: 'album-123', assetId: 'asset-2' },
+        { albumId: 'album-123', assetId: 'asset-3' },
+        { albumId: 'album-321', assetId: 'asset-1' },
+        { albumId: 'album-321', assetId: 'asset-2' },
+        { albumId: 'album-321', assetId: 'asset-3' },
       ]);
       expect(mocks.access.asset.checkPartnerAccess).toHaveBeenCalledWith(
         authStub.admin.user.id,
@@ -1014,9 +1014,9 @@ describe(AlbumService.name, () => {
         albumThumbnailAssetId: 'asset-1',
       });
       expect(mocks.album.addAssetIdsToAlbums).toHaveBeenCalledWith([
-        { albumsId: 'album-321', assetsId: 'asset-1' },
-        { albumsId: 'album-321', assetsId: 'asset-2' },
-        { albumsId: 'album-321', assetsId: 'asset-3' },
+        { albumId: 'album-321', assetId: 'asset-1' },
+        { albumId: 'album-321', assetId: 'asset-2' },
+        { albumId: 'album-321', assetId: 'asset-3' },
       ]);
     });
 
diff --git a/server/src/services/album.service.ts b/server/src/services/album.service.ts
index dd12e31892..18747dbc3a 100644
--- a/server/src/services/album.service.ts
+++ b/server/src/services/album.service.ts
@@ -215,7 +215,7 @@ export class AlbumService extends BaseService {
       return results;
     }
 
-    const albumAssetValues: { albumsId: string; assetsId: string }[] = [];
+    const albumAssetValues: { albumId: string; assetId: string }[] = [];
     const events: { id: string; recipients: string[] }[] = [];
     for (const albumId of allowedAlbumIds) {
       const existingAssetIds = await this.albumRepository.getAssetIds(albumId, [...allowedAssetIds]);
@@ -228,7 +228,7 @@ export class AlbumService extends BaseService {
       results.success = true;
 
       for (const assetId of notPresentAssetIds) {
-        albumAssetValues.push({ albumsId: albumId, assetsId: assetId });
+        albumAssetValues.push({ albumId, assetId });
       }
       await this.albumRepository.update(albumId, {
         id: albumId,
@@ -289,7 +289,7 @@ export class AlbumService extends BaseService {
         throw new BadRequestException('User not found');
       }
 
-      await this.albumUserRepository.create({ usersId: userId, albumsId: id, role });
+      await this.albumUserRepository.create({ userId, albumId: id, role });
       await this.eventRepository.emit('AlbumInvite', { id, userId });
     }
 
@@ -317,12 +317,12 @@ export class AlbumService extends BaseService {
       await this.requireAccess({ auth, permission: Permission.AlbumShare, ids: [id] });
     }
 
-    await this.albumUserRepository.delete({ albumsId: id, usersId: userId });
+    await this.albumUserRepository.delete({ albumId: id, userId });
   }
 
   async updateUser(auth: AuthDto, id: string, userId: string, dto: UpdateAlbumUserDto): Promise<void> {
     await this.requireAccess({ auth, permission: Permission.AlbumShare, ids: [id] });
-    await this.albumUserRepository.update({ albumsId: id, usersId: userId }, { role: dto.role });
+    await this.albumUserRepository.update({ albumId: id, userId }, { role: dto.role });
   }
 
   private async findOrFail(id: string, options: AlbumInfoOptions) {
diff --git a/server/src/services/tag.service.spec.ts b/server/src/services/tag.service.spec.ts
index 6699c61970..6a630de6a1 100644
--- a/server/src/services/tag.service.spec.ts
+++ b/server/src/services/tag.service.spec.ts
@@ -192,12 +192,12 @@ describe(TagService.name, () => {
       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.tag.upsertAssetIds.mockResolvedValue([
-        { tagsId: 'tag-1', assetsId: 'asset-1' },
-        { tagsId: 'tag-1', assetsId: 'asset-2' },
-        { tagsId: 'tag-1', assetsId: 'asset-3' },
-        { tagsId: 'tag-2', assetsId: 'asset-1' },
-        { tagsId: 'tag-2', assetsId: 'asset-2' },
-        { tagsId: 'tag-2', assetsId: 'asset-3' },
+        { tagId: 'tag-1', assetId: 'asset-1' },
+        { tagId: 'tag-1', assetId: 'asset-2' },
+        { tagId: 'tag-1', assetId: 'asset-3' },
+        { tagId: 'tag-2', assetId: 'asset-1' },
+        { tagId: 'tag-2', assetId: 'asset-2' },
+        { tagId: 'tag-2', assetId: 'asset-3' },
       ]);
       await expect(
         sut.bulkTagAssets(authStub.admin, { tagIds: ['tag-1', 'tag-2'], assetIds: ['asset-1', 'asset-2', 'asset-3'] }),
@@ -205,12 +205,12 @@ describe(TagService.name, () => {
         count: 6,
       });
       expect(mocks.tag.upsertAssetIds).toHaveBeenCalledWith([
-        { tagsId: 'tag-1', assetsId: 'asset-1' },
-        { tagsId: 'tag-1', assetsId: 'asset-2' },
-        { tagsId: 'tag-1', assetsId: 'asset-3' },
-        { tagsId: 'tag-2', assetsId: 'asset-1' },
-        { tagsId: 'tag-2', assetsId: 'asset-2' },
-        { tagsId: 'tag-2', assetsId: 'asset-3' },
+        { tagId: 'tag-1', assetId: 'asset-1' },
+        { tagId: 'tag-1', assetId: 'asset-2' },
+        { tagId: 'tag-1', assetId: 'asset-3' },
+        { tagId: 'tag-2', assetId: 'asset-1' },
+        { tagId: 'tag-2', assetId: 'asset-2' },
+        { tagId: 'tag-2', assetId: 'asset-3' },
       ]);
     });
   });
diff --git a/server/src/services/tag.service.ts b/server/src/services/tag.service.ts
index 2fae4b55d0..3ee5d29b75 100644
--- a/server/src/services/tag.service.ts
+++ b/server/src/services/tag.service.ts
@@ -82,14 +82,14 @@ export class TagService extends BaseService {
     ]);
 
     const items: Insertable<TagAssetTable>[] = [];
-    for (const tagsId of tagIds) {
-      for (const assetsId of assetIds) {
-        items.push({ tagsId, assetsId });
+    for (const tagId of tagIds) {
+      for (const assetId of assetIds) {
+        items.push({ tagId, assetId });
       }
     }
 
     const results = await this.tagRepository.upsertAssetIds(items);
-    for (const assetId of new Set(results.map((item) => item.assetsId))) {
+    for (const assetId of new Set(results.map((item) => item.assetId))) {
       await this.eventRepository.emit('AssetTag', { assetId });
     }
 
diff --git a/server/src/utils/database.ts b/server/src/utils/database.ts
index 8c05543eaa..0cc3788f1a 100644
--- a/server/src/utils/database.ts
+++ b/server/src/utils/database.ts
@@ -244,12 +244,12 @@ export function inAlbums<O>(qb: SelectQueryBuilder<DB, 'asset', O>, albumIds: st
     (eb) =>
       eb
         .selectFrom('album_asset')
-        .select('assetsId')
-        .where('albumsId', '=', anyUuid(albumIds!))
-        .groupBy('assetsId')
-        .having((eb) => eb.fn.count('albumsId').distinct(), '=', albumIds.length)
+        .select('assetId')
+        .where('albumId', '=', anyUuid(albumIds!))
+        .groupBy('assetId')
+        .having((eb) => eb.fn.count('albumId').distinct(), '=', albumIds.length)
         .as('has_album'),
-    (join) => join.onRef('has_album.assetsId', '=', 'asset.id'),
+    (join) => join.onRef('has_album.assetId', '=', 'asset.id'),
   );
 }
 
@@ -258,13 +258,13 @@ export function hasTags<O>(qb: SelectQueryBuilder<DB, 'asset', O>, tagIds: strin
     (eb) =>
       eb
         .selectFrom('tag_asset')
-        .select('assetsId')
-        .innerJoin('tag_closure', 'tag_asset.tagsId', 'tag_closure.id_descendant')
+        .select('assetId')
+        .innerJoin('tag_closure', 'tag_asset.tagId', 'tag_closure.id_descendant')
         .where('tag_closure.id_ancestor', '=', anyUuid(tagIds))
-        .groupBy('assetsId')
+        .groupBy('assetId')
         .having((eb) => eb.fn.count('tag_closure.id_ancestor').distinct(), '>=', tagIds.length)
         .as('has_tags'),
-    (join) => join.onRef('has_tags.assetsId', '=', 'asset.id'),
+    (join) => join.onRef('has_tags.assetId', '=', 'asset.id'),
   );
 }
 
@@ -285,8 +285,8 @@ export function withTags(eb: ExpressionBuilder<DB, 'asset'>) {
     eb
       .selectFrom('tag')
       .select(columns.tag)
-      .innerJoin('tag_asset', 'tag.id', 'tag_asset.tagsId')
-      .whereRef('asset.id', '=', 'tag_asset.assetsId'),
+      .innerJoin('tag_asset', 'tag.id', 'tag_asset.tagId')
+      .whereRef('asset.id', '=', 'tag_asset.assetId'),
   ).as('tags');
 }
 
@@ -299,8 +299,8 @@ export function withTagId<O>(qb: SelectQueryBuilder<DB, 'asset', O>, tagId: stri
     eb.exists(
       eb
         .selectFrom('tag_closure')
-        .innerJoin('tag_asset', 'tag_asset.tagsId', 'tag_closure.id_descendant')
-        .whereRef('tag_asset.assetsId', '=', 'asset.id')
+        .innerJoin('tag_asset', 'tag_asset.tagId', 'tag_closure.id_descendant')
+        .whereRef('tag_asset.assetId', '=', 'asset.id')
         .where('tag_closure.id_ancestor', '=', tagId),
     ),
   );
@@ -320,7 +320,7 @@ export function searchAssetBuilder(kysely: Kysely<DB>, options: AssetSearchBuild
     .$if(!!options.albumIds && options.albumIds.length > 0, (qb) => inAlbums(qb, options.albumIds!))
     .$if(!!options.tagIds && options.tagIds.length > 0, (qb) => hasTags(qb, options.tagIds!))
     .$if(options.tagIds === null, (qb) =>
-      qb.where((eb) => eb.not(eb.exists((eb) => eb.selectFrom('tag_asset').whereRef('assetsId', '=', 'asset.id')))),
+      qb.where((eb) => eb.not(eb.exists((eb) => eb.selectFrom('tag_asset').whereRef('assetId', '=', 'asset.id')))),
     )
     .$if(!!options.personIds && options.personIds.length > 0, (qb) => hasPeople(qb, options.personIds!))
     .$if(!!options.createdBefore, (qb) => qb.where('asset.createdAt', '<=', options.createdBefore!))
@@ -403,7 +403,7 @@ export function searchAssetBuilder(kysely: Kysely<DB>, options: AssetSearchBuild
       qb.where('asset.livePhotoVideoId', options.isMotion ? 'is not' : 'is', null),
     )
     .$if(!!options.isNotInAlbum && (!options.albumIds || options.albumIds.length === 0), (qb) =>
-      qb.where((eb) => eb.not(eb.exists((eb) => eb.selectFrom('album_asset').whereRef('assetsId', '=', 'asset.id')))),
+      qb.where((eb) => eb.not(eb.exists((eb) => eb.selectFrom('album_asset').whereRef('assetId', '=', 'asset.id')))),
     )
     .$if(!!options.withExif, withExifInner)
     .$if(!!(options.withFaces || options.withPeople || options.personIds), (qb) => qb.select(withFacesAndPeople))
diff --git a/server/test/medium.factory.ts b/server/test/medium.factory.ts
index 35bcb45413..e41a1965a2 100644
--- a/server/test/medium.factory.ts
+++ b/server/test/medium.factory.ts
@@ -217,7 +217,7 @@ export class MediumTestContext<S extends BaseService = BaseService> {
 
   async newAlbumUser(dto: { albumId: string; userId: string; role?: AlbumUserRole }) {
     const { albumId, userId, role = AlbumUserRole.Editor } = dto;
-    const result = await this.get(AlbumUserRepository).create({ albumsId: albumId, usersId: userId, role });
+    const result = await this.get(AlbumUserRepository).create({ albumId, userId, role });
     return { albumUser: { albumId, userId, role }, result };
   }
 
@@ -260,9 +260,9 @@ export class MediumTestContext<S extends BaseService = BaseService> {
 
   async newTagAsset(tagBulkAssets: { tagIds: string[]; assetIds: string[] }) {
     const tagsAssets: Insertable<TagAssetTable>[] = [];
-    for (const tagsId of tagBulkAssets.tagIds) {
-      for (const assetsId of tagBulkAssets.assetIds) {
-        tagsAssets.push({ tagsId, assetsId });
+    for (const tagId of tagBulkAssets.tagIds) {
+      for (const assetId of tagBulkAssets.assetIds) {
+        tagsAssets.push({ tagId, assetId });
       }
     }
 
diff --git a/server/test/medium/specs/sync/sync-album-user.spec.ts b/server/test/medium/specs/sync/sync-album-user.spec.ts
index d779ffd9f3..4970995d28 100644
--- a/server/test/medium/specs/sync/sync-album-user.spec.ts
+++ b/server/test/medium/specs/sync/sync-album-user.spec.ts
@@ -74,7 +74,7 @@ describe(SyncRequestType.AlbumUsersV1, () => {
       await ctx.syncAckAll(auth, response);
       await ctx.assertSyncIsComplete(auth, [SyncRequestType.AlbumUsersV1]);
 
-      await albumUserRepo.update({ albumsId: album.id, usersId: user1.id }, { role: AlbumUserRole.Viewer });
+      await albumUserRepo.update({ albumId: album.id, userId: user1.id }, { role: AlbumUserRole.Viewer });
       const newResponse = await ctx.syncStream(auth, [SyncRequestType.AlbumUsersV1]);
       expect(newResponse).toEqual([
         {
@@ -104,7 +104,7 @@ describe(SyncRequestType.AlbumUsersV1, () => {
       await ctx.syncAckAll(auth, response);
       await ctx.assertSyncIsComplete(auth, [SyncRequestType.AlbumUsersV1]);
 
-      await albumUserRepo.delete({ albumsId: album.id, usersId: user1.id });
+      await albumUserRepo.delete({ albumId: album.id, userId: user1.id });
       const newResponse = await ctx.syncStream(auth, [SyncRequestType.AlbumUsersV1]);
       expect(newResponse).toEqual([
         {
@@ -171,7 +171,7 @@ describe(SyncRequestType.AlbumUsersV1, () => {
       await ctx.syncAckAll(auth, response);
       await ctx.assertSyncIsComplete(auth, [SyncRequestType.AlbumUsersV1]);
 
-      await albumUserRepo.update({ albumsId: album.id, usersId: user.id }, { role: AlbumUserRole.Viewer });
+      await albumUserRepo.update({ albumId: album.id, userId: user.id }, { role: AlbumUserRole.Viewer });
       const newResponse = await ctx.syncStream(auth, [SyncRequestType.AlbumUsersV1]);
       expect(newResponse).toEqual([
         {
@@ -208,7 +208,7 @@ describe(SyncRequestType.AlbumUsersV1, () => {
       await ctx.syncAckAll(auth, response);
 
       await ctx.assertSyncIsComplete(auth, [SyncRequestType.AlbumUsersV1]);
-      await albumUserRepo.delete({ albumsId: album.id, usersId: user.id });
+      await albumUserRepo.delete({ albumId: album.id, userId: user.id });
 
       const newResponse = await ctx.syncStream(auth, [SyncRequestType.AlbumUsersV1]);
       expect(newResponse).toEqual([
diff --git a/server/test/medium/specs/sync/sync-album.spec.ts b/server/test/medium/specs/sync/sync-album.spec.ts
index 591d7e1f3c..02536e3a8d 100644
--- a/server/test/medium/specs/sync/sync-album.spec.ts
+++ b/server/test/medium/specs/sync/sync-album.spec.ts
@@ -217,7 +217,7 @@ describe(SyncRequestType.AlbumsV1, () => {
       await ctx.syncAckAll(auth, response);
       await ctx.assertSyncIsComplete(auth, [SyncRequestType.AlbumsV1]);
 
-      await albumUserRepo.delete({ albumsId: album.id, usersId: auth.user.id });
+      await albumUserRepo.delete({ albumId: album.id, userId: auth.user.id });
       const newResponse = await ctx.syncStream(auth, [SyncRequestType.AlbumsV1]);
       expect(newResponse).toEqual([
         {

From aa69d89b9f945c7b36b5eece8b499585a358b592 Mon Sep 17 00:00:00 2001
From: Jason Rasmussen <jason@rasm.me>
Date: Tue, 4 Nov 2025 16:22:45 -0500
Subject: [PATCH 34/84] fix: bad merge (#23610)

---
 server/src/queries/tag.repository.sql           | 2 +-
 server/src/repositories/tag.repository.ts       | 2 +-
 server/test/medium.factory.ts                   | 4 ++--
 server/test/medium/specs/exif/exif-tags.spec.ts | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/server/src/queries/tag.repository.sql b/server/src/queries/tag.repository.sql
index 6d7314eab9..c3b46dd9f3 100644
--- a/server/src/queries/tag.repository.sql
+++ b/server/src/queries/tag.repository.sql
@@ -96,7 +96,7 @@ where
 
 -- TagRepository.upsertAssetIds
 insert into
-  "tag_asset" ("assetId", "tagsIds")
+  "tag_asset" ("assetId", "tagIds")
 values
   ($1, $2)
 on conflict do nothing
diff --git a/server/src/repositories/tag.repository.ts b/server/src/repositories/tag.repository.ts
index 2fec0777cc..d4572886af 100644
--- a/server/src/repositories/tag.repository.ts
+++ b/server/src/repositories/tag.repository.ts
@@ -128,7 +128,7 @@ export class TagRepository {
     await this.db.deleteFrom('tag_asset').where('tagId', '=', tagId).where('assetId', 'in', assetIds).execute();
   }
 
-  @GenerateSql({ params: [[{ assetId: DummyValue.UUID, tagsIds: [DummyValue.UUID] }]] })
+  @GenerateSql({ params: [[{ assetId: DummyValue.UUID, tagIds: DummyValue.UUID }]] })
   @Chunked()
   upsertAssetIds(items: Insertable<TagAssetTable>[]) {
     if (items.length === 0) {
diff --git a/server/test/medium.factory.ts b/server/test/medium.factory.ts
index e41a1965a2..6167b6a6ff 100644
--- a/server/test/medium.factory.ts
+++ b/server/test/medium.factory.ts
@@ -351,8 +351,8 @@ export class ExifTestContext extends MediumTestContext<MetadataService> {
   getTags(assetId: string) {
     return this.database
       .selectFrom('tag')
-      .innerJoin('tag_asset', 'tag.id', 'tag_asset.tagsId')
-      .where('tag_asset.assetsId', '=', assetId)
+      .innerJoin('tag_asset', 'tag.id', 'tag_asset.tagId')
+      .where('tag_asset.assetId', '=', assetId)
       .selectAll()
       .execute();
   }
diff --git a/server/test/medium/specs/exif/exif-tags.spec.ts b/server/test/medium/specs/exif/exif-tags.spec.ts
index aee79f4ec1..33a81d24b6 100644
--- a/server/test/medium/specs/exif/exif-tags.spec.ts
+++ b/server/test/medium/specs/exif/exif-tags.spec.ts
@@ -27,8 +27,8 @@ describe('exif tags', () => {
     await sut.handleMetadataExtraction({ id: asset.id });
 
     await expect(ctx.getTags(asset.id)).resolves.toEqual([
-      expect.objectContaining({ assetsId: asset.id, value: 'Frost', parentId: null }),
-      expect.objectContaining({ assetsId: asset.id, value: 'Yard', parentId: null }),
+      expect.objectContaining({ assetId: asset.id, value: 'Frost', parentId: null }),
+      expect.objectContaining({ assetId: asset.id, value: 'Yard', parentId: null }),
     ]);
   });
 });

From 3cc9dd126cf250314c91294bebabf0d5b5f67c4b Mon Sep 17 00:00:00 2001
From: Sergey Katsubo <skatsubo@gmail.com>
Date: Wed, 5 Nov 2025 17:03:55 +0300
Subject: [PATCH 35/84] fix(web): fix timezone dropdown for timestamps lacking
 milliseconds (#23615)

Fix timezone selector for timestamps without milliseconds
---
 web/src/lib/modals/timezone-utils.ts | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/web/src/lib/modals/timezone-utils.ts b/web/src/lib/modals/timezone-utils.ts
index c7bb00fd69..fc4081d3bb 100644
--- a/web/src/lib/modals/timezone-utils.ts
+++ b/web/src/lib/modals/timezone-utils.ts
@@ -70,9 +70,14 @@ export function getModernOffsetForZoneAndDate(
 
 function zoneOptionForDate(zone: string, date: string) {
   const { offsetMinutes, offsetFormat: zoneOffsetAtDate } = getModernOffsetForZoneAndDate(zone, date);
-  // For validity, we still need to check if the exact date/time exists in the *original* timezone (for gaps/overlaps).
-  const dateForValidity = DateTime.fromISO(date, { zone });
-  const valid = dateForValidity.isValid && date === dateForValidity.toFormat("yyyy-MM-dd'T'HH:mm:ss.SSS");
+  // For validity, we still need to check if the exact date/time exists in the *original* timezone.
+  // Use the fact that in DST gaps Luxon advances the missing time by an hour.
+  // Ignore milliseconds:
+  // - milliseconds are not relevant for TZ calculations
+  // - browsers strip insignificant .000 making string comparison with milliseconds more fragile.
+  const dateInTimezone = DateTime.fromISO(date, { zone });
+  const exists = date.replace(/\.\d+/, '') === dateInTimezone.toFormat("yyyy-MM-dd'T'HH:mm:ss");
+  const valid = dateInTimezone.isValid && exists;
   return {
     value: zone,
     offsetMinutes,

From 35e188e6e713e9b370d592933dfcfce83a7c4bb7 Mon Sep 17 00:00:00 2001
From: Dmitry <free-wind-2012@yandex.ru>
Date: Wed, 5 Nov 2025 17:05:03 +0300
Subject: [PATCH 36/84] docs: sync ru docs with main README.md (#23627)

---
 readme_i18n/README_ru_RU.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/readme_i18n/README_ru_RU.md b/readme_i18n/README_ru_RU.md
index e29adde9c1..9c60e5f772 100644
--- a/readme_i18n/README_ru_RU.md
+++ b/readme_i18n/README_ru_RU.md
@@ -94,7 +94,7 @@
 | LivePhoto/MotionPhoto воспроизведение и бекап          | Да         | Да  |
 | Отображение 360° изображений                           | Нет        | Да  |
 | Настраиваемая структура хранилища                      | Да         | Да  |
-| Общий доступ к контенту                                | Нет        | Да  |
+| Общий доступ к контенту                                | Да         | Да  |
 | Архив и избранное                                      | Да         | Да  |
 | Мировая карта                                          | Да         | Да  |
 | Совместное использование                               | Да         | Да  |
@@ -104,7 +104,7 @@
 | Галереи только для просмотра                           | Да         | Да  |
 | Коллажи                                                | Да         | Да  |
 | Метки (теги)                                           | Нет        | Да  |
-| Просмотр папкой                                        | Нет        | Да  |
+| Просмотр папкой                                        | Да         | Да  |
 
 ## Перевод
 

From c15e9bfa72a20ffab79059971f8d5bd9574211e1 Mon Sep 17 00:00:00 2001
From: Arnaud Wery <37458412+Yonyc@users.noreply.github.com>
Date: Wed, 5 Nov 2025 15:05:48 +0100
Subject: [PATCH 37/84] fix(web): "select all" button in trash and permanently
 deleted count (#23594)

---
 web/src/lib/utils/actions.ts                                    | 2 +-
 .../(user)/trash/[[photos=photos]]/[[assetId=id]]/+page.svelte  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/src/lib/utils/actions.ts b/web/src/lib/utils/actions.ts
index d84ca52a96..af79527841 100644
--- a/web/src/lib/utils/actions.ts
+++ b/web/src/lib/utils/actions.ts
@@ -38,7 +38,7 @@ export const deleteAssets = async (
         props: {
           title: $t('success'),
           description: force
-            ? $t('assets_permanently_deleted_count')
+            ? $t('assets_permanently_deleted_count', { values: { count: ids.length } })
             : $t('assets_trashed_count', { values: { count: ids.length } }),
           color: 'success',
           button:
diff --git a/web/src/routes/(user)/trash/[[photos=photos]]/[[assetId=id]]/+page.svelte b/web/src/routes/(user)/trash/[[photos=photos]]/[[assetId=id]]/+page.svelte
index f12d8c80d3..e9e8d5ff82 100644
--- a/web/src/routes/(user)/trash/[[photos=photos]]/[[assetId=id]]/+page.svelte
+++ b/web/src/routes/(user)/trash/[[photos=photos]]/[[assetId=id]]/+page.svelte
@@ -103,7 +103,7 @@
       </HStack>
     {/snippet}
 
-    <Timeline enableRouting={true} {options} {assetInteraction} onEscape={handleEscape}>
+    <Timeline enableRouting={true} bind:timelineManager {options} {assetInteraction} onEscape={handleEscape}>
       <p class="font-medium text-gray-500/60 dark:text-gray-300/60 p-4">
         {$t('trashed_items_will_be_permanently_deleted_after', { values: { days: $serverConfig.trashDays } })}
       </p>

From 125e8cee01e929797575e87509a910eb7b36900b Mon Sep 17 00:00:00 2001
From: bo0tzz <git@bo0tzz.me>
Date: Wed, 5 Nov 2025 15:05:53 +0100
Subject: [PATCH 38/84] chore: update config.json example (#23471)

* chore: update config.json example

closes #23465

* fix: format, for real this time
---
 docs/docs/install/config-file.md | 226 ++++++++++++++++++-------------
 1 file changed, 133 insertions(+), 93 deletions(-)

diff --git a/docs/docs/install/config-file.md b/docs/docs/install/config-file.md
index 3fb0687e4a..a6aaae149b 100644
--- a/docs/docs/install/config-file.md
+++ b/docs/docs/install/config-file.md
@@ -16,48 +16,76 @@ The default configuration looks like this:
 
 ```json
 {
-  "ffmpeg": {
-    "crf": 23,
-    "threads": 0,
-    "preset": "ultrafast",
-    "targetVideoCodec": "h264",
-    "acceptedVideoCodecs": ["h264"],
-    "targetAudioCodec": "aac",
-    "acceptedAudioCodecs": ["aac", "mp3", "libopus", "pcm_s16le"],
-    "acceptedContainers": ["mov", "ogg", "webm"],
-    "targetResolution": "720",
-    "maxBitrate": "0",
-    "bframes": -1,
-    "refs": 0,
-    "gopSize": 0,
-    "temporalAQ": false,
-    "cqMode": "auto",
-    "twoPass": false,
-    "preferredHwDevice": "auto",
-    "transcode": "required",
-    "tonemap": "hable",
-    "accel": "disabled",
-    "accelDecode": false
-  },
   "backup": {
     "database": {
-      "enabled": true,
       "cronExpression": "0 02 * * *",
+      "enabled": true,
       "keepLastAmount": 14
     }
   },
+  "ffmpeg": {
+    "accel": "disabled",
+    "accelDecode": false,
+    "acceptedAudioCodecs": ["aac", "mp3", "libopus"],
+    "acceptedContainers": ["mov", "ogg", "webm"],
+    "acceptedVideoCodecs": ["h264"],
+    "bframes": -1,
+    "cqMode": "auto",
+    "crf": 23,
+    "gopSize": 0,
+    "maxBitrate": "0",
+    "preferredHwDevice": "auto",
+    "preset": "ultrafast",
+    "refs": 0,
+    "targetAudioCodec": "aac",
+    "targetResolution": "720",
+    "targetVideoCodec": "h264",
+    "temporalAQ": false,
+    "threads": 0,
+    "tonemap": "hable",
+    "transcode": "required",
+    "twoPass": false
+  },
+  "image": {
+    "colorspace": "p3",
+    "extractEmbedded": false,
+    "fullsize": {
+      "enabled": false,
+      "format": "jpeg",
+      "quality": 80
+    },
+    "preview": {
+      "format": "jpeg",
+      "quality": 80,
+      "size": 1440
+    },
+    "thumbnail": {
+      "format": "webp",
+      "quality": 80,
+      "size": 250
+    }
+  },
   "job": {
     "backgroundTask": {
       "concurrency": 5
     },
-    "smartSearch": {
+    "faceDetection": {
       "concurrency": 2
     },
+    "library": {
+      "concurrency": 5
+    },
     "metadataExtraction": {
       "concurrency": 5
     },
-    "faceDetection": {
-      "concurrency": 2
+    "migration": {
+      "concurrency": 5
+    },
+    "notifications": {
+      "concurrency": 5
+    },
+    "ocr": {
+      "concurrency": 1
     },
     "search": {
       "concurrency": 5
@@ -65,20 +93,23 @@ The default configuration looks like this:
     "sidecar": {
       "concurrency": 5
     },
-    "library": {
-      "concurrency": 5
-    },
-    "migration": {
-      "concurrency": 5
+    "smartSearch": {
+      "concurrency": 2
     },
     "thumbnailGeneration": {
       "concurrency": 3
     },
     "videoConversion": {
       "concurrency": 1
+    }
+  },
+  "library": {
+    "scan": {
+      "cronExpression": "0 0 * * *",
+      "enabled": true
     },
-    "notifications": {
-      "concurrency": 5
+    "watch": {
+      "enabled": false
     }
   },
   "logging": {
@@ -86,8 +117,11 @@ The default configuration looks like this:
     "level": "log"
   },
   "machineLearning": {
-    "enabled": true,
-    "urls": ["http://immich-machine-learning:3003"],
+    "availabilityChecks": {
+      "enabled": true,
+      "interval": 30000,
+      "timeout": 2000
+    },
     "clip": {
       "enabled": true,
       "modelName": "ViT-B-32__openai"
@@ -96,27 +130,59 @@ The default configuration looks like this:
       "enabled": true,
       "maxDistance": 0.01
     },
+    "enabled": true,
     "facialRecognition": {
       "enabled": true,
-      "modelName": "buffalo_l",
-      "minScore": 0.7,
       "maxDistance": 0.5,
-      "minFaces": 3
-    }
+      "minFaces": 3,
+      "minScore": 0.7,
+      "modelName": "buffalo_l"
+    },
+    "ocr": {
+      "enabled": true,
+      "maxResolution": 736,
+      "minDetectionScore": 0.5,
+      "minRecognitionScore": 0.8,
+      "modelName": "PP-OCRv5_mobile"
+    },
+    "urls": ["http://immich-machine-learning:3003"]
   },
   "map": {
+    "darkStyle": "https://tiles.immich.cloud/v1/style/dark.json",
     "enabled": true,
-    "lightStyle": "https://tiles.immich.cloud/v1/style/light.json",
-    "darkStyle": "https://tiles.immich.cloud/v1/style/dark.json"
-  },
-  "reverseGeocoding": {
-    "enabled": true
+    "lightStyle": "https://tiles.immich.cloud/v1/style/light.json"
   },
   "metadata": {
     "faces": {
       "import": false
     }
   },
+  "newVersionCheck": {
+    "enabled": true
+  },
+  "nightlyTasks": {
+    "clusterNewFaces": true,
+    "databaseCleanup": true,
+    "generateMemories": true,
+    "missingThumbnails": true,
+    "startTime": "00:00",
+    "syncQuotaUsage": true
+  },
+  "notifications": {
+    "smtp": {
+      "enabled": false,
+      "from": "",
+      "replyTo": "",
+      "transport": {
+        "host": "",
+        "ignoreCert": false,
+        "password": "",
+        "port": 587,
+        "secure": false,
+        "username": ""
+      }
+    }
+  },
   "oauth": {
     "autoLaunch": false,
     "autoRegister": true,
@@ -128,70 +194,44 @@ The default configuration looks like this:
     "issuerUrl": "",
     "mobileOverrideEnabled": false,
     "mobileRedirectUri": "",
+    "profileSigningAlgorithm": "none",
+    "roleClaim": "immich_role",
     "scope": "openid email profile",
     "signingAlgorithm": "RS256",
-    "profileSigningAlgorithm": "none",
     "storageLabelClaim": "preferred_username",
-    "storageQuotaClaim": "immich_quota"
+    "storageQuotaClaim": "immich_quota",
+    "timeout": 30000,
+    "tokenEndpointAuthMethod": "client_secret_post"
   },
   "passwordLogin": {
     "enabled": true
   },
+  "reverseGeocoding": {
+    "enabled": true
+  },
+  "server": {
+    "externalDomain": "",
+    "loginPageMessage": "",
+    "publicUsers": true
+  },
   "storageTemplate": {
     "enabled": false,
     "hashVerificationEnabled": true,
     "template": "{{y}}/{{y}}-{{MM}}-{{dd}}/{{filename}}"
   },
-  "image": {
-    "thumbnail": {
-      "format": "webp",
-      "size": 250,
-      "quality": 80
-    },
-    "preview": {
-      "format": "jpeg",
-      "size": 1440,
-      "quality": 80
-    },
-    "colorspace": "p3",
-    "extractEmbedded": false
-  },
-  "newVersionCheck": {
-    "enabled": true
-  },
-  "trash": {
-    "enabled": true,
-    "days": 30
+  "templates": {
+    "email": {
+      "albumInviteTemplate": "",
+      "albumUpdateTemplate": "",
+      "welcomeTemplate": ""
+    }
   },
   "theme": {
     "customCss": ""
   },
-  "library": {
-    "scan": {
-      "enabled": true,
-      "cronExpression": "0 0 * * *"
-    },
-    "watch": {
-      "enabled": false
-    }
-  },
-  "server": {
-    "externalDomain": "",
-    "loginPageMessage": ""
-  },
-  "notifications": {
-    "smtp": {
-      "enabled": false,
-      "from": "",
-      "replyTo": "",
-      "transport": {
-        "ignoreCert": false,
-        "host": "",
-        "port": 587,
-        "username": "",
-        "password": ""
-      }
-    }
+  "trash": {
+    "days": 30,
+    "enabled": true
   },
   "user": {
     "deleteDelay": 7

From 25fb43bbe3b0c49ec6dbbdc8883be21fdfaedbc1 Mon Sep 17 00:00:00 2001
From: Alex <alex.tran1502@gmail.com>
Date: Wed, 5 Nov 2025 08:09:50 -0600
Subject: [PATCH 39/84] fix: fully sync local library on app restart (#23323)

---
 mobile/lib/pages/common/splash_screen.page.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/lib/pages/common/splash_screen.page.dart b/mobile/lib/pages/common/splash_screen.page.dart
index c1d621f474..79db33104d 100644
--- a/mobile/lib/pages/common/splash_screen.page.dart
+++ b/mobile/lib/pages/common/splash_screen.page.dart
@@ -65,7 +65,7 @@ class SplashScreenPageState extends ConsumerState<SplashScreenPage> {
               if (Store.isBetaTimelineEnabled) {
                 bool syncSuccess = false;
                 await Future.wait([
-                  backgroundManager.syncLocal(),
+                  backgroundManager.syncLocal(full: true),
                   backgroundManager.syncRemote().then((success) => syncSuccess = success),
                 ]);
 

From 365abd8906644541370678439c33ee1bcf8a7ecf Mon Sep 17 00:00:00 2001
From: shenlong <139912620+shenlong-tanwen@users.noreply.github.com>
Date: Thu, 6 Nov 2025 00:57:38 +0530
Subject: [PATCH 40/84] fix: check if unmetered instead of wifi (#23380)

Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>
---
 mobile/lib/domain/services/background_worker.service.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/lib/domain/services/background_worker.service.dart b/mobile/lib/domain/services/background_worker.service.dart
index 5c228ba67c..28c87293f9 100644
--- a/mobile/lib/domain/services/background_worker.service.dart
+++ b/mobile/lib/domain/services/background_worker.service.dart
@@ -239,7 +239,7 @@ class BackgroundWorkerBgService extends BackgroundWorkerFlutterApi {
         final networkCapabilities = await _ref?.read(connectivityApiProvider).getCapabilities() ?? [];
         return _ref
             ?.read(uploadServiceProvider)
-            .startBackupWithHttpClient(currentUser.id, networkCapabilities.hasWifi, _cancellationToken);
+            .startBackupWithHttpClient(currentUser.id, networkCapabilities.isUnmetered, _cancellationToken);
       },
       (error, stack) {
         dPrint(() => "Error in backup zone $error, $stack");

From 2c50f2e24475856b670c025d8ea6748dde857410 Mon Sep 17 00:00:00 2001
From: Snowknight26 <Snowknight26@users.noreply.github.com>
Date: Thu, 6 Nov 2025 08:24:47 -0600
Subject: [PATCH 41/84] fix(web): add URLs to results in large files utility
 (#23617)

fix(web): add URLs to results in large files
---
 .../[[assetId=id]]/+page.svelte               | 38 ++++++++++++-------
 .../[[photos=photos]]/[[assetId=id]]/+page.ts |  6 ++-
 2 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/web/src/routes/(user)/utilities/large-files/[[photos=photos]]/[[assetId=id]]/+page.svelte b/web/src/routes/(user)/utilities/large-files/[[photos=photos]]/[[assetId=id]]/+page.svelte
index 40c70c9df2..06f075feb6 100644
--- a/web/src/routes/(user)/utilities/large-files/[[photos=photos]]/[[assetId=id]]/+page.svelte
+++ b/web/src/routes/(user)/utilities/large-files/[[photos=photos]]/[[assetId=id]]/+page.svelte
@@ -8,6 +8,7 @@
   import { navigate } from '$lib/utils/navigation';
   import { t } from 'svelte-i18n';
   import type { PageData } from './$types';
+  import type { AssetResponseDto } from '@immich/sdk';
 
   interface Props {
     data: PageData;
@@ -16,35 +17,42 @@
   let { data }: Props = $props();
 
   let assets = $derived(data.assets);
+  let asset = $derived(data.asset);
   const { isViewing: showAssetViewer, asset: viewingAsset, setAsset } = assetViewingStore;
   const getAssetIndex = (id: string) => assets.findIndex((asset) => asset.id === id);
 
-  const onNext = () => {
+  $effect(() => {
+    if (asset) {
+      setAsset(asset);
+    }
+  });
+
+  const onNext = async () => {
     const index = getAssetIndex($viewingAsset.id) + 1;
     if (index >= assets.length) {
-      return Promise.resolve(false);
+      return false;
     }
-    setAsset(assets[index]);
-    return Promise.resolve(true);
+    await onViewAsset(assets[index]);
+    return true;
   };
 
-  const onPrevious = () => {
+  const onPrevious = async () => {
     const index = getAssetIndex($viewingAsset.id) - 1;
     if (index < 0) {
-      return Promise.resolve(false);
+      return false;
     }
-    setAsset(assets[index]);
-    return Promise.resolve(true);
+    await onViewAsset(assets[index]);
+    return true;
   };
 
-  const onRandom = () => {
+  const onRandom = async () => {
     if (assets.length <= 0) {
-      return Promise.resolve(undefined);
+      return undefined;
     }
     const index = Math.floor(Math.random() * assets.length);
     const asset = assets[index];
-    setAsset(asset);
-    return Promise.resolve(asset);
+    await onViewAsset(asset);
+    return asset;
   };
 
   const onAction = (payload: Action) => {
@@ -53,13 +61,17 @@
       $showAssetViewer = false;
     }
   };
+
+  const onViewAsset = async (asset: AssetResponseDto) => {
+    await navigate({ targetRoute: 'current', assetId: asset.id });
+  };
 </script>
 
 <UserPageLayout title={data.meta.title} scrollbar={true}>
   <div class="grid gap-2 grid-cols-2 sm:grid-cols-3 lg:grid-cols-4 xl:grid-cols-6">
     {#if assets && data.assets.length > 0}
       {#each assets as asset (asset.id)}
-        <LargeAssetData {asset} onViewAsset={(asset) => setAsset(asset)} />
+        <LargeAssetData {asset} {onViewAsset} />
       {/each}
     {:else}
       <p class="text-center text-lg dark:text-white flex place-items-center place-content-center">
diff --git a/web/src/routes/(user)/utilities/large-files/[[photos=photos]]/[[assetId=id]]/+page.ts b/web/src/routes/(user)/utilities/large-files/[[photos=photos]]/[[assetId=id]]/+page.ts
index 6780fdb023..19754bcff2 100644
--- a/web/src/routes/(user)/utilities/large-files/[[photos=photos]]/[[assetId=id]]/+page.ts
+++ b/web/src/routes/(user)/utilities/large-files/[[photos=photos]]/[[assetId=id]]/+page.ts
@@ -1,15 +1,17 @@
 import { authenticate } from '$lib/utils/auth';
 import { getFormatter } from '$lib/utils/i18n';
+import { getAssetInfoFromParam } from '$lib/utils/navigation';
 import { searchLargeAssets } from '@immich/sdk';
 import type { PageLoad } from './$types';
 
-export const load = (async ({ url }) => {
+export const load = (async ({ params, url }) => {
   await authenticate(url);
-  const assets = await searchLargeAssets({ minFileSize: 0 });
+  const [assets, asset] = await Promise.all([searchLargeAssets({ minFileSize: 0 }), getAssetInfoFromParam(params)]);
   const $t = await getFormatter();
 
   return {
     assets,
+    asset,
     meta: {
       title: $t('large_files'),
     },

From a4ae86ce294683d85723b0c11a6c28d32a1be401 Mon Sep 17 00:00:00 2001
From: Mert <101130780+mertalev@users.noreply.github.com>
Date: Thu, 6 Nov 2025 12:55:11 -0500
Subject: [PATCH 42/84] feat(ml): add preload and fp16 settings for ocr
 (#23576)

---
 docs/docs/install/environment-variables.md | 48 ++++++++++---------
 machine-learning/immich_ml/config.py       |  9 ++++
 machine-learning/immich_ml/main.py         | 14 ++++++
 machine-learning/immich_ml/schemas.py      |  5 ++
 machine-learning/immich_ml/sessions/ort.py |  8 ++--
 machine-learning/test_main.py              | 55 ++++++++++++++++++++--
 6 files changed, 109 insertions(+), 30 deletions(-)

diff --git a/docs/docs/install/environment-variables.md b/docs/docs/install/environment-variables.md
index 78a5289bf4..55c226d507 100644
--- a/docs/docs/install/environment-variables.md
+++ b/docs/docs/install/environment-variables.md
@@ -149,29 +149,31 @@ Redis (Sentinel) URL example JSON before encoding:
 
 ## Machine Learning
 
-| Variable                                                    | Description                                                                                         |             Default             | Containers       |
-| :---------------------------------------------------------- | :-------------------------------------------------------------------------------------------------- | :-----------------------------: | :--------------- |
-| `MACHINE_LEARNING_MODEL_TTL`                                | Inactivity time (s) before a model is unloaded (disabled if \<= 0)                                  |              `300`              | machine learning |
-| `MACHINE_LEARNING_MODEL_TTL_POLL_S`                         | Interval (s) between checks for the model TTL (disabled if \<= 0)                                   |              `10`               | machine learning |
-| `MACHINE_LEARNING_CACHE_FOLDER`                             | Directory where models are downloaded                                                               |            `/cache`             | machine learning |
-| `MACHINE_LEARNING_REQUEST_THREADS`<sup>\*1</sup>            | Thread count of the request thread pool (disabled if \<= 0)                                         |       number of CPU cores       | machine learning |
-| `MACHINE_LEARNING_MODEL_INTER_OP_THREADS`                   | Number of parallel model operations                                                                 |               `1`               | machine learning |
-| `MACHINE_LEARNING_MODEL_INTRA_OP_THREADS`                   | Number of threads for each model operation                                                          |               `2`               | machine learning |
-| `MACHINE_LEARNING_WORKERS`<sup>\*2</sup>                    | Number of worker processes to spawn                                                                 |               `1`               | machine learning |
-| `MACHINE_LEARNING_HTTP_KEEPALIVE_TIMEOUT_S`<sup>\*3</sup>   | HTTP Keep-alive time in seconds                                                                     |               `2`               | machine learning |
-| `MACHINE_LEARNING_WORKER_TIMEOUT`                           | Maximum time (s) of unresponsiveness before a worker is killed                                      | `120` (`300` if using OpenVINO) | machine learning |
-| `MACHINE_LEARNING_PRELOAD__CLIP__TEXTUAL`                   | Comma-separated list of (textual) CLIP model(s) to preload and cache                                |                                 | machine learning |
-| `MACHINE_LEARNING_PRELOAD__CLIP__VISUAL`                    | Comma-separated list of (visual) CLIP model(s) to preload and cache                                 |                                 | machine learning |
-| `MACHINE_LEARNING_PRELOAD__FACIAL_RECOGNITION__RECOGNITION` | Comma-separated list of (recognition) facial recognition model(s) to preload and cache              |                                 | machine learning |
-| `MACHINE_LEARNING_PRELOAD__FACIAL_RECOGNITION__DETECTION`   | Comma-separated list of (detection) facial recognition model(s) to preload and cache                |                                 | machine learning |
-| `MACHINE_LEARNING_ANN`                                      | Enable ARM-NN hardware acceleration if supported                                                    |             `True`              | machine learning |
-| `MACHINE_LEARNING_ANN_FP16_TURBO`                           | Execute operations in FP16 precision: increasing speed, reducing precision (applies only to ARM-NN) |             `False`             | machine learning |
-| `MACHINE_LEARNING_ANN_TUNING_LEVEL`                         | ARM-NN GPU tuning level (1: rapid, 2: normal, 3: exhaustive)                                        |               `2`               | machine learning |
-| `MACHINE_LEARNING_DEVICE_IDS`<sup>\*4</sup>                 | Device IDs to use in multi-GPU environments                                                         |               `0`               | machine learning |
-| `MACHINE_LEARNING_MAX_BATCH_SIZE__FACIAL_RECOGNITION`       | Set the maximum number of faces that will be processed at once by the facial recognition model      |  None (`1` if using OpenVINO)   | machine learning |
-| `MACHINE_LEARNING_RKNN`                                     | Enable RKNN hardware acceleration if supported                                                      |             `True`              | machine learning |
-| `MACHINE_LEARNING_RKNN_THREADS`                             | How many threads of RKNN runtime should be spinned up while inferencing.                            |               `1`               | machine learning |
-| `MACHINE_LEARNING_MODEL_ARENA`                              | Pre-allocates CPU memory to avoid memory fragmentation                                              |              true               | machine learning |
+| Variable                                                    | Description                                                                                                                                                  |             Default             | Containers       |
+| :---------------------------------------------------------- | :----------------------------------------------------------------------------------------------------------------------------------------------------------- | :-----------------------------: | :--------------- |
+| `MACHINE_LEARNING_MODEL_TTL`                                | Inactivity time (s) before a model is unloaded (disabled if \<= 0)                                                                                           |              `300`              | machine learning |
+| `MACHINE_LEARNING_MODEL_TTL_POLL_S`                         | Interval (s) between checks for the model TTL (disabled if \<= 0)                                                                                            |              `10`               | machine learning |
+| `MACHINE_LEARNING_CACHE_FOLDER`                             | Directory where models are downloaded                                                                                                                        |            `/cache`             | machine learning |
+| `MACHINE_LEARNING_REQUEST_THREADS`<sup>\*1</sup>            | Thread count of the request thread pool (disabled if \<= 0)                                                                                                  |       number of CPU cores       | machine learning |
+| `MACHINE_LEARNING_MODEL_INTER_OP_THREADS`                   | Number of parallel model operations                                                                                                                          |               `1`               | machine learning |
+| `MACHINE_LEARNING_MODEL_INTRA_OP_THREADS`                   | Number of threads for each model operation                                                                                                                   |               `2`               | machine learning |
+| `MACHINE_LEARNING_WORKERS`<sup>\*2</sup>                    | Number of worker processes to spawn                                                                                                                          |               `1`               | machine learning |
+| `MACHINE_LEARNING_HTTP_KEEPALIVE_TIMEOUT_S`<sup>\*3</sup>   | HTTP Keep-alive time in seconds                                                                                                                              |               `2`               | machine learning |
+| `MACHINE_LEARNING_WORKER_TIMEOUT`                           | Maximum time (s) of unresponsiveness before a worker is killed                                                                                               | `120` (`300` if using OpenVINO) | machine learning |
+| `MACHINE_LEARNING_PRELOAD__CLIP__TEXTUAL`                   | Comma-separated list of (textual) CLIP model(s) to preload and cache                                                                                         |                                 | machine learning |
+| `MACHINE_LEARNING_PRELOAD__CLIP__VISUAL`                    | Comma-separated list of (visual) CLIP model(s) to preload and cache                                                                                          |                                 | machine learning |
+| `MACHINE_LEARNING_PRELOAD__FACIAL_RECOGNITION__RECOGNITION` | Comma-separated list of (recognition) facial recognition model(s) to preload and cache                                                                       |                                 | machine learning |
+| `MACHINE_LEARNING_PRELOAD__FACIAL_RECOGNITION__DETECTION`   | Comma-separated list of (detection) facial recognition model(s) to preload and cache                                                                         |                                 | machine learning |
+| `MACHINE_LEARNING_ANN`                                      | Enable ARM-NN hardware acceleration if supported                                                                                                             |             `True`              | machine learning |
+| `MACHINE_LEARNING_ANN_FP16_TURBO`                           | Execute operations in FP16 precision: increasing speed, reducing precision (applies only to ARM-NN)                                                          |             `False`             | machine learning |
+| `MACHINE_LEARNING_ANN_TUNING_LEVEL`                         | ARM-NN GPU tuning level (1: rapid, 2: normal, 3: exhaustive)                                                                                                 |               `2`               | machine learning |
+| `MACHINE_LEARNING_DEVICE_IDS`<sup>\*4</sup>                 | Device IDs to use in multi-GPU environments                                                                                                                  |               `0`               | machine learning |
+| `MACHINE_LEARNING_MAX_BATCH_SIZE__FACIAL_RECOGNITION`       | Set the maximum number of faces that will be processed at once by the facial recognition model                                                               |  None (`1` if using OpenVINO)   | machine learning |
+| `MACHINE_LEARNING_MAX_BATCH_SIZE__OCR`                      | Set the maximum number of boxes that will be processed at once by the OCR model                                                                              |               `6`               | machine learning |
+| `MACHINE_LEARNING_RKNN`                                     | Enable RKNN hardware acceleration if supported                                                                                                               |             `True`              | machine learning |
+| `MACHINE_LEARNING_RKNN_THREADS`                             | How many threads of RKNN runtime should be spun up while inferencing.                                                                                        |               `1`               | machine learning |
+| `MACHINE_LEARNING_MODEL_ARENA`                              | Pre-allocates CPU memory to avoid memory fragmentation                                                                                                       |              true               | machine learning |
+| `MACHINE_LEARNING_OPENVINO_PRECISION`                       | If set to FP16, uses half-precision floating-point operations for faster inference with reduced accuracy (one of [`FP16`, `FP32`], applies only to OpenVINO) |             `FP32`              | machine learning |
 
 \*1: It is recommended to begin with this parameter when changing the concurrency levels of the machine learning service and then tune the other ones.
 
diff --git a/machine-learning/immich_ml/config.py b/machine-learning/immich_ml/config.py
index 68d00625a3..19fd5300df 100644
--- a/machine-learning/immich_ml/config.py
+++ b/machine-learning/immich_ml/config.py
@@ -13,6 +13,8 @@ from rich.logging import RichHandler
 from uvicorn import Server
 from uvicorn.workers import UvicornWorker
 
+from .schemas import ModelPrecision
+
 
 class ClipSettings(BaseModel):
     textual: str | None = None
@@ -24,6 +26,11 @@ class FacialRecognitionSettings(BaseModel):
     detection: str | None = None
 
 
+class OcrSettings(BaseModel):
+    recognition: str | None = None
+    detection: str | None = None
+
+
 class PreloadModelData(BaseModel):
     clip_fallback: str | None = os.getenv("MACHINE_LEARNING_PRELOAD__CLIP", None)
     facial_recognition_fallback: str | None = os.getenv("MACHINE_LEARNING_PRELOAD__FACIAL_RECOGNITION", None)
@@ -37,6 +44,7 @@ class PreloadModelData(BaseModel):
         del os.environ["MACHINE_LEARNING_PRELOAD__FACIAL_RECOGNITION"]
     clip: ClipSettings = ClipSettings()
     facial_recognition: FacialRecognitionSettings = FacialRecognitionSettings()
+    ocr: OcrSettings = OcrSettings()
 
 
 class MaxBatchSize(BaseModel):
@@ -70,6 +78,7 @@ class Settings(BaseSettings):
     rknn_threads: int = 1
     preload: PreloadModelData | None = None
     max_batch_size: MaxBatchSize | None = None
+    openvino_precision: ModelPrecision = ModelPrecision.FP32
 
     @property
     def device_id(self) -> str:
diff --git a/machine-learning/immich_ml/main.py b/machine-learning/immich_ml/main.py
index 35f04d77ef..3d34d9bf9d 100644
--- a/machine-learning/immich_ml/main.py
+++ b/machine-learning/immich_ml/main.py
@@ -103,6 +103,20 @@ async def preload_models(preload: PreloadModelData) -> None:
             ModelTask.FACIAL_RECOGNITION,
         )
 
+    if preload.ocr.detection is not None:
+        await load_models(
+            preload.ocr.detection,
+            ModelType.DETECTION,
+            ModelTask.OCR,
+        )
+
+    if preload.ocr.recognition is not None:
+        await load_models(
+            preload.ocr.recognition,
+            ModelType.RECOGNITION,
+            ModelTask.OCR,
+        )
+
     if preload.clip_fallback is not None:
         log.warning(
             "Deprecated env variable: 'MACHINE_LEARNING_PRELOAD__CLIP'. "
diff --git a/machine-learning/immich_ml/schemas.py b/machine-learning/immich_ml/schemas.py
index bfb40b9c84..41706180de 100644
--- a/machine-learning/immich_ml/schemas.py
+++ b/machine-learning/immich_ml/schemas.py
@@ -46,6 +46,11 @@ class ModelSource(StrEnum):
     PADDLE = "paddle"
 
 
+class ModelPrecision(StrEnum):
+    FP16 = "FP16"
+    FP32 = "FP32"
+
+
 ModelIdentity = tuple[ModelType, ModelTask]
 
 
diff --git a/machine-learning/immich_ml/sessions/ort.py b/machine-learning/immich_ml/sessions/ort.py
index b6f709a323..6c52936722 100644
--- a/machine-learning/immich_ml/sessions/ort.py
+++ b/machine-learning/immich_ml/sessions/ort.py
@@ -93,10 +93,12 @@ class OrtSession:
                 case "CUDAExecutionProvider" | "ROCMExecutionProvider":
                     options = {"arena_extend_strategy": "kSameAsRequested", "device_id": settings.device_id}
                 case "OpenVINOExecutionProvider":
+                    openvino_dir = self.model_path.parent / "openvino"
+                    device = f"GPU.{settings.device_id}"
                     options = {
-                        "device_type": f"GPU.{settings.device_id}",
-                        "precision": "FP32",
-                        "cache_dir": (self.model_path.parent / "openvino").as_posix(),
+                        "device_type": device,
+                        "precision": settings.openvino_precision.value,
+                        "cache_dir": openvino_dir.as_posix(),
                     }
                 case "CoreMLExecutionProvider":
                     options = {
diff --git a/machine-learning/test_main.py b/machine-learning/test_main.py
index 582a05a950..eb8706fc19 100644
--- a/machine-learning/test_main.py
+++ b/machine-learning/test_main.py
@@ -26,7 +26,7 @@ from immich_ml.models.clip.textual import MClipTextualEncoder, OpenClipTextualEn
 from immich_ml.models.clip.visual import OpenClipVisualEncoder
 from immich_ml.models.facial_recognition.detection import FaceDetector
 from immich_ml.models.facial_recognition.recognition import FaceRecognizer
-from immich_ml.schemas import ModelFormat, ModelTask, ModelType
+from immich_ml.schemas import ModelFormat, ModelPrecision, ModelTask, ModelType
 from immich_ml.sessions.ann import AnnSession
 from immich_ml.sessions.ort import OrtSession
 from immich_ml.sessions.rknn import RknnSession, run_inference
@@ -240,11 +240,16 @@ class TestOrtSession:
 
     @pytest.mark.ov_device_ids(["GPU.0", "CPU"])
     def test_sets_default_provider_options(self, ov_device_ids: list[str]) -> None:
-        model_path = "/cache/ViT-B-32__openai/model.onnx"
+        model_path = "/cache/ViT-B-32__openai/textual/model.onnx"
+
         session = OrtSession(model_path, providers=["OpenVINOExecutionProvider", "CPUExecutionProvider"])
 
         assert session.provider_options == [
-            {"device_type": "GPU.0", "precision": "FP32", "cache_dir": "/cache/ViT-B-32__openai/openvino"},
+            {
+                "device_type": "GPU.0",
+                "precision": "FP32",
+                "cache_dir": "/cache/ViT-B-32__openai/textual/openvino",
+            },
             {"arena_extend_strategy": "kSameAsRequested"},
         ]
 
@@ -262,6 +267,21 @@ class TestOrtSession:
             }
         ]
 
+    def test_sets_openvino_to_fp16_if_enabled(self, mocker: MockerFixture) -> None:
+        model_path = "/cache/ViT-B-32__openai/textual/model.onnx"
+        os.environ["MACHINE_LEARNING_DEVICE_ID"] = "1"
+        mocker.patch.object(settings, "openvino_precision", ModelPrecision.FP16)
+
+        session = OrtSession(model_path, providers=["OpenVINOExecutionProvider"])
+
+        assert session.provider_options == [
+            {
+                "device_type": "GPU.1",
+                "precision": "FP16",
+                "cache_dir": "/cache/ViT-B-32__openai/textual/openvino",
+            }
+        ]
+
     def test_sets_provider_options_for_cuda(self) -> None:
         os.environ["MACHINE_LEARNING_DEVICE_ID"] = "1"
 
@@ -417,7 +437,7 @@ class TestRknnSession:
         session.run(None, input_feed)
 
         rknn_session.return_value.put.assert_called_once_with([input1, input2])
-        np_spy.call_count == 2
+        assert np_spy.call_count == 2
         np_spy.assert_has_calls([mock.call(input1), mock.call(input2)])
 
 
@@ -925,11 +945,34 @@ class TestCache:
             any_order=True,
         )
 
+    async def test_preloads_ocr_models(self, monkeypatch: MonkeyPatch, mock_get_model: mock.Mock) -> None:
+        os.environ["MACHINE_LEARNING_PRELOAD__OCR__DETECTION"] = "PP-OCRv5_mobile"
+        os.environ["MACHINE_LEARNING_PRELOAD__OCR__RECOGNITION"] = "PP-OCRv5_mobile"
+
+        settings = Settings()
+        assert settings.preload is not None
+        assert settings.preload.ocr.detection == "PP-OCRv5_mobile"
+        assert settings.preload.ocr.recognition == "PP-OCRv5_mobile"
+
+        model_cache = ModelCache()
+        monkeypatch.setattr("immich_ml.main.model_cache", model_cache)
+
+        await preload_models(settings.preload)
+        mock_get_model.assert_has_calls(
+            [
+                mock.call("PP-OCRv5_mobile", ModelType.DETECTION, ModelTask.OCR),
+                mock.call("PP-OCRv5_mobile", ModelType.RECOGNITION, ModelTask.OCR),
+            ],
+            any_order=True,
+        )
+
     async def test_preloads_all_models(self, monkeypatch: MonkeyPatch, mock_get_model: mock.Mock) -> None:
         os.environ["MACHINE_LEARNING_PRELOAD__CLIP__TEXTUAL"] = "ViT-B-32__openai"
         os.environ["MACHINE_LEARNING_PRELOAD__CLIP__VISUAL"] = "ViT-B-32__openai"
         os.environ["MACHINE_LEARNING_PRELOAD__FACIAL_RECOGNITION__RECOGNITION"] = "buffalo_s"
         os.environ["MACHINE_LEARNING_PRELOAD__FACIAL_RECOGNITION__DETECTION"] = "buffalo_s"
+        os.environ["MACHINE_LEARNING_PRELOAD__OCR__DETECTION"] = "PP-OCRv5_mobile"
+        os.environ["MACHINE_LEARNING_PRELOAD__OCR__RECOGNITION"] = "PP-OCRv5_mobile"
 
         settings = Settings()
         assert settings.preload is not None
@@ -937,6 +980,8 @@ class TestCache:
         assert settings.preload.clip.textual == "ViT-B-32__openai"
         assert settings.preload.facial_recognition.recognition == "buffalo_s"
         assert settings.preload.facial_recognition.detection == "buffalo_s"
+        assert settings.preload.ocr.detection == "PP-OCRv5_mobile"
+        assert settings.preload.ocr.recognition == "PP-OCRv5_mobile"
 
         model_cache = ModelCache()
         monkeypatch.setattr("immich_ml.main.model_cache", model_cache)
@@ -948,6 +993,8 @@ class TestCache:
                 mock.call("ViT-B-32__openai", ModelType.VISUAL, ModelTask.SEARCH),
                 mock.call("buffalo_s", ModelType.DETECTION, ModelTask.FACIAL_RECOGNITION),
                 mock.call("buffalo_s", ModelType.RECOGNITION, ModelTask.FACIAL_RECOGNITION),
+                mock.call("PP-OCRv5_mobile", ModelType.DETECTION, ModelTask.OCR),
+                mock.call("PP-OCRv5_mobile", ModelType.RECOGNITION, ModelTask.OCR),
             ],
             any_order=True,
         )

From 6913697ad15b3fcad80fc136ecf710af19d1f5df Mon Sep 17 00:00:00 2001
From: Mert <101130780+mertalev@users.noreply.github.com>
Date: Thu, 6 Nov 2025 12:58:41 -0500
Subject: [PATCH 43/84] feat(ml): multilingual ocr (#23527)

* handle other languages in ml server

* add variants to model selector

* no need to override path

* unused import
---
 machine-learning/immich_ml/models/constants.py         |  8 ++++++++
 machine-learning/immich_ml/models/ocr/detection.py     |  2 +-
 machine-learning/immich_ml/models/ocr/recognition.py   |  4 +++-
 machine-learning/immich_ml/models/ocr/schemas.py       |  4 ++--
 .../admin-settings/MachineLearningSettings.svelte      | 10 ++++++++--
 5 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/machine-learning/immich_ml/models/constants.py b/machine-learning/immich_ml/models/constants.py
index 10a4ae48a9..db9e7cfa4d 100644
--- a/machine-learning/immich_ml/models/constants.py
+++ b/machine-learning/immich_ml/models/constants.py
@@ -78,6 +78,14 @@ _INSIGHTFACE_MODELS = {
 _PADDLE_MODELS = {
     "PP-OCRv5_server",
     "PP-OCRv5_mobile",
+    "CH__PP-OCRv5_server",
+    "CH__PP-OCRv5_mobile",
+    "EL__PP-OCRv5_mobile",
+    "EN__PP-OCRv5_mobile",
+    "ESLAV__PP-OCRv5_mobile",
+    "KOREAN__PP-OCRv5_mobile",
+    "LATIN__PP-OCRv5_mobile",
+    "TH__PP-OCRv5_mobile",
 }
 
 SUPPORTED_PROVIDERS = [
diff --git a/machine-learning/immich_ml/models/ocr/detection.py b/machine-learning/immich_ml/models/ocr/detection.py
index 0a9d09b599..07a2f3cce2 100644
--- a/machine-learning/immich_ml/models/ocr/detection.py
+++ b/machine-learning/immich_ml/models/ocr/detection.py
@@ -23,7 +23,7 @@ class TextDetector(InferenceModel):
     identity = (ModelType.DETECTION, ModelTask.OCR)
 
     def __init__(self, model_name: str, **model_kwargs: Any) -> None:
-        super().__init__(model_name, **model_kwargs, model_format=ModelFormat.ONNX)
+        super().__init__(model_name.split("__")[-1], **model_kwargs, model_format=ModelFormat.ONNX)
         self.max_resolution = 736
         self.mean = np.array([0.5, 0.5, 0.5], dtype=np.float32)
         self.std_inv = np.float32(1.0) / (np.array([0.5, 0.5, 0.5], dtype=np.float32) * 255.0)
diff --git a/machine-learning/immich_ml/models/ocr/recognition.py b/machine-learning/immich_ml/models/ocr/recognition.py
index 0f91fc4105..af3f99dbdb 100644
--- a/machine-learning/immich_ml/models/ocr/recognition.py
+++ b/machine-learning/immich_ml/models/ocr/recognition.py
@@ -25,6 +25,7 @@ class TextRecognizer(InferenceModel):
     identity = (ModelType.RECOGNITION, ModelTask.OCR)
 
     def __init__(self, model_name: str, **model_kwargs: Any) -> None:
+        self.language = LangRec[model_name.split("__")[0]] if "__" in model_name else LangRec.CH
         self.min_score = model_kwargs.get("minScore", 0.9)
         self._empty: TextRecognitionOutput = {
             "box": np.empty(0, dtype=np.float32),
@@ -41,7 +42,7 @@ class TextRecognizer(InferenceModel):
                 engine_type=EngineType.ONNXRUNTIME,
                 ocr_version=OCRVersion.PPOCRV5,
                 task_type=TaskType.REC,
-                lang_type=LangRec.CH,
+                lang_type=self.language,
                 model_type=RapidModelType.MOBILE if "mobile" in self.model_name else RapidModelType.SERVER,
             )
         )
@@ -61,6 +62,7 @@ class TextRecognizer(InferenceModel):
                 session=session.session,
                 rec_batch_num=settings.max_batch_size.text_recognition if settings.max_batch_size is not None else 6,
                 rec_img_shape=(3, 48, 320),
+                lang_type=self.language,
             )
         )
         return session
diff --git a/machine-learning/immich_ml/models/ocr/schemas.py b/machine-learning/immich_ml/models/ocr/schemas.py
index a63c8dd8e5..78e8619a0b 100644
--- a/machine-learning/immich_ml/models/ocr/schemas.py
+++ b/machine-learning/immich_ml/models/ocr/schemas.py
@@ -20,8 +20,8 @@ class TextRecognitionOutput(TypedDict):
 
 # RapidOCR expects `engine_type`, `lang_type`, and `font_path` to be attributes
 class OcrOptions(dict[str, Any]):
-    def __init__(self, **options: Any) -> None:
+    def __init__(self, lang_type: LangRec | None = None, **options: Any) -> None:
         super().__init__(**options)
         self.engine_type = EngineType.ONNXRUNTIME
-        self.lang_type = LangRec.CH
+        self.lang_type = lang_type
         self.font_path = None
diff --git a/web/src/lib/components/admin-settings/MachineLearningSettings.svelte b/web/src/lib/components/admin-settings/MachineLearningSettings.svelte
index 7649ee8d17..e05b5088a4 100644
--- a/web/src/lib/components/admin-settings/MachineLearningSettings.svelte
+++ b/web/src/lib/components/admin-settings/MachineLearningSettings.svelte
@@ -275,8 +275,14 @@
             name="ocr-model"
             bind:value={config.machineLearning.ocr.modelName}
             options={[
-              { value: 'PP-OCRv5_server', text: 'PP-OCRv5_server' },
-              { value: 'PP-OCRv5_mobile', text: 'PP-OCRv5_mobile' },
+              { text: 'PP-OCRv5_server (Chinese, Japanese and English)', value: 'PP-OCRv5_server' },
+              { text: 'PP-OCRv5_mobile (Chinese, Japanese and English)', value: 'PP-OCRv5_mobile' },
+              { text: 'PP-OCRv5_mobile (English-only)', value: 'EN__PP-OCRv5_mobile' },
+              { text: 'PP-OCRv5_mobile (Greek and English)', value: 'EL__PP-OCRv5_mobile' },
+              { text: 'PP-OCRv5_mobile (Korean and English)', value: 'KOREAN__PP-OCRv5_mobile' },
+              { text: 'PP-OCRv5_mobile (Latin script languages)', value: 'LATIN__PP-OCRv5_mobile' },
+              { text: 'PP-OCRv5_mobile (Russian, Belarusian, Ukrainian and English)', value: 'ESLAV__PP-OCRv5_mobile' },
+              { text: 'PP-OCRv5_mobile (Thai and English)', value: 'TH__PP-OCRv5_mobile' },
             ]}
             disabled={disabled || !config.machineLearning.enabled || !config.machineLearning.ocr.enabled}
             isEdited={config.machineLearning.ocr.modelName !== savedConfig.machineLearning.ocr.modelName}

From 93ab42fa24b0458ece0cb88c8340a04145c26815 Mon Sep 17 00:00:00 2001
From: fabianbees <fabianbees@web.de>
Date: Fri, 7 Nov 2025 18:10:59 +0100
Subject: [PATCH 44/84] feat(mobile): Show lens model information in the asset
 viewer detail panel  (#23601)

* feat(mobile): add lens info to details bottom sheet

* fix unrelated typo

* order same like in web app: first exposure time, than iso
---
 .../asset_viewer/bottom_sheet.widget.dart     | 41 +++++++++++++------
 1 file changed, 29 insertions(+), 12 deletions(-)

diff --git a/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet.widget.dart b/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet.widget.dart
index 9271c99ae9..d29e09a247 100644
--- a/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet.widget.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/bottom_sheet.widget.dart
@@ -127,13 +127,18 @@ class _AssetDetailBottomSheet extends ConsumerWidget {
     if (exifInfo == null) {
       return null;
     }
-
-    final fNumber = exifInfo.fNumber.isNotEmpty ? 'ƒ/${exifInfo.fNumber}' : null;
     final exposureTime = exifInfo.exposureTime.isNotEmpty ? exifInfo.exposureTime : null;
-    final focalLength = exifInfo.focalLength.isNotEmpty ? '${exifInfo.focalLength} mm' : null;
     final iso = exifInfo.iso != null ? 'ISO ${exifInfo.iso}' : null;
+    return [exposureTime, iso].where((spec) => spec != null && spec.isNotEmpty).join(_kSeparator);
+  }
 
-    return [fNumber, exposureTime, focalLength, iso].where((spec) => spec != null && spec.isNotEmpty).join(_kSeparator);
+  String? _getLensInfoSubtitle(ExifInfo? exifInfo) {
+    if (exifInfo == null) {
+      return null;
+    }
+    final fNumber = exifInfo.fNumber.isNotEmpty ? 'ƒ/${exifInfo.fNumber}' : null;
+    final focalLength = exifInfo.focalLength.isNotEmpty ? '${exifInfo.focalLength} mm' : null;
+    return [fNumber, focalLength].where((spec) => spec != null && spec.isNotEmpty).join(_kSeparator);
   }
 
   Future<void> _editDateTime(BuildContext context, WidgetRef ref) async {
@@ -141,20 +146,20 @@ class _AssetDetailBottomSheet extends ConsumerWidget {
   }
 
   Widget _buildAppearsInList(WidgetRef ref, BuildContext context) {
-    final aseet = ref.watch(currentAssetNotifier);
-    if (aseet == null) {
+    final asset = ref.watch(currentAssetNotifier);
+    if (asset == null) {
       return const SizedBox.shrink();
     }
 
-    if (!aseet.hasRemote) {
+    if (!asset.hasRemote) {
       return const SizedBox.shrink();
     }
 
     String? remoteAssetId;
-    if (aseet is RemoteAsset) {
-      remoteAssetId = aseet.id;
-    } else if (aseet is LocalAsset) {
-      remoteAssetId = aseet.remoteAssetId;
+    if (asset is RemoteAsset) {
+      remoteAssetId = asset.id;
+    } else if (asset is LocalAsset) {
+      remoteAssetId = asset.remoteAssetId;
     }
 
     if (remoteAssetId == null) {
@@ -217,6 +222,7 @@ class _AssetDetailBottomSheet extends ConsumerWidget {
 
     final exifInfo = ref.watch(currentAssetExifProvider).valueOrNull;
     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);
 
     // Build file info tile based on asset type
@@ -287,12 +293,23 @@ class _AssetDetailBottomSheet extends ConsumerWidget {
           _SheetTile(
             title: cameraTitle,
             titleStyle: context.textTheme.labelLarge,
-            leading: Icon(Icons.camera_outlined, size: 24, color: context.textTheme.labelLarge?.color),
+            leading: Icon(Icons.camera_alt_outlined, size: 24, color: context.textTheme.labelLarge?.color),
             subtitle: _getCameraInfoSubtitle(exifInfo),
             subtitleStyle: context.textTheme.bodyMedium?.copyWith(
               color: context.textTheme.bodyMedium?.color?.withAlpha(155),
             ),
           ),
+        // Lens info
+        if (lensTitle != null)
+          _SheetTile(
+            title: lensTitle,
+            titleStyle: context.textTheme.labelLarge,
+            leading: Icon(Icons.camera_outlined, size: 24, color: context.textTheme.labelLarge?.color),
+            subtitle: _getLensInfoSubtitle(exifInfo),
+            subtitleStyle: context.textTheme.bodyMedium?.copyWith(
+              color: context.textTheme.bodyMedium?.color?.withAlpha(155),
+            ),
+          ),
         // Appears in (Albums)
         _buildAppearsInList(ref, context),
         // padding at the bottom to avoid cut-off

From c935ae47d0b1576c080b6f5c61d27aa73da874bf Mon Sep 17 00:00:00 2001
From: Lukas <lukas@slucky.de>
Date: Fri, 7 Nov 2025 21:22:02 +0100
Subject: [PATCH 45/84] feat: lazy load thumbnails on people and place list
 (#23682)

perf(web): lazy load thumbnails on people and place list
---
 web/src/lib/components/assets/thumbnail/image-thumbnail.svelte | 3 +++
 .../lib/components/faces-page/manage-people-visibility.svelte  | 1 +
 web/src/lib/components/faces-page/people-card.svelte           | 1 +
 web/src/lib/components/places-page/places-card-group.svelte    | 1 +
 4 files changed, 6 insertions(+)

diff --git a/web/src/lib/components/assets/thumbnail/image-thumbnail.svelte b/web/src/lib/components/assets/thumbnail/image-thumbnail.svelte
index d73e9b8218..2b55ea57b2 100644
--- a/web/src/lib/components/assets/thumbnail/image-thumbnail.svelte
+++ b/web/src/lib/components/assets/thumbnail/image-thumbnail.svelte
@@ -20,6 +20,7 @@
     hiddenIconClass?: string;
     class?: ClassValue;
     brokenAssetClass?: ClassValue;
+    preload?: boolean;
     onComplete?: ((errored: boolean) => void) | undefined;
   }
 
@@ -38,6 +39,7 @@
     onComplete = undefined,
     class: imageClass = '',
     brokenAssetClass = '',
+    preload = true,
   }: Props = $props();
 
   let loaded = $state(false);
@@ -92,6 +94,7 @@
     {title}
     class={['object-cover', optionalClasses, imageClass]}
     draggable="false"
+    loading={preload ? 'eager' : 'lazy'}
   />
 {/if}
 
diff --git a/web/src/lib/components/faces-page/manage-people-visibility.svelte b/web/src/lib/components/faces-page/manage-people-visibility.svelte
index 8a3dcd98df..5771766f64 100644
--- a/web/src/lib/components/faces-page/manage-people-visibility.svelte
+++ b/web/src/lib/components/faces-page/manage-people-visibility.svelte
@@ -157,6 +157,7 @@
           altText={person.name}
           widthStyle="100%"
           hiddenIconClass="text-white group-hover:text-black transition-colors"
+          preload={false}
         />
         {#if person.name}
           <span class="absolute bottom-2 start-0 w-full select-text px-1 text-center font-medium text-white">
diff --git a/web/src/lib/components/faces-page/people-card.svelte b/web/src/lib/components/faces-page/people-card.svelte
index 3d865223ca..e18109de0d 100644
--- a/web/src/lib/components/faces-page/people-card.svelte
+++ b/web/src/lib/components/faces-page/people-card.svelte
@@ -52,6 +52,7 @@
         title={person.name}
         widthStyle="100%"
         circle
+        preload={false}
       />
       {#if person.isFavorite}
         <div class="absolute top-4 start-4">
diff --git a/web/src/lib/components/places-page/places-card-group.svelte b/web/src/lib/components/places-page/places-card-group.svelte
index 2e918b79ff..19e230d695 100644
--- a/web/src/lib/components/places-page/places-card-group.svelte
+++ b/web/src/lib/components/places-page/places-card-group.svelte
@@ -49,6 +49,7 @@
               src={getAssetThumbnailUrl({ id: item.id, size: AssetMediaSize.Thumbnail })}
               alt={city}
               class="object-cover w-39 h-39"
+              loading="lazy"
             />
           </div>
           <span

From 853d19dc2dcfb871edc03860ecc94aadad3b478a Mon Sep 17 00:00:00 2001
From: Noel S <noelsteves02@gmail.com>
Date: Fri, 7 Nov 2025 15:13:43 -0800
Subject: [PATCH 46/84] fix(mobile): Add fade-in to asset viewer transition
 (#23692)

Add fade-in animation
---
 mobile/lib/routing/router.dart | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mobile/lib/routing/router.dart b/mobile/lib/routing/router.dart
index 5c0299c414..abe7ac3fa2 100644
--- a/mobile/lib/routing/router.dart
+++ b/mobile/lib/routing/router.dart
@@ -313,6 +313,7 @@ class AppRouter extends RootStackRouter {
           settings: page,
           pageBuilder: (_, __, ___) => child,
           opaque: false,
+          transitionsBuilder: TransitionsBuilders.fadeIn,
         ),
       ),
     ),

From 4905bba69404098c538e5e708777f6a45753a964 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 8 Nov 2025 13:48:35 -0600
Subject: [PATCH 47/84] chore(deps): update base-image to v202511041104 (major)
 (#23718)

chore(deps): update base-image to v202511041104

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 server/Dockerfile     | 4 ++--
 server/Dockerfile.dev | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/server/Dockerfile b/server/Dockerfile
index 54077d80ce..0fc4126926 100644
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/immich-app/base-server-dev:202510281104@sha256:e2f94c2e92cbae5982b014e610ff29731c0fbcb4bf69022c7fe27594e40c9f83 AS builder
+FROM ghcr.io/immich-app/base-server-dev:202511041104@sha256:7558931a4a71989e7fd9fa3e1ba6c28da15891867310edda8c58236171839f2f AS builder
 ENV COREPACK_ENABLE_DOWNLOAD_PROMPT=0 \
   CI=1 \
   COREPACK_HOME=/tmp \
@@ -48,7 +48,7 @@ RUN --mount=type=cache,id=pnpm-cli,target=/buildcache/pnpm-store \
   pnpm --filter @immich/sdk --filter @immich/cli build && \
   pnpm --filter @immich/cli --prod --no-optional deploy /output/cli-pruned
 
-FROM ghcr.io/immich-app/base-server-prod:202510281104@sha256:84f8f3eb4cfafc5e624235f7db703e1222fd60831bef1d488d8d8cad2be5023d
+FROM ghcr.io/immich-app/base-server-prod:202511041104@sha256:57c0379977fd5521d83cdf661aecd1497c83a9a661ebafe0a5243a09fc1064cb
 
 WORKDIR /usr/src/app
 ENV NODE_ENV=production \
diff --git a/server/Dockerfile.dev b/server/Dockerfile.dev
index 93a4f197ea..133b8a835d 100644
--- a/server/Dockerfile.dev
+++ b/server/Dockerfile.dev
@@ -1,5 +1,5 @@
 # dev build
-FROM ghcr.io/immich-app/base-server-dev:202510281104@sha256:e2f94c2e92cbae5982b014e610ff29731c0fbcb4bf69022c7fe27594e40c9f83 AS dev
+FROM ghcr.io/immich-app/base-server-dev:202511041104@sha256:7558931a4a71989e7fd9fa3e1ba6c28da15891867310edda8c58236171839f2f AS dev
 
 ENV COREPACK_ENABLE_DOWNLOAD_PROMPT=0 \
   CI=1 \

From 9cc88ed2a6df8dbd3cda2f6d38c2a03524761023 Mon Sep 17 00:00:00 2001
From: Mees Frensel <33722705+meesfrensel@users.noreply.github.com>
Date: Sat, 8 Nov 2025 23:46:43 +0100
Subject: [PATCH 48/84] feat: make memories slideshow duration configurable
 (#22783)

---
 i18n/en.json                                  |  1 +
 .../openapi/lib/model/memories_response.dart  | 10 +++++++++-
 mobile/openapi/lib/model/memories_update.dart | 20 ++++++++++++++++++-
 open-api/immich-openapi-specs.json            |  9 +++++++++
 open-api/typescript-sdk/src/fetch-client.ts   |  2 ++
 server/src/dtos/user-preferences.dto.ts       |  9 +++++++++
 server/src/types.ts                           |  1 +
 server/src/utils/preferences.ts               |  1 +
 .../memory-page/memory-viewer.svelte          |  2 +-
 .../feature-settings.svelte                   | 13 +++++++++++-
 .../factories/preferences-factory.ts          |  1 +
 11 files changed, 65 insertions(+), 4 deletions(-)

diff --git a/i18n/en.json b/i18n/en.json
index 30c8949aef..735e942dda 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -2027,6 +2027,7 @@
   "third_party_resources": "Third-Party Resources",
   "time": "Time",
   "time_based_memories": "Time-based memories",
+  "time_based_memories_duration": "Number of seconds to display each image.",
   "timeline": "Timeline",
   "timezone": "Timezone",
   "to_archive": "Archive",
diff --git a/mobile/openapi/lib/model/memories_response.dart b/mobile/openapi/lib/model/memories_response.dart
index b9f8b5d8b1..cb42f596a6 100644
--- a/mobile/openapi/lib/model/memories_response.dart
+++ b/mobile/openapi/lib/model/memories_response.dart
@@ -13,25 +13,31 @@ part of openapi.api;
 class MemoriesResponse {
   /// Returns a new [MemoriesResponse] instance.
   MemoriesResponse({
+    this.duration = 5,
     this.enabled = true,
   });
 
+  int duration;
+
   bool enabled;
 
   @override
   bool operator ==(Object other) => identical(this, other) || other is MemoriesResponse &&
+    other.duration == duration &&
     other.enabled == enabled;
 
   @override
   int get hashCode =>
     // ignore: unnecessary_parenthesis
+    (duration.hashCode) +
     (enabled.hashCode);
 
   @override
-  String toString() => 'MemoriesResponse[enabled=$enabled]';
+  String toString() => 'MemoriesResponse[duration=$duration, enabled=$enabled]';
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
+      json[r'duration'] = this.duration;
       json[r'enabled'] = this.enabled;
     return json;
   }
@@ -45,6 +51,7 @@ class MemoriesResponse {
       final json = value.cast<String, dynamic>();
 
       return MemoriesResponse(
+        duration: mapValueOfType<int>(json, r'duration')!,
         enabled: mapValueOfType<bool>(json, r'enabled')!,
       );
     }
@@ -93,6 +100,7 @@ class MemoriesResponse {
 
   /// The list of required keys that must be present in a JSON.
   static const requiredKeys = <String>{
+    'duration',
     'enabled',
   };
 }
diff --git a/mobile/openapi/lib/model/memories_update.dart b/mobile/openapi/lib/model/memories_update.dart
index 71efd71ae7..39c46ffd2f 100644
--- a/mobile/openapi/lib/model/memories_update.dart
+++ b/mobile/openapi/lib/model/memories_update.dart
@@ -13,9 +13,19 @@ part of openapi.api;
 class MemoriesUpdate {
   /// Returns a new [MemoriesUpdate] instance.
   MemoriesUpdate({
+    this.duration,
     this.enabled,
   });
 
+  /// Minimum value: 1
+  ///
+  /// Please note: This property should have been non-nullable! Since the specification file
+  /// does not include a default value (using the "default:" property), however, the generated
+  /// source code must fall back to having a nullable type.
+  /// Consider adding a "default:" property in the specification file to hide this note.
+  ///
+  int? duration;
+
   ///
   /// Please note: This property should have been non-nullable! Since the specification file
   /// does not include a default value (using the "default:" property), however, the generated
@@ -26,18 +36,25 @@ class MemoriesUpdate {
 
   @override
   bool operator ==(Object other) => identical(this, other) || other is MemoriesUpdate &&
+    other.duration == duration &&
     other.enabled == enabled;
 
   @override
   int get hashCode =>
     // ignore: unnecessary_parenthesis
+    (duration == null ? 0 : duration!.hashCode) +
     (enabled == null ? 0 : enabled!.hashCode);
 
   @override
-  String toString() => 'MemoriesUpdate[enabled=$enabled]';
+  String toString() => 'MemoriesUpdate[duration=$duration, enabled=$enabled]';
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
+    if (this.duration != null) {
+      json[r'duration'] = this.duration;
+    } else {
+    //  json[r'duration'] = null;
+    }
     if (this.enabled != null) {
       json[r'enabled'] = this.enabled;
     } else {
@@ -55,6 +72,7 @@ class MemoriesUpdate {
       final json = value.cast<String, dynamic>();
 
       return MemoriesUpdate(
+        duration: mapValueOfType<int>(json, r'duration'),
         enabled: mapValueOfType<bool>(json, r'enabled'),
       );
     }
diff --git a/open-api/immich-openapi-specs.json b/open-api/immich-openapi-specs.json
index d16e4c4e10..6076b43bfd 100644
--- a/open-api/immich-openapi-specs.json
+++ b/open-api/immich-openapi-specs.json
@@ -12646,18 +12646,27 @@
       },
       "MemoriesResponse": {
         "properties": {
+          "duration": {
+            "default": 5,
+            "type": "integer"
+          },
           "enabled": {
             "default": true,
             "type": "boolean"
           }
         },
         "required": [
+          "duration",
           "enabled"
         ],
         "type": "object"
       },
       "MemoriesUpdate": {
         "properties": {
+          "duration": {
+            "minimum": 1,
+            "type": "integer"
+          },
           "enabled": {
             "type": "boolean"
           }
diff --git a/open-api/typescript-sdk/src/fetch-client.ts b/open-api/typescript-sdk/src/fetch-client.ts
index 435e10046a..1ed65e4f25 100644
--- a/open-api/typescript-sdk/src/fetch-client.ts
+++ b/open-api/typescript-sdk/src/fetch-client.ts
@@ -152,6 +152,7 @@ export type FoldersResponse = {
     sidebarWeb: boolean;
 };
 export type MemoriesResponse = {
+    duration: number;
     enabled: boolean;
 };
 export type PeopleResponse = {
@@ -209,6 +210,7 @@ export type FoldersUpdate = {
     sidebarWeb?: boolean;
 };
 export type MemoriesUpdate = {
+    duration?: number;
     enabled?: boolean;
 };
 export type PeopleUpdate = {
diff --git a/server/src/dtos/user-preferences.dto.ts b/server/src/dtos/user-preferences.dto.ts
index b258158ae2..452384b423 100644
--- a/server/src/dtos/user-preferences.dto.ts
+++ b/server/src/dtos/user-preferences.dto.ts
@@ -13,6 +13,12 @@ class AvatarUpdate {
 class MemoriesUpdate {
   @ValidateBoolean({ optional: true })
   enabled?: boolean;
+
+  @Optional()
+  @IsInt()
+  @IsPositive()
+  @ApiProperty({ type: 'integer' })
+  duration?: number;
 }
 
 class RatingsUpdate {
@@ -166,6 +172,9 @@ class RatingsResponse {
 
 class MemoriesResponse {
   enabled: boolean = true;
+
+  @ApiProperty({ type: 'integer' })
+  duration: number = 5;
 }
 
 class FoldersResponse {
diff --git a/server/src/types.ts b/server/src/types.ts
index 66045521d0..0a2dd46d7f 100644
--- a/server/src/types.ts
+++ b/server/src/types.ts
@@ -497,6 +497,7 @@ export interface UserPreferences {
   };
   memories: {
     enabled: boolean;
+    duration: number;
   };
   people: {
     enabled: boolean;
diff --git a/server/src/utils/preferences.ts b/server/src/utils/preferences.ts
index 121bf2826d..b25369670a 100644
--- a/server/src/utils/preferences.ts
+++ b/server/src/utils/preferences.ts
@@ -16,6 +16,7 @@ const getDefaultPreferences = (): UserPreferences => {
     },
     memories: {
       enabled: true,
+      duration: 5,
     },
     people: {
       enabled: true,
diff --git a/web/src/lib/components/memory-page/memory-viewer.svelte b/web/src/lib/components/memory-page/memory-viewer.svelte
index fe3569f916..cfe11e1026 100644
--- a/web/src/lib/components/memory-page/memory-viewer.svelte
+++ b/web/src/lib/components/memory-page/memory-viewer.svelte
@@ -102,7 +102,7 @@
       });
     } else {
       progressBarController = new Tween<number>(0, {
-        duration: (from: number, to: number) => (to ? 5000 * (to - from) : 0),
+        duration: (from: number, to: number) => (to ? $preferences.memories.duration * 1000 * (to - from) : 0),
       });
     }
   };
diff --git a/web/src/lib/components/user-settings-page/feature-settings.svelte b/web/src/lib/components/user-settings-page/feature-settings.svelte
index 31a29be975..82a40161b5 100644
--- a/web/src/lib/components/user-settings-page/feature-settings.svelte
+++ b/web/src/lib/components/user-settings-page/feature-settings.svelte
@@ -1,7 +1,9 @@
 <script lang="ts">
   import SettingAccordion from '$lib/components/shared-components/settings/setting-accordion.svelte';
+  import SettingInputField from '$lib/components/shared-components/settings/setting-input-field.svelte';
   import SettingSelect from '$lib/components/shared-components/settings/setting-select.svelte';
   import SettingSwitch from '$lib/components/shared-components/settings/setting-switch.svelte';
+  import { SettingInputFieldType } from '$lib/constants';
   import { preferences } from '$lib/stores/user.store';
   import { handleError } from '$lib/utils/handle-error';
   import { AssetOrder, updateMyPreferences } from '@immich/sdk';
@@ -18,6 +20,7 @@
 
   // Memories
   let memoriesEnabled = $state($preferences?.memories?.enabled ?? true);
+  let memoriesDuration = $state($preferences?.memories?.duration ?? 5);
 
   // People
   let peopleEnabled = $state($preferences?.people?.enabled ?? false);
@@ -43,7 +46,7 @@
         userPreferencesUpdateDto: {
           albums: { defaultAssetOrder },
           folders: { enabled: foldersEnabled, sidebarWeb: foldersSidebar },
-          memories: { enabled: memoriesEnabled },
+          memories: { enabled: memoriesEnabled, duration: memoriesDuration },
           people: { enabled: peopleEnabled, sidebarWeb: peopleSidebar },
           ratings: { enabled: ratingsEnabled },
           sharedLinks: { enabled: sharedLinksEnabled, sidebarWeb: sharedLinkSidebar },
@@ -103,6 +106,14 @@
           <div class="ms-4 mt-6">
             <SettingSwitch title={$t('enable')} bind:checked={memoriesEnabled} />
           </div>
+          <div class="ms-4 mt-6">
+            <SettingInputField
+              inputType={SettingInputFieldType.NUMBER}
+              label={$t('duration')}
+              description={$t('time_based_memories_duration')}
+              bind:value={memoriesDuration}
+            />
+          </div>
         </SettingAccordion>
 
         <SettingAccordion key="people" title={$t('people')} subtitle={$t('people_feature_description')}>
diff --git a/web/src/test-data/factories/preferences-factory.ts b/web/src/test-data/factories/preferences-factory.ts
index e7d556b00b..f8ab8615bf 100644
--- a/web/src/test-data/factories/preferences-factory.ts
+++ b/web/src/test-data/factories/preferences-factory.ts
@@ -23,6 +23,7 @@ export const preferencesFactory = Sync.makeFactory<UserPreferencesResponseDto>({
   },
   memories: {
     enabled: false,
+    duration: 5,
   },
   people: {
     enabled: false,

From 6c6b00067bc8930b03fef9388c2c4672924eed05 Mon Sep 17 00:00:00 2001
From: Mees Frensel <33722705+meesfrensel@users.noreply.github.com>
Date: Mon, 10 Nov 2025 13:48:17 +0100
Subject: [PATCH 49/84] fix(web): i18n for admin>users>sessions (#23756)

---
 i18n/en.json                                 | 1 +
 web/src/routes/admin/users/[id]/+page.svelte | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/i18n/en.json b/i18n/en.json
index 735e942dda..a83cb07d62 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1421,6 +1421,7 @@
   "no_cast_devices_found": "No cast devices found",
   "no_checksum_local": "No checksum available - cannot fetch local assets",
   "no_checksum_remote": "No checksum available - cannot fetch remote asset",
+  "no_devices": "No authorized devices",
   "no_duplicates_found": "No duplicates were found.",
   "no_exif_info_available": "No exif info available",
   "no_explore_results_message": "Upload more photos to explore your collection.",
diff --git a/web/src/routes/admin/users/[id]/+page.svelte b/web/src/routes/admin/users/[id]/+page.svelte
index 1414bfbf89..79c663af39 100644
--- a/web/src/routes/admin/users/[id]/+page.svelte
+++ b/web/src/routes/admin/users/[id]/+page.svelte
@@ -34,12 +34,12 @@
   } from '@immich/ui';
   import {
     mdiAccountOutline,
-    mdiAppsBox,
     mdiCameraIris,
     mdiChartPie,
     mdiChartPieOutline,
     mdiCheckCircle,
     mdiDeleteRestore,
+    mdiDevices,
     mdiFeatureSearchOutline,
     mdiLockSmart,
     mdiOnepassword,
@@ -350,8 +350,8 @@
         <Card color="secondary">
           <CardHeader>
             <div class="flex items-center gap-2 px-4 py-2 text-primary">
-              <Icon icon={mdiAppsBox} size="1.5rem" />
-              <CardTitle>Sessions</CardTitle>
+              <Icon icon={mdiDevices} size="1.5rem" />
+              <CardTitle>{$t('authorized_devices')}</CardTitle>
             </div>
           </CardHeader>
           <CardBody>
@@ -360,7 +360,7 @@
                 {#each userSessions as session (session.id)}
                   <DeviceCard {session} />
                 {:else}
-                  <span class="text-dark">No mobile devices</span>
+                  <span class="text-dark">{$t('no_devices')}</span>
                 {/each}
               </Stack>
             </div>

From d92df63f844fdff7501acf9161c293e45d92df4c Mon Sep 17 00:00:00 2001
From: Jonathan Gilbert <jpg@trillica.com>
Date: Tue, 11 Nov 2025 01:38:50 +1100
Subject: [PATCH 50/84] feat: random memories sort order (#20025)

---
 mobile/openapi/README.md                      |  1 +
 mobile/openapi/lib/api.dart                   |  1 +
 mobile/openapi/lib/api/memories_api.dart      | 44 ++++++++--
 mobile/openapi/lib/api_client.dart            |  2 +
 mobile/openapi/lib/api_helper.dart            |  3 +
 .../lib/model/memory_search_order.dart        | 88 +++++++++++++++++++
 open-api/immich-openapi-specs.json            | 44 ++++++++++
 open-api/typescript-sdk/src/fetch-client.ts   | 17 +++-
 server/src/dtos/memory.dto.ts                 | 11 ++-
 server/src/enum.ts                            |  8 ++
 server/src/repositories/memory.repository.ts  | 11 ++-
 11 files changed, 218 insertions(+), 12 deletions(-)
 create mode 100644 mobile/openapi/lib/model/memory_search_order.dart

diff --git a/mobile/openapi/README.md b/mobile/openapi/README.md
index 85ec031736..33ccadba7e 100644
--- a/mobile/openapi/README.md
+++ b/mobile/openapi/README.md
@@ -407,6 +407,7 @@ Class | Method | HTTP request | Description
  - [MemoriesUpdate](doc//MemoriesUpdate.md)
  - [MemoryCreateDto](doc//MemoryCreateDto.md)
  - [MemoryResponseDto](doc//MemoryResponseDto.md)
+ - [MemorySearchOrder](doc//MemorySearchOrder.md)
  - [MemoryStatisticsResponseDto](doc//MemoryStatisticsResponseDto.md)
  - [MemoryType](doc//MemoryType.md)
  - [MemoryUpdateDto](doc//MemoryUpdateDto.md)
diff --git a/mobile/openapi/lib/api.dart b/mobile/openapi/lib/api.dart
index ab88670bcd..a4b58763c1 100644
--- a/mobile/openapi/lib/api.dart
+++ b/mobile/openapi/lib/api.dart
@@ -175,6 +175,7 @@ part 'model/memories_response.dart';
 part 'model/memories_update.dart';
 part 'model/memory_create_dto.dart';
 part 'model/memory_response_dto.dart';
+part 'model/memory_search_order.dart';
 part 'model/memory_statistics_response_dto.dart';
 part 'model/memory_type.dart';
 part 'model/memory_update_dto.dart';
diff --git a/mobile/openapi/lib/api/memories_api.dart b/mobile/openapi/lib/api/memories_api.dart
index f9280101e6..9916029e0b 100644
--- a/mobile/openapi/lib/api/memories_api.dart
+++ b/mobile/openapi/lib/api/memories_api.dart
@@ -238,8 +238,13 @@ class MemoriesApi {
   ///
   /// * [bool] isTrashed:
   ///
+  /// * [MemorySearchOrder] order:
+  ///
+  /// * [int] size:
+  ///   Number of memories to return
+  ///
   /// * [MemoryType] type:
-  Future<Response> memoriesStatisticsWithHttpInfo({ DateTime? for_, bool? isSaved, bool? isTrashed, MemoryType? type, }) async {
+  Future<Response> memoriesStatisticsWithHttpInfo({ DateTime? for_, bool? isSaved, bool? isTrashed, MemorySearchOrder? order, int? size, MemoryType? type, }) async {
     // ignore: prefer_const_declarations
     final apiPath = r'/memories/statistics';
 
@@ -259,6 +264,12 @@ class MemoriesApi {
     if (isTrashed != null) {
       queryParams.addAll(_queryParams('', 'isTrashed', isTrashed));
     }
+    if (order != null) {
+      queryParams.addAll(_queryParams('', 'order', order));
+    }
+    if (size != null) {
+      queryParams.addAll(_queryParams('', 'size', size));
+    }
     if (type != null) {
       queryParams.addAll(_queryParams('', 'type', type));
     }
@@ -287,9 +298,14 @@ class MemoriesApi {
   ///
   /// * [bool] isTrashed:
   ///
+  /// * [MemorySearchOrder] order:
+  ///
+  /// * [int] size:
+  ///   Number of memories to return
+  ///
   /// * [MemoryType] type:
-  Future<MemoryStatisticsResponseDto?> memoriesStatistics({ DateTime? for_, bool? isSaved, bool? isTrashed, MemoryType? type, }) async {
-    final response = await memoriesStatisticsWithHttpInfo( for_: for_, isSaved: isSaved, isTrashed: isTrashed, type: type, );
+  Future<MemoryStatisticsResponseDto?> memoriesStatistics({ DateTime? for_, bool? isSaved, bool? isTrashed, MemorySearchOrder? order, int? size, MemoryType? type, }) async {
+    final response = await memoriesStatisticsWithHttpInfo( for_: for_, isSaved: isSaved, isTrashed: isTrashed, order: order, size: size, type: type, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -375,8 +391,13 @@ class MemoriesApi {
   ///
   /// * [bool] isTrashed:
   ///
+  /// * [MemorySearchOrder] order:
+  ///
+  /// * [int] size:
+  ///   Number of memories to return
+  ///
   /// * [MemoryType] type:
-  Future<Response> searchMemoriesWithHttpInfo({ DateTime? for_, bool? isSaved, bool? isTrashed, MemoryType? type, }) async {
+  Future<Response> searchMemoriesWithHttpInfo({ DateTime? for_, bool? isSaved, bool? isTrashed, MemorySearchOrder? order, int? size, MemoryType? type, }) async {
     // ignore: prefer_const_declarations
     final apiPath = r'/memories';
 
@@ -396,6 +417,12 @@ class MemoriesApi {
     if (isTrashed != null) {
       queryParams.addAll(_queryParams('', 'isTrashed', isTrashed));
     }
+    if (order != null) {
+      queryParams.addAll(_queryParams('', 'order', order));
+    }
+    if (size != null) {
+      queryParams.addAll(_queryParams('', 'size', size));
+    }
     if (type != null) {
       queryParams.addAll(_queryParams('', 'type', type));
     }
@@ -424,9 +451,14 @@ class MemoriesApi {
   ///
   /// * [bool] isTrashed:
   ///
+  /// * [MemorySearchOrder] order:
+  ///
+  /// * [int] size:
+  ///   Number of memories to return
+  ///
   /// * [MemoryType] type:
-  Future<List<MemoryResponseDto>?> searchMemories({ DateTime? for_, bool? isSaved, bool? isTrashed, MemoryType? type, }) async {
-    final response = await searchMemoriesWithHttpInfo( for_: for_, isSaved: isSaved, isTrashed: isTrashed, type: type, );
+  Future<List<MemoryResponseDto>?> searchMemories({ DateTime? for_, bool? isSaved, bool? isTrashed, MemorySearchOrder? order, int? size, MemoryType? type, }) async {
+    final response = await searchMemoriesWithHttpInfo( for_: for_, isSaved: isSaved, isTrashed: isTrashed, order: order, size: size, type: type, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
diff --git a/mobile/openapi/lib/api_client.dart b/mobile/openapi/lib/api_client.dart
index 5139c5cf62..cf6784fb83 100644
--- a/mobile/openapi/lib/api_client.dart
+++ b/mobile/openapi/lib/api_client.dart
@@ -404,6 +404,8 @@ class ApiClient {
           return MemoryCreateDto.fromJson(value);
         case 'MemoryResponseDto':
           return MemoryResponseDto.fromJson(value);
+        case 'MemorySearchOrder':
+          return MemorySearchOrderTypeTransformer().decode(value);
         case 'MemoryStatisticsResponseDto':
           return MemoryStatisticsResponseDto.fromJson(value);
         case 'MemoryType':
diff --git a/mobile/openapi/lib/api_helper.dart b/mobile/openapi/lib/api_helper.dart
index b34e9210c8..1d197a8f91 100644
--- a/mobile/openapi/lib/api_helper.dart
+++ b/mobile/openapi/lib/api_helper.dart
@@ -106,6 +106,9 @@ String parameterToString(dynamic value) {
   if (value is ManualJobName) {
     return ManualJobNameTypeTransformer().encode(value).toString();
   }
+  if (value is MemorySearchOrder) {
+    return MemorySearchOrderTypeTransformer().encode(value).toString();
+  }
   if (value is MemoryType) {
     return MemoryTypeTypeTransformer().encode(value).toString();
   }
diff --git a/mobile/openapi/lib/model/memory_search_order.dart b/mobile/openapi/lib/model/memory_search_order.dart
new file mode 100644
index 0000000000..bdf5b59894
--- /dev/null
+++ b/mobile/openapi/lib/model/memory_search_order.dart
@@ -0,0 +1,88 @@
+//
+// AUTO-GENERATED FILE, DO NOT MODIFY!
+//
+// @dart=2.18
+
+// ignore_for_file: unused_element, unused_import
+// ignore_for_file: always_put_required_named_parameters_first
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: lines_longer_than_80_chars
+
+part of openapi.api;
+
+
+class MemorySearchOrder {
+  /// Instantiate a new enum with the provided [value].
+  const MemorySearchOrder._(this.value);
+
+  /// The underlying value of this enum member.
+  final String value;
+
+  @override
+  String toString() => value;
+
+  String toJson() => value;
+
+  static const asc = MemorySearchOrder._(r'asc');
+  static const desc = MemorySearchOrder._(r'desc');
+  static const random = MemorySearchOrder._(r'random');
+
+  /// List of all possible values in this [enum][MemorySearchOrder].
+  static const values = <MemorySearchOrder>[
+    asc,
+    desc,
+    random,
+  ];
+
+  static MemorySearchOrder? fromJson(dynamic value) => MemorySearchOrderTypeTransformer().decode(value);
+
+  static List<MemorySearchOrder> listFromJson(dynamic json, {bool growable = false,}) {
+    final result = <MemorySearchOrder>[];
+    if (json is List && json.isNotEmpty) {
+      for (final row in json) {
+        final value = MemorySearchOrder.fromJson(row);
+        if (value != null) {
+          result.add(value);
+        }
+      }
+    }
+    return result.toList(growable: growable);
+  }
+}
+
+/// Transformation class that can [encode] an instance of [MemorySearchOrder] to String,
+/// and [decode] dynamic data back to [MemorySearchOrder].
+class MemorySearchOrderTypeTransformer {
+  factory MemorySearchOrderTypeTransformer() => _instance ??= const MemorySearchOrderTypeTransformer._();
+
+  const MemorySearchOrderTypeTransformer._();
+
+  String encode(MemorySearchOrder data) => data.value;
+
+  /// Decodes a [dynamic value][data] to a MemorySearchOrder.
+  ///
+  /// If [allowNull] is true and the [dynamic value][data] cannot be decoded successfully,
+  /// then null is returned. However, if [allowNull] is false and the [dynamic value][data]
+  /// cannot be decoded successfully, then an [UnimplementedError] is thrown.
+  ///
+  /// The [allowNull] is very handy when an API changes and a new enum value is added or removed,
+  /// and users are still using an old app with the old code.
+  MemorySearchOrder? decode(dynamic data, {bool allowNull = true}) {
+    if (data != null) {
+      switch (data) {
+        case r'asc': return MemorySearchOrder.asc;
+        case r'desc': return MemorySearchOrder.desc;
+        case r'random': return MemorySearchOrder.random;
+        default:
+          if (!allowNull) {
+            throw ArgumentError('Unknown enum value to decode: $data');
+          }
+      }
+    }
+    return null;
+  }
+
+  /// Singleton [MemorySearchOrderTypeTransformer] instance.
+  static MemorySearchOrderTypeTransformer? _instance;
+}
+
diff --git a/open-api/immich-openapi-specs.json b/open-api/immich-openapi-specs.json
index 6076b43bfd..ed3d7a0bab 100644
--- a/open-api/immich-openapi-specs.json
+++ b/open-api/immich-openapi-specs.json
@@ -4268,6 +4268,24 @@
               "type": "boolean"
             }
           },
+          {
+            "name": "order",
+            "required": false,
+            "in": "query",
+            "schema": {
+              "$ref": "#/components/schemas/MemorySearchOrder"
+            }
+          },
+          {
+            "name": "size",
+            "required": false,
+            "in": "query",
+            "description": "Number of memories to return",
+            "schema": {
+              "minimum": 1,
+              "type": "integer"
+            }
+          },
           {
             "name": "type",
             "required": false,
@@ -4381,6 +4399,24 @@
               "type": "boolean"
             }
           },
+          {
+            "name": "order",
+            "required": false,
+            "in": "query",
+            "schema": {
+              "$ref": "#/components/schemas/MemorySearchOrder"
+            }
+          },
+          {
+            "name": "size",
+            "required": false,
+            "in": "query",
+            "description": "Number of memories to return",
+            "schema": {
+              "minimum": 1,
+              "type": "integer"
+            }
+          },
           {
             "name": "type",
             "required": false,
@@ -12780,6 +12816,14 @@
         ],
         "type": "object"
       },
+      "MemorySearchOrder": {
+        "enum": [
+          "asc",
+          "desc",
+          "random"
+        ],
+        "type": "string"
+      },
       "MemoryStatisticsResponseDto": {
         "properties": {
           "total": {
diff --git a/open-api/typescript-sdk/src/fetch-client.ts b/open-api/typescript-sdk/src/fetch-client.ts
index 1ed65e4f25..a0f43c620b 100644
--- a/open-api/typescript-sdk/src/fetch-client.ts
+++ b/open-api/typescript-sdk/src/fetch-client.ts
@@ -2956,10 +2956,12 @@ export function reverseGeocode({ lat, lon }: {
 /**
  * This endpoint requires the `memory.read` permission.
  */
-export function searchMemories({ $for, isSaved, isTrashed, $type }: {
+export function searchMemories({ $for, isSaved, isTrashed, order, size, $type }: {
     $for?: string;
     isSaved?: boolean;
     isTrashed?: boolean;
+    order?: MemorySearchOrder;
+    size?: number;
     $type?: MemoryType;
 }, opts?: Oazapfts.RequestOpts) {
     return oazapfts.ok(oazapfts.fetchJson<{
@@ -2969,6 +2971,8 @@ export function searchMemories({ $for, isSaved, isTrashed, $type }: {
         "for": $for,
         isSaved,
         isTrashed,
+        order,
+        size,
         "type": $type
     }))}`, {
         ...opts
@@ -2992,10 +2996,12 @@ export function createMemory({ memoryCreateDto }: {
 /**
  * This endpoint requires the `memory.statistics` permission.
  */
-export function memoriesStatistics({ $for, isSaved, isTrashed, $type }: {
+export function memoriesStatistics({ $for, isSaved, isTrashed, order, size, $type }: {
     $for?: string;
     isSaved?: boolean;
     isTrashed?: boolean;
+    order?: MemorySearchOrder;
+    size?: number;
     $type?: MemoryType;
 }, opts?: Oazapfts.RequestOpts) {
     return oazapfts.ok(oazapfts.fetchJson<{
@@ -3005,6 +3011,8 @@ export function memoriesStatistics({ $for, isSaved, isTrashed, $type }: {
         "for": $for,
         isSaved,
         isTrashed,
+        order,
+        size,
         "type": $type
     }))}`, {
         ...opts
@@ -4991,6 +4999,11 @@ export enum JobCommand {
     Empty = "empty",
     ClearFailed = "clear-failed"
 }
+export enum MemorySearchOrder {
+    Asc = "asc",
+    Desc = "desc",
+    Random = "random"
+}
 export enum MemoryType {
     OnThisDay = "on_this_day"
 }
diff --git a/server/src/dtos/memory.dto.ts b/server/src/dtos/memory.dto.ts
index a79511c73e..8a86e66691 100644
--- a/server/src/dtos/memory.dto.ts
+++ b/server/src/dtos/memory.dto.ts
@@ -4,7 +4,7 @@ import { IsInt, IsObject, IsPositive, ValidateNested } from 'class-validator';
 import { Memory } from 'src/database';
 import { AssetResponseDto, mapAsset } from 'src/dtos/asset-response.dto';
 import { AuthDto } from 'src/dtos/auth.dto';
-import { MemoryType } from 'src/enum';
+import { AssetOrderWithRandom, MemoryType } from 'src/enum';
 import { ValidateBoolean, ValidateDate, ValidateEnum, ValidateUUID } from 'src/validation';
 
 class MemoryBaseDto {
@@ -27,6 +27,15 @@ export class MemorySearchDto {
 
   @ValidateBoolean({ optional: true })
   isSaved?: boolean;
+
+  @IsInt()
+  @IsPositive()
+  @Type(() => Number)
+  @ApiProperty({ type: 'integer', description: 'Number of memories to return' })
+  size?: number;
+
+  @ValidateEnum({ enum: AssetOrderWithRandom, name: 'MemorySearchOrder', optional: true })
+  order?: AssetOrderWithRandom;
 }
 
 class OnThisDayDto {
diff --git a/server/src/enum.ts b/server/src/enum.ts
index 0755f75f70..a98fee0117 100644
--- a/server/src/enum.ts
+++ b/server/src/enum.ts
@@ -71,6 +71,14 @@ export enum MemoryType {
   OnThisDay = 'on_this_day',
 }
 
+export enum AssetOrderWithRandom {
+  // Include existing values
+  Asc = AssetOrder.Asc,
+  Desc = AssetOrder.Desc,
+  /** Randomly Ordered */
+  Random = 'random',
+}
+
 export enum Permission {
   All = 'all',
 
diff --git a/server/src/repositories/memory.repository.ts b/server/src/repositories/memory.repository.ts
index c4a9144530..e62c083839 100644
--- a/server/src/repositories/memory.repository.ts
+++ b/server/src/repositories/memory.repository.ts
@@ -1,11 +1,11 @@
 import { Injectable } from '@nestjs/common';
-import { Insertable, Kysely, sql, Updateable } from 'kysely';
+import { Insertable, Kysely, OrderByDirection, sql, Updateable } from 'kysely';
 import { jsonArrayFrom } from 'kysely/helpers/postgres';
 import { DateTime } from 'luxon';
 import { InjectKysely } from 'nestjs-kysely';
 import { Chunked, ChunkedSet, DummyValue, GenerateSql } from 'src/decorators';
 import { MemorySearchDto } from 'src/dtos/memory.dto';
-import { AssetVisibility } from 'src/enum';
+import { AssetOrderWithRandom, AssetVisibility } from 'src/enum';
 import { DB } from 'src/schema';
 import { MemoryTable } from 'src/schema/tables/memory.table';
 import { IBulkAsset } from 'src/types';
@@ -72,7 +72,12 @@ export class MemoryRepository implements IBulkAsset {
         ).as('assets'),
       )
       .selectAll('memory')
-      .orderBy('memoryAt', 'desc')
+      .$call((qb) =>
+        dto.order === AssetOrderWithRandom.Random
+          ? qb.orderBy(sql`RANDOM()`)
+          : qb.orderBy('memoryAt', (dto.order?.toLowerCase() || 'desc') as OrderByDirection),
+      )
+      .$if(dto.size !== undefined, (qb) => qb.limit(dto.size!))
       .execute();
   }
 

From 8a73de018c804b4984408a79f2583452a0e75329 Mon Sep 17 00:00:00 2001
From: bo0tzz <git@bo0tzz.me>
Date: Mon, 10 Nov 2025 15:55:15 +0100
Subject: [PATCH 51/84] feat: mise monorepo tasks (#23691)

---
 .github/mise.toml    |  10 +
 cli/mise.toml        |  29 +++
 deployment/mise.toml |  20 ++
 docs/mise.toml       |  25 +++
 e2e/mise.toml        |  29 +++
 mise.toml            | 521 +------------------------------------------
 mobile/mise.toml     | 185 +++++++++++++++
 server/mise.toml     |  66 ++++++
 web/mise.toml        |  62 +++++
 9 files changed, 437 insertions(+), 510 deletions(-)
 create mode 100644 .github/mise.toml
 create mode 100644 cli/mise.toml
 create mode 100644 deployment/mise.toml
 create mode 100644 docs/mise.toml
 create mode 100644 e2e/mise.toml
 create mode 100644 mobile/mise.toml
 create mode 100644 server/mise.toml
 create mode 100644 web/mise.toml

diff --git a/.github/mise.toml b/.github/mise.toml
new file mode 100644
index 0000000000..6930d41187
--- /dev/null
+++ b/.github/mise.toml
@@ -0,0 +1,10 @@
+[tasks.install]
+run = "pnpm install --filter github --frozen-lockfile"
+
+[tasks.format]
+env._.path = "./node_modules/.bin"
+run = "prettier --check ."
+
+[tasks."format-fix"]
+env._.path = "./node_modules/.bin"
+run = "prettier --write ."
diff --git a/cli/mise.toml b/cli/mise.toml
new file mode 100644
index 0000000000..740184e03d
--- /dev/null
+++ b/cli/mise.toml
@@ -0,0 +1,29 @@
+[tasks.install]
+run = "pnpm install --filter @immich/cli --frozen-lockfile"
+
+[tasks.build]
+env._.path = "./node_modules/.bin"
+run = "vite build"
+
+[tasks.test]
+env._.path = "./node_modules/.bin"
+run = "vite"
+
+[tasks.lint]
+env._.path = "./node_modules/.bin"
+run = "eslint \"src/**/*.ts\" --max-warnings 0"
+
+[tasks."lint-fix"]
+run = { task = "lint --fix" }
+
+[tasks.format]
+env._.path = "./node_modules/.bin"
+run = "prettier --check ."
+
+[tasks."format-fix"]
+env._.path = "./node_modules/.bin"
+run = "prettier --write ."
+
+[tasks.check]
+env._.path = "./node_modules/.bin"
+run = "tsc --noEmit"
diff --git a/deployment/mise.toml b/deployment/mise.toml
new file mode 100644
index 0000000000..f3d07ac31f
--- /dev/null
+++ b/deployment/mise.toml
@@ -0,0 +1,20 @@
+[tools]
+terragrunt = "0.91.2"
+opentofu = "1.10.6"
+
+[tasks."tg:fmt"]
+run = "terragrunt hclfmt"
+description = "Format terragrunt files"
+
+[tasks.tf]
+run = "terragrunt run --all"
+description = "Wrapper for terragrunt run-all"
+dir = "{{cwd}}"
+
+[tasks."tf:fmt"]
+run = "tofu fmt -recursive tf/"
+description = "Format terraform files"
+
+[tasks."tf:init"]
+run = { task = "tf init -- -reconfigure" }
+dir = "{{cwd}}"
diff --git a/docs/mise.toml b/docs/mise.toml
new file mode 100644
index 0000000000..4ffb7d5cce
--- /dev/null
+++ b/docs/mise.toml
@@ -0,0 +1,25 @@
+[tasks.install]
+run = "pnpm install --filter documentation --frozen-lockfile"
+
+[tasks.start]
+env._.path = "./node_modules/.bin"
+run = "docusaurus --port 3005"
+
+[tasks.build]
+env._.path = "./node_modules/.bin"
+run = [
+  "jq -c < ../open-api/immich-openapi-specs.json > ./static/openapi.json || exit 0",
+  "docusaurus build",
+]
+
+[tasks.preview]
+env._.path = "./node_modules/.bin"
+run = "docusaurus serve"
+
+[tasks.format]
+env._.path = "./node_modules/.bin"
+run = "prettier --check ."
+
+[tasks."format-fix"]
+env._.path = "./node_modules/.bin"
+run = "prettier --write ."
diff --git a/e2e/mise.toml b/e2e/mise.toml
new file mode 100644
index 0000000000..c298115e40
--- /dev/null
+++ b/e2e/mise.toml
@@ -0,0 +1,29 @@
+[tasks.install]
+run = "pnpm install --filter immich-e2e --frozen-lockfile"
+
+[tasks.test]
+env._.path = "./node_modules/.bin"
+run = "vitest --run"
+
+[tasks."test-web"]
+env._.path = "./node_modules/.bin"
+run = "playwright test"
+
+[tasks.format]
+env._.path = "./node_modules/.bin"
+run = "prettier --check ."
+
+[tasks."format-fix"]
+env._.path = "./node_modules/.bin"
+run = "prettier --write ."
+
+[tasks.lint]
+env._.path = "./node_modules/.bin"
+run = "eslint \"src/**/*.ts\" --max-warnings 0"
+
+[tasks."lint-fix"]
+run = { task = "lint --fix" }
+
+[tasks.check]
+env._.path = "./node_modules/.bin"
+run = "tsc --noEmit"
diff --git a/mise.toml b/mise.toml
index b4ccd76565..474f768137 100644
--- a/mise.toml
+++ b/mise.toml
@@ -1,527 +1,28 @@
+experimental_monorepo_root = true
+
 [tools]
 node = "24.11.0"
-flutter = "3.35.7"
 pnpm = "10.19.0"
-terragrunt = "0.91.2"
-opentofu = "1.10.6"
-
-[tools."github:CQLabs/homebrew-dcm"]
-version = "1.30.0"
-bin = "dcm"
-postinstall = "chmod +x $MISE_TOOL_INSTALL_PATH/dcm"
 
 [settings]
 experimental = true
 pin = true
 
-# .github
-[tasks."github:install"]
-run = "pnpm install --filter github --frozen-lockfile"
-
-[tasks."github:format"]
-env._.path = "./.github/node_modules/.bin"
-dir = ".github"
-run = "prettier --check ."
-
-[tasks."github:format-fix"]
-env._.path = "./.github/node_modules/.bin"
-dir = ".github"
-run = "prettier --write ."
-
-# @immich/cli
-[tasks."cli:install"]
-run = "pnpm install --filter @immich/cli --frozen-lockfile"
-
-[tasks."cli:build"]
-env._.path = "./cli/node_modules/.bin"
-dir = "cli"
-run = "vite build"
-
-[tasks."cli:test"]
-env._.path = "./cli/node_modules/.bin"
-dir = "cli"
-run = "vite"
-
-[tasks."cli:lint"]
-env._.path = "./cli/node_modules/.bin"
-dir = "cli"
-run = "eslint \"src/**/*.ts\" --max-warnings 0"
-
-[tasks."cli:lint-fix"]
-run = "mise run cli:lint --fix"
-
-[tasks."cli:format"]
-env._.path = "./cli/node_modules/.bin"
-dir = "cli"
-run = "prettier --check ."
-
-[tasks."cli:format-fix"]
-env._.path = "./cli/node_modules/.bin"
-dir = "cli"
-run = "prettier --write ."
-
-[tasks."cli:check"]
-env._.path = "./cli/node_modules/.bin"
-dir = "cli"
-run = "tsc --noEmit"
-
-# @immich/sdk
+# SDK tasks
 [tasks."sdk:install"]
+dir = "open-api/typescript-sdk"
 run = "pnpm install --filter @immich/sdk --frozen-lockfile"
 
 [tasks."sdk:build"]
-env._.path = "./open-api/typescript-sdk/node_modules/.bin"
-dir = "./open-api/typescript-sdk"
+dir = "open-api/typescript-sdk"
+env._.path = "./node_modules/.bin"
 run = "tsc"
 
-# docs
-[tasks."docs:install"]
-run = "pnpm install --filter documentation --frozen-lockfile"
-
-[tasks."docs:start"]
-env._.path = "./docs/node_modules/.bin"
-dir = "docs"
-run = "docusaurus --port 3005"
-
-[tasks."docs:build"]
-env._.path = "./docs/node_modules/.bin"
-dir = "docs"
-run = [
-  "jq -c < ../open-api/immich-openapi-specs.json > ./static/openapi.json || exit 0",
-  "docusaurus build",
-]
-
-
-[tasks."docs:preview"]
-env._.path = "./docs/node_modules/.bin"
-dir = "docs"
-run = "docusaurus serve"
-
-
-[tasks."docs:format"]
-env._.path = "./docs/node_modules/.bin"
-dir = "docs"
-run = "prettier --check ."
-
-[tasks."docs:format-fix"]
-env._.path = "./docs/node_modules/.bin"
-dir = "docs"
-run = "prettier --write ."
-
-
-# e2e
-[tasks."e2e:install"]
-run = "pnpm install --filter immich-e2e --frozen-lockfile"
-
-[tasks."e2e:test"]
-env._.path = "./e2e/node_modules/.bin"
-dir = "e2e"
-run = "vitest --run"
-
-[tasks."e2e:test-web"]
-env._.path = "./e2e/node_modules/.bin"
-dir = "e2e"
-run = "playwright test"
-
-[tasks."e2e:format"]
-env._.path = "./e2e/node_modules/.bin"
-dir = "e2e"
-run = "prettier --check ."
-
-[tasks."e2e:format-fix"]
-env._.path = "./e2e/node_modules/.bin"
-dir = "e2e"
-run = "prettier --write ."
-
-[tasks."e2e:lint"]
-env._.path = "./e2e/node_modules/.bin"
-dir = "e2e"
-run = "eslint \"src/**/*.ts\" --max-warnings 0"
-
-[tasks."e2e:lint-fix"]
-run = "mise run e2e:lint --fix"
-
-[tasks."e2e:check"]
-env._.path = "./e2e/node_modules/.bin"
-dir = "e2e"
-run = "tsc --noEmit"
-
-# i18n
+# i18n tasks
 [tasks."i18n:format"]
-run = "mise run i18n:format-fix"
+dir = "i18n"
+run = { task = ":i18n:format-fix" }
 
 [tasks."i18n:format-fix"]
-run = "pnpm dlx sort-json ./i18n/*.json"
-
-
-# server
-[tasks."server:install"]
-run = "pnpm install --filter immich --frozen-lockfile"
-
-[tasks."server:build"]
-env._.path = "./server/node_modules/.bin"
-dir = "server"
-run = "nest build"
-
-[tasks."server:test"]
-env._.path = "./server/node_modules/.bin"
-dir = "server"
-run = "vitest --config test/vitest.config.mjs"
-
-[tasks."server:test-medium"]
-env._.path = "./server/node_modules/.bin"
-dir = "server"
-run = "vitest --config test/vitest.config.medium.mjs"
-
-[tasks."server:format"]
-env._.path = "./server/node_modules/.bin"
-dir = "server"
-run = "prettier --check ."
-
-[tasks."server:format-fix"]
-env._.path = "./server/node_modules/.bin"
-dir = "server"
-run = "prettier --write ."
-
-[tasks."server:lint"]
-env._.path = "./server/node_modules/.bin"
-dir = "server"
-run = "eslint \"src/**/*.ts\" \"test/**/*.ts\" --max-warnings 0"
-
-[tasks."server:lint-fix"]
-run = "mise run server:lint --fix"
-
-[tasks."server:check"]
-env._.path = "./server/node_modules/.bin"
-dir = "server"
-run = "tsc --noEmit"
-
-[tasks."server:sql"]
-dir = "server"
-run = "node ./dist/bin/sync-open-api.js"
-
-[tasks."server:open-api"]
-dir = "server"
-run = "node ./dist/bin/sync-open-api.js"
-
-[tasks."server:migrations"]
-dir = "server"
-run = "node ./dist/bin/migrations.js"
-description = "Run database migration commands (create, generate, run, debug, or query)"
-
-[tasks."server:schema-drop"]
-run = "mise run server:migrations query 'DROP schema public cascade; CREATE schema public;'"
-
-[tasks."server:schema-reset"]
-run = "mise run server:schema-drop && mise run server:migrations run"
-
-[tasks."server:email-dev"]
-env._.path = "./server/node_modules/.bin"
-dir = "server"
-run = "email dev -p 3050 --dir src/emails"
-
-[tasks."server:checklist"]
-run = [
-  "mise run server:install",
-  "mise run server:format",
-  "mise run server:lint",
-  "mise run server:check",
-  "mise run server:test-medium --run",
-  "mise run server:test --run",
-]
-
-
-# web
-[tasks."web:install"]
-run = "pnpm install --filter immich-web --frozen-lockfile"
-
-[tasks."web:svelte-kit-sync"]
-env._.path = "./web/node_modules/.bin"
-dir = "web"
-run = "svelte-kit sync"
-
-[tasks."web:build"]
-env._.path = "./web/node_modules/.bin"
-dir = "web"
-run = "vite build"
-
-[tasks."web:build-stats"]
-env.BUILD_STATS = "true"
-env._.path = "./web/node_modules/.bin"
-dir = "web"
-run = "vite build"
-
-[tasks."web:preview"]
-env._.path = "./web/node_modules/.bin"
-dir = "web"
-run = "vite preview"
-
-[tasks."web:start"]
-env._.path = "web/node_modules/.bin"
-dir = "web"
-run = "vite dev --host 0.0.0.0 --port 3000"
-
-[tasks."web:test"]
-depends = "web:svelte-kit-sync"
-env._.path = "web/node_modules/.bin"
-dir = "web"
-run = "vitest"
-
-[tasks."web:format"]
-env._.path = "web/node_modules/.bin"
-dir = "web"
-run = "prettier --check ."
-
-[tasks."web:format-fix"]
-env._.path = "web/node_modules/.bin"
-dir = "web"
-run = "prettier --write ."
-
-[tasks."web:lint"]
-env._.path = "web/node_modules/.bin"
-dir = "web"
-run = "eslint . --max-warnings 0 --concurrency 4"
-
-[tasks."web:lint-fix"]
-run = "mise run web:lint --fix"
-
-[tasks."web:check"]
-depends = "web:svelte-kit-sync"
-env._.path = "web/node_modules/.bin"
-dir = "web"
-run = "tsc --noEmit"
-
-[tasks."web:check-svelte"]
-depends = "web:svelte-kit-sync"
-env._.path = "web/node_modules/.bin"
-dir = "web"
-run = "svelte-check --no-tsconfig --fail-on-warnings"
-
-[tasks."web:checklist"]
-run = [
-  "mise run web:install",
-  "mise run web:format",
-  "mise run web:check",
-  "mise run web:test --run",
-  "mise run web:lint",
-]
-
-
-# mobile
-[tasks."mobile:codegen:dart"]
-alias = "mobile:codegen"
-description = "Execute build_runner to auto-generate dart code"
-dir = "mobile"
-sources = [
-  "pubspec.yaml",
-  "build.yaml",
-  "lib/**/*.dart",
-  "infrastructure/**/*.drift",
-]
-outputs = { auto = true }
-run = "dart run build_runner build --delete-conflicting-outputs"
-
-[tasks."mobile:codegen:pigeon"]
-alias = "mobile:pigeon"
-description = "Generate pigeon platform code"
-dir = "mobile"
-depends = [
-  "mobile:pigeon:native-sync",
-  "mobile:pigeon:thumbnail",
-  "mobile:pigeon:background-worker",
-  "mobile:pigeon:background-worker-lock",
-  "mobile:pigeon:connectivity",
-]
-
-[tasks."mobile:codegen:translation"]
-alias = "mobile:translation"
-description = "Generate translations from i18n JSONs"
-dir = "mobile"
-run = [
-  { task = "i18n:format-fix" },
-  { tasks = [
-    "mobile:i18n:loader",
-    "mobile:i18n:keys",
-  ] },
-]
-
-[tasks."mobile:codegen:app-icon"]
-description = "Generate app icons"
-dir = "mobile"
-run = "flutter pub run flutter_launcher_icons:main"
-
-[tasks."mobile:codegen:splash"]
-description = "Generate splash screen"
-dir = "mobile"
-run = "flutter pub run flutter_native_splash:create"
-
-[tasks."mobile:test"]
-description = "Run mobile tests"
-dir = "mobile"
-run = "flutter test"
-
-[tasks."mobile:lint"]
-description = "Analyze Dart code"
-dir = "mobile"
-depends = ["mobile:analyze:dart", "mobile:analyze:dcm"]
-
-[tasks."mobile:lint-fix"]
-description = "Auto-fix Dart code"
-dir = "mobile"
-depends = ["mobile:analyze:fix:dart", "mobile:analyze:fix:dcm"]
-
-[tasks."mobile:format"]
-description = "Format Dart code"
-dir = "mobile"
-run = "dart format --set-exit-if-changed $(find lib -name '*.dart' -not \\( -name '*.g.dart' -o -name '*.drift.dart' -o -name '*.gr.dart' \\))"
-
-[tasks."mobile:build:android"]
-description = "Build Android release"
-dir = "mobile"
-run = "flutter build appbundle"
-
-[tasks."mobile:drift:migration"]
-alias = "mobile:migration"
-description = "Generate database migrations"
-dir = "mobile"
-run = "dart run drift_dev make-migrations"
-
-
-# mobile internal tasks
-[tasks."mobile:pigeon:native-sync"]
-description = "Generate native sync API pigeon code"
-dir = "mobile"
-hide = true
-sources = ["pigeon/native_sync_api.dart"]
-outputs = [
-  "lib/platform/native_sync_api.g.dart",
-  "ios/Runner/Sync/Messages.g.swift",
-  "android/app/src/main/kotlin/app/alextran/immich/sync/Messages.g.kt",
-]
-run = [
-  "dart run pigeon --input pigeon/native_sync_api.dart",
-  "dart format lib/platform/native_sync_api.g.dart",
-]
-
-[tasks."mobile:pigeon:thumbnail"]
-description = "Generate thumbnail API pigeon code"
-dir = "mobile"
-hide = true
-sources = ["pigeon/thumbnail_api.dart"]
-outputs = [
-  "lib/platform/thumbnail_api.g.dart",
-  "ios/Runner/Images/Thumbnails.g.swift",
-  "android/app/src/main/kotlin/app/alextran/immich/images/Thumbnails.g.kt",
-]
-run = [
-  "dart run pigeon --input pigeon/thumbnail_api.dart",
-  "dart format lib/platform/thumbnail_api.g.dart",
-]
-
-[tasks."mobile:pigeon:background-worker"]
-description = "Generate background worker API pigeon code"
-dir = "mobile"
-hide = true
-sources = ["pigeon/background_worker_api.dart"]
-outputs = [
-  "lib/platform/background_worker_api.g.dart",
-  "ios/Runner/Background/BackgroundWorker.g.swift",
-  "android/app/src/main/kotlin/app/alextran/immich/background/BackgroundWorker.g.kt",
-]
-run = [
-  "dart run pigeon --input pigeon/background_worker_api.dart",
-  "dart format lib/platform/background_worker_api.g.dart",
-]
-
-[tasks."mobile:pigeon:background-worker-lock"]
-description = "Generate background worker lock API pigeon code"
-dir = "mobile"
-hide = true
-sources = ["pigeon/background_worker_lock_api.dart"]
-outputs = [
-  "lib/platform/background_worker_lock_api.g.dart",
-  "android/app/src/main/kotlin/app/alextran/immich/background/BackgroundWorkerLock.g.kt",
-]
-run = [
-  "dart run pigeon --input pigeon/background_worker_lock_api.dart",
-  "dart format lib/platform/background_worker_lock_api.g.dart",
-]
-
-[tasks."mobile:pigeon:connectivity"]
-description = "Generate connectivity API pigeon code"
-dir = "mobile"
-hide = true
-sources = ["pigeon/connectivity_api.dart"]
-outputs = [
-  "lib/platform/connectivity_api.g.dart",
-  "ios/Runner/Connectivity/Connectivity.g.swift",
-  "android/app/src/main/kotlin/app/alextran/immich/connectivity/Connectivity.g.kt",
-]
-run = [
-  "dart run pigeon --input pigeon/connectivity_api.dart",
-  "dart format lib/platform/connectivity_api.g.dart",
-]
-
-[tasks."mobile:i18n:loader"]
-description = "Generate i18n loader"
-dir = "mobile"
-hide = true
-sources = ["i18n/"]
-outputs = "lib/generated/codegen_loader.g.dart"
-run = [
-  "dart run easy_localization:generate -S ../i18n",
-  "dart format lib/generated/codegen_loader.g.dart",
-]
-
-[tasks."mobile:i18n:keys"]
-description = "Generate i18n keys"
-dir = "mobile"
-hide = true
-sources = ["i18n/en.json"]
-outputs = "lib/generated/intl_keys.g.dart"
-run = [
-  "dart run bin/generate_keys.dart",
-  "dart format lib/generated/intl_keys.g.dart",
-]
-
-[tasks."mobile:analyze:dart"]
-description = "Run Dart analysis"
-dir = "mobile"
-hide = true
-run = "dart analyze --fatal-infos"
-
-[tasks."mobile:analyze:dcm"]
-description = "Run Dart Code Metrics"
-dir = "mobile"
-hide = true
-run = "dcm analyze lib --fatal-style --fatal-warnings"
-
-[tasks."mobile:analyze:fix:dart"]
-description = "Auto-fix Dart analysis"
-dir = "mobile"
-hide = true
-run = "dart fix --apply"
-
-[tasks."mobile:analyze:fix:dcm"]
-description = "Auto-fix Dart Code Metrics"
-dir = "mobile"
-hide = true
-run = "dcm fix lib"
-
-# docs deployment
-[tasks."tg:fmt"]
-run = "terragrunt hclfmt"
-description = "Format terragrunt files"
-
-[tasks.tf]
-run = "terragrunt run --all"
-description = "Wrapper for terragrunt run-all"
-dir = "{{cwd}}"
-
-[tasks."tf:fmt"]
-run = "tofu fmt -recursive tf/"
-description = "Format terraform files"
-
-[tasks."tf:init"]
-run = "mise run tf init -- -reconfigure"
-dir = "{{cwd}}"
+dir = "i18n"
+run = "pnpm dlx sort-json *.json"
diff --git a/mobile/mise.toml b/mobile/mise.toml
new file mode 100644
index 0000000000..cdafd1cc18
--- /dev/null
+++ b/mobile/mise.toml
@@ -0,0 +1,185 @@
+[tools]
+flutter = "3.35.7"
+
+[tools."github:CQLabs/homebrew-dcm"]
+version = "1.30.0"
+bin = "dcm"
+postinstall = "chmod +x $MISE_TOOL_INSTALL_PATH/dcm"
+
+[tasks."codegen:dart"]
+alias = "codegen"
+description = "Execute build_runner to auto-generate dart code"
+sources = [
+  "pubspec.yaml",
+  "build.yaml",
+  "lib/**/*.dart",
+  "infrastructure/**/*.drift",
+]
+outputs = { auto = true }
+run = "dart run build_runner build --delete-conflicting-outputs"
+
+[tasks."codegen:pigeon"]
+alias = "pigeon"
+description = "Generate pigeon platform code"
+depends = [
+  "pigeon:native-sync",
+  "pigeon:thumbnail",
+  "pigeon:background-worker",
+  "pigeon:background-worker-lock",
+  "pigeon:connectivity",
+]
+
+[tasks."codegen:translation"]
+alias = "translation"
+description = "Generate translations from i18n JSONs"
+run = [
+  { task = "//i18n:format-fix" },
+  { tasks = [
+    "i18n:loader",
+    "i18n:keys",
+  ] },
+]
+
+[tasks."codegen:app-icon"]
+description = "Generate app icons"
+run = "flutter pub run flutter_launcher_icons:main"
+
+[tasks."codegen:splash"]
+description = "Generate splash screen"
+run = "flutter pub run flutter_native_splash:create"
+
+[tasks.test]
+description = "Run mobile tests"
+run = "flutter test"
+
+[tasks.lint]
+description = "Analyze Dart code"
+depends = ["analyze:dart", "analyze:dcm"]
+
+[tasks."lint-fix"]
+description = "Auto-fix Dart code"
+depends = ["analyze:fix:dart", "analyze:fix:dcm"]
+
+[tasks.format]
+description = "Format Dart code"
+run = "dart format --set-exit-if-changed $(find lib -name '*.dart' -not \\( -name '*.g.dart' -o -name '*.drift.dart' -o -name '*.gr.dart' \\))"
+
+[tasks."build:android"]
+description = "Build Android release"
+run = "flutter build appbundle"
+
+[tasks."drift:migration"]
+alias = "migration"
+description = "Generate database migrations"
+run = "dart run drift_dev make-migrations"
+
+
+# Internal tasks
+[tasks."pigeon:native-sync"]
+description = "Generate native sync API pigeon code"
+hide = true
+sources = ["pigeon/native_sync_api.dart"]
+outputs = [
+  "lib/platform/native_sync_api.g.dart",
+  "ios/Runner/Sync/Messages.g.swift",
+  "android/app/src/main/kotlin/app/alextran/immich/sync/Messages.g.kt",
+]
+run = [
+  "dart run pigeon --input pigeon/native_sync_api.dart",
+  "dart format lib/platform/native_sync_api.g.dart",
+]
+
+[tasks."pigeon:thumbnail"]
+description = "Generate thumbnail API pigeon code"
+hide = true
+sources = ["pigeon/thumbnail_api.dart"]
+outputs = [
+  "lib/platform/thumbnail_api.g.dart",
+  "ios/Runner/Images/Thumbnails.g.swift",
+  "android/app/src/main/kotlin/app/alextran/immich/images/Thumbnails.g.kt",
+]
+run = [
+  "dart run pigeon --input pigeon/thumbnail_api.dart",
+  "dart format lib/platform/thumbnail_api.g.dart",
+]
+
+[tasks."pigeon:background-worker"]
+description = "Generate background worker API pigeon code"
+hide = true
+sources = ["pigeon/background_worker_api.dart"]
+outputs = [
+  "lib/platform/background_worker_api.g.dart",
+  "ios/Runner/Background/BackgroundWorker.g.swift",
+  "android/app/src/main/kotlin/app/alextran/immich/background/BackgroundWorker.g.kt",
+]
+run = [
+  "dart run pigeon --input pigeon/background_worker_api.dart",
+  "dart format lib/platform/background_worker_api.g.dart",
+]
+
+[tasks."pigeon:background-worker-lock"]
+description = "Generate background worker lock API pigeon code"
+hide = true
+sources = ["pigeon/background_worker_lock_api.dart"]
+outputs = [
+  "lib/platform/background_worker_lock_api.g.dart",
+  "android/app/src/main/kotlin/app/alextran/immich/background/BackgroundWorkerLock.g.kt",
+]
+run = [
+  "dart run pigeon --input pigeon/background_worker_lock_api.dart",
+  "dart format lib/platform/background_worker_lock_api.g.dart",
+]
+
+[tasks."pigeon:connectivity"]
+description = "Generate connectivity API pigeon code"
+hide = true
+sources = ["pigeon/connectivity_api.dart"]
+outputs = [
+  "lib/platform/connectivity_api.g.dart",
+  "ios/Runner/Connectivity/Connectivity.g.swift",
+  "android/app/src/main/kotlin/app/alextran/immich/connectivity/Connectivity.g.kt",
+]
+run = [
+  "dart run pigeon --input pigeon/connectivity_api.dart",
+  "dart format lib/platform/connectivity_api.g.dart",
+]
+
+[tasks."i18n:loader"]
+description = "Generate i18n loader"
+hide = true
+sources = ["i18n/"]
+outputs = "lib/generated/codegen_loader.g.dart"
+run = [
+  "dart run easy_localization:generate -S ../i18n",
+  "dart format lib/generated/codegen_loader.g.dart",
+]
+
+[tasks."i18n:keys"]
+description = "Generate i18n keys"
+hide = true
+sources = ["i18n/en.json"]
+outputs = "lib/generated/intl_keys.g.dart"
+run = [
+  "dart run bin/generate_keys.dart",
+  "dart format lib/generated/intl_keys.g.dart",
+]
+
+[tasks."analyze:dart"]
+description = "Run Dart analysis"
+hide = true
+run = "dart analyze --fatal-infos"
+
+[tasks."analyze:dcm"]
+description = "Run Dart Code Metrics"
+hide = true
+run = "dcm analyze lib --fatal-style --fatal-warnings"
+
+[tasks."analyze:fix:dart"]
+description = "Auto-fix Dart analysis"
+hide = true
+run = "dart fix --apply"
+
+[tasks."analyze:fix:dcm"]
+description = "Auto-fix Dart Code Metrics"
+hide = true
+run = "dcm fix lib"
diff --git a/server/mise.toml b/server/mise.toml
new file mode 100644
index 0000000000..d2240c4289
--- /dev/null
+++ b/server/mise.toml
@@ -0,0 +1,66 @@
+[tasks.install]
+run = "pnpm install --filter immich --frozen-lockfile"
+
+[tasks.build]
+env._.path = "./node_modules/.bin"
+run = "nest build"
+
+[tasks.test]
+env._.path = "./node_modules/.bin"
+run = "vitest --config test/vitest.config.mjs"
+
+[tasks."test-medium"]
+env._.path = "./node_modules/.bin"
+run = "vitest --config test/vitest.config.medium.mjs"
+
+[tasks.format]
+env._.path = "./node_modules/.bin"
+run = "prettier --check ."
+
+[tasks."format-fix"]
+env._.path = "./node_modules/.bin"
+run = "prettier --write ."
+
+[tasks.lint]
+env._.path = "./node_modules/.bin"
+run = "eslint \"src/**/*.ts\" \"test/**/*.ts\" --max-warnings 0"
+
+[tasks."lint-fix"]
+run = { task = "lint --fix" }
+
+[tasks.check]
+env._.path = "./node_modules/.bin"
+run = "tsc --noEmit"
+
+[tasks.sql]
+run = "node ./dist/bin/sync-open-api.js"
+
+[tasks."open-api"]
+run = "node ./dist/bin/sync-open-api.js"
+
+[tasks.migrations]
+run = "node ./dist/bin/migrations.js"
+description = "Run database migration commands (create, generate, run, debug, or query)"
+
+[tasks."schema-drop"]
+run = { task = "migrations query 'DROP schema public cascade; CREATE schema public;'" }
+
+[tasks."schema-reset"]
+run = [
+  { task = ":schema-drop" },
+  { task = "migrations run" },
+]
+
+[tasks."email-dev"]
+env._.path = "./node_modules/.bin"
+run = "email dev -p 3050 --dir src/emails"
+
+[tasks.checklist]
+run = [
+  { task = ":install" },
+  { task = ":format" },
+  { task = ":lint" },
+  { task = ":check" },
+  { task = ":test-medium --run" },
+  { task = ":test --run" },
+]
diff --git a/web/mise.toml b/web/mise.toml
new file mode 100644
index 0000000000..5aca2d737d
--- /dev/null
+++ b/web/mise.toml
@@ -0,0 +1,62 @@
+[tasks.install]
+run = "pnpm install --filter immich-web --frozen-lockfile"
+
+[tasks."svelte-kit-sync"]
+env._.path = "./node_modules/.bin"
+run = "svelte-kit sync"
+
+[tasks.build]
+env._.path = "./node_modules/.bin"
+run = "vite build"
+
+[tasks."build-stats"]
+env.BUILD_STATS = "true"
+env._.path = "./node_modules/.bin"
+run = "vite build"
+
+[tasks.preview]
+env._.path = "./node_modules/.bin"
+run = "vite preview"
+
+[tasks.start]
+env._.path = "./node_modules/.bin"
+run = "vite dev --host 0.0.0.0 --port 3000"
+
+[tasks.test]
+depends = ["svelte-kit-sync"]
+env._.path = "./node_modules/.bin"
+run = "vitest"
+
+[tasks.format]
+env._.path = "./node_modules/.bin"
+run = "prettier --check ."
+
+[tasks."format-fix"]
+env._.path = "./node_modules/.bin"
+run = "prettier --write ."
+
+[tasks.lint]
+env._.path = "./node_modules/.bin"
+run = "eslint . --max-warnings 0 --concurrency 4"
+
+[tasks."lint-fix"]
+run = { task = "lint --fix" }
+
+[tasks.check]
+depends = ["svelte-kit-sync"]
+env._.path = "./node_modules/.bin"
+run = "tsc --noEmit"
+
+[tasks."check-svelte"]
+depends = ["svelte-kit-sync"]
+env._.path = "./node_modules/.bin"
+run = "svelte-check --no-tsconfig --fail-on-warnings"
+
+[tasks.checklist]
+run = [
+  { task = ":install" },
+  { task = ":format" },
+  { task = ":check" },
+  { task = ":test --run" },
+  { task = ":lint" },
+]

From 718b3a7b52c9ae9b8678af63f9dff40296b1632d Mon Sep 17 00:00:00 2001
From: bo0tzz <git@bo0tzz.me>
Date: Mon, 10 Nov 2025 16:49:44 +0100
Subject: [PATCH 52/84] fix: mise tf task scope (#23761)

---
 .github/workflows/docs-deploy.yml  | 6 +++---
 .github/workflows/docs-destroy.yml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/docs-deploy.yml b/.github/workflows/docs-deploy.yml
index a74a2ec613..5d01646fef 100644
--- a/.github/workflows/docs-deploy.yml
+++ b/.github/workflows/docs-deploy.yml
@@ -174,7 +174,7 @@ jobs:
           CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
           TF_STATE_POSTGRES_CONN_STR: ${{ secrets.TF_STATE_POSTGRES_CONN_STR }}
         working-directory: 'deployment/modules/cloudflare/docs'
-        run: 'mise run tf apply'
+        run: 'mise run //deployment:tf apply'
 
       - name: Deploy Docs Subdomain Output
         id: docs-output
@@ -186,7 +186,7 @@ jobs:
           TF_STATE_POSTGRES_CONN_STR: ${{ secrets.TF_STATE_POSTGRES_CONN_STR }}
         working-directory: 'deployment/modules/cloudflare/docs'
         run: |
-          mise run tf output -- -json | jq -r '
+          mise run //deployment:tf output -- -json | jq -r '
             "projectName=\(.pages_project_name.value)",
             "subdomain=\(.immich_app_branch_subdomain.value)"
           ' >> $GITHUB_OUTPUT
@@ -211,7 +211,7 @@ jobs:
           CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
           TF_STATE_POSTGRES_CONN_STR: ${{ secrets.TF_STATE_POSTGRES_CONN_STR }}
         working-directory: 'deployment/modules/cloudflare/docs-release'
-        run: 'mise run tf apply'
+        run: 'mise run //deployment:tf apply'
 
       - name: Comment
         uses: actions-cool/maintain-one-comment@4b2dbf086015f892dcb5e8c1106f5fccd6c1476b # v3.2.0
diff --git a/.github/workflows/docs-destroy.yml b/.github/workflows/docs-destroy.yml
index 7de2d81858..3ad3f3558e 100644
--- a/.github/workflows/docs-destroy.yml
+++ b/.github/workflows/docs-destroy.yml
@@ -39,7 +39,7 @@ jobs:
           CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
           TF_STATE_POSTGRES_CONN_STR: ${{ secrets.TF_STATE_POSTGRES_CONN_STR }}
         working-directory: 'deployment/modules/cloudflare/docs'
-        run: 'mise run tf destroy -- -refresh=false'
+        run: 'mise run //deployment:tf destroy -- -refresh=false'
 
       - name: Comment
         uses: actions-cool/maintain-one-comment@4b2dbf086015f892dcb5e8c1106f5fccd6c1476b # v3.2.0

From ce0172b8c117b12eb0135ab2881589a0c8b431a4 Mon Sep 17 00:00:00 2001
From: Matthew Momjian <50788000+mmomjian@users.noreply.github.com>
Date: Mon, 10 Nov 2025 10:56:18 -0500
Subject: [PATCH 53/84] fix(docs): bump docs for PG versions (#23714)

---
 docs/docs/administration/postgres-standalone.md | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/docs/docs/administration/postgres-standalone.md b/docs/docs/administration/postgres-standalone.md
index fd9b8a5e4d..2b7527623f 100644
--- a/docs/docs/administration/postgres-standalone.md
+++ b/docs/docs/administration/postgres-standalone.md
@@ -10,16 +10,19 @@ Running with a pre-existing Postgres server can unlock powerful administrative f
 
 ## Prerequisites
 
-You must install `pgvector` (`>= 0.7.0, < 1.0.0`), as it is a prerequisite for `vchord`.
+You must install pgvector as it is a prerequisite for VectorChord.
 The easiest way to do this on Debian/Ubuntu is by adding the [PostgreSQL Apt repository][pg-apt] and then
 running `apt install postgresql-NN-pgvector`, where `NN` is your Postgres version (e.g., `16`).
 
 You must install VectorChord into your instance of Postgres using their [instructions][vchord-install]. After installation, add `shared_preload_libraries = 'vchord.so'` to your `postgresql.conf`. If you already have some `shared_preload_libraries` set, you can separate each extension with a comma. For example, `shared_preload_libraries = 'pg_stat_statements, vchord.so'`.
 
-:::note
-Immich is known to work with Postgres versions `>= 14, < 18`.
+:::note Supported versions
+Immich is known to work with Postgres versions `>= 14, < 19`.
 
-Make sure the installed version of VectorChord is compatible with your version of Immich. The current accepted range for VectorChord is `>= 0.3.0, < 0.5.0`.
+VectorChord is known to work with pgvector versions `>= 0.7, < 0.9`.
+
+The Immich server will check the VectorChord version on startup to ensure compatibility, and refuse to start if a compatible version is not found.
+The current accepted range for VectorChord is `>= 0.3, < 0.6`.
 :::
 
 ## Specifying the connection URL

From 7705c84b046daedbe7adf059671bb0cb6784c251 Mon Sep 17 00:00:00 2001
From: Jason Rasmussen <jason@rasm.me>
Date: Mon, 10 Nov 2025 11:06:40 -0500
Subject: [PATCH 54/84] refactor(web): album service (#23762)

---
 web/src/lib/components/album-page/album-viewer.svelte    | 5 +++--
 web/src/lib/components/album-page/albums-list.svelte     | 9 ++++-----
 web/src/lib/services/album.service.ts                    | 6 ++++++
 web/src/lib/utils/asset-utils.ts                         | 7 -------
 .../[[photos=photos]]/[[assetId=id]]/+page.svelte        | 9 +++------
 5 files changed, 16 insertions(+), 20 deletions(-)
 create mode 100644 web/src/lib/services/album.service.ts

diff --git a/web/src/lib/components/album-page/album-viewer.svelte b/web/src/lib/components/album-page/album-viewer.svelte
index 8d169fbc8f..460cf4e63b 100644
--- a/web/src/lib/components/album-page/album-viewer.svelte
+++ b/web/src/lib/components/album-page/album-viewer.svelte
@@ -7,12 +7,13 @@
   import AssetSelectControlBar from '$lib/components/timeline/AssetSelectControlBar.svelte';
   import Timeline from '$lib/components/timeline/Timeline.svelte';
   import { TimelineManager } from '$lib/managers/timeline-manager/timeline-manager.svelte';
+  import { handleDownloadAlbum } from '$lib/services/album.service';
   import { AssetInteraction } from '$lib/stores/asset-interaction.svelte';
   import { assetViewingStore } from '$lib/stores/asset-viewing.store';
   import { dragAndDropFilesStore } from '$lib/stores/drag-and-drop-files.store';
   import { featureFlags } from '$lib/stores/server-config.store';
   import { handlePromiseError } from '$lib/utils';
-  import { cancelMultiselect, downloadAlbum } from '$lib/utils/asset-utils';
+  import { cancelMultiselect } from '$lib/utils/asset-utils';
   import { fileUploadHandler, openFileUploadDialog } from '$lib/utils/file-uploader';
   import type { AlbumResponseDto, SharedLinkResponseDto, UserResponseDto } from '@immich/sdk';
   import { IconButton } from '@immich/ui';
@@ -120,7 +121,7 @@
             color="secondary"
             variant="ghost"
             aria-label={$t('download')}
-            onclick={() => downloadAlbum(album)}
+            onclick={() => handleDownloadAlbum(album)}
             icon={mdiDownload}
           />
         {/if}
diff --git a/web/src/lib/components/album-page/albums-list.svelte b/web/src/lib/components/album-page/albums-list.svelte
index 8e9f45c1f8..5a93dd08f1 100644
--- a/web/src/lib/components/album-page/albums-list.svelte
+++ b/web/src/lib/components/album-page/albums-list.svelte
@@ -11,6 +11,7 @@
   import AlbumShareModal from '$lib/modals/AlbumShareModal.svelte';
   import QrCodeModal from '$lib/modals/QrCodeModal.svelte';
   import SharedLinkCreateModal from '$lib/modals/SharedLinkCreateModal.svelte';
+  import { handleDownloadAlbum } from '$lib/services/album.service';
   import {
     AlbumFilter,
     AlbumGroupBy,
@@ -30,7 +31,6 @@
     stringToSortOrder,
     type AlbumGroup,
   } from '$lib/utils/album-utils';
-  import { downloadAlbum } from '$lib/utils/asset-utils';
   import type { ContextMenuPosition } from '$lib/utils/context-menu';
   import { handleError } from '$lib/utils/handle-error';
   import { normalizeSearchString } from '$lib/utils/string-utils';
@@ -221,11 +221,10 @@
     isOpen = false;
   };
 
-  const handleDownloadAlbum = async () => {
+  const onDownloadAlbum = async () => {
     if (contextMenuTargetAlbum) {
-      const album = contextMenuTargetAlbum;
       closeAlbumContextMenu();
-      await downloadAlbum(album);
+      await handleDownloadAlbum(contextMenuTargetAlbum);
     }
   };
 
@@ -419,7 +418,7 @@
     />
     <MenuOption icon={mdiShareVariantOutline} text={$t('share')} onClick={() => openShareModal()} />
   {/if}
-  <MenuOption icon={mdiDownload} text={$t('download')} onClick={() => handleDownloadAlbum()} />
+  <MenuOption icon={mdiDownload} text={$t('download')} onClick={onDownloadAlbum} />
   {#if showFullContextMenu}
     <MenuOption icon={mdiDeleteOutline} text={$t('delete')} onClick={() => setAlbumToDelete()} />
   {/if}
diff --git a/web/src/lib/services/album.service.ts b/web/src/lib/services/album.service.ts
new file mode 100644
index 0000000000..cb7b55bc11
--- /dev/null
+++ b/web/src/lib/services/album.service.ts
@@ -0,0 +1,6 @@
+import { downloadArchive } from '$lib/utils/asset-utils';
+import type { AlbumResponseDto } from '@immich/sdk';
+
+export const handleDownloadAlbum = async (album: AlbumResponseDto) => {
+  await downloadArchive(`${album.albumName}.zip`, { albumId: album.id });
+};
diff --git a/web/src/lib/utils/asset-utils.ts b/web/src/lib/utils/asset-utils.ts
index fa857846bb..dc572b541a 100644
--- a/web/src/lib/utils/asset-utils.ts
+++ b/web/src/lib/utils/asset-utils.ts
@@ -30,7 +30,6 @@ import {
   untagAssets,
   updateAsset,
   updateAssets,
-  type AlbumResponseDto,
   type AssetResponseDto,
   type AssetTypeEnum,
   type DownloadInfoDto,
@@ -156,12 +155,6 @@ export const removeTag = async ({
   return assetIds;
 };
 
-export const downloadAlbum = async (album: AlbumResponseDto) => {
-  await downloadArchive(`${album.albumName}.zip`, {
-    albumId: album.id,
-  });
-};
-
 export const downloadBlob = (data: Blob, filename: string) => {
   const url = URL.createObjectURL(data);
 
diff --git 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
index 464543cdce..f9453c41cf 100644
--- 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
@@ -36,6 +36,7 @@
   import AlbumUsersModal from '$lib/modals/AlbumUsersModal.svelte';
   import QrCodeModal from '$lib/modals/QrCodeModal.svelte';
   import SharedLinkCreateModal from '$lib/modals/SharedLinkCreateModal.svelte';
+  import { handleDownloadAlbum } from '$lib/services/album.service';
   import { AssetInteraction } from '$lib/stores/asset-interaction.svelte';
   import { assetViewingStore } from '$lib/stores/asset-viewing.store';
   import { featureFlags } from '$lib/stores/server-config.store';
@@ -43,7 +44,7 @@
   import { preferences, user } from '$lib/stores/user.store';
   import { handlePromiseError, makeSharedLinkUrl } from '$lib/utils';
   import { confirmAlbumDelete } from '$lib/utils/album-utils';
-  import { cancelMultiselect, downloadAlbum } from '$lib/utils/asset-utils';
+  import { cancelMultiselect } from '$lib/utils/asset-utils';
   import { openFileUploadDialog } from '$lib/utils/file-uploader';
   import { handleError } from '$lib/utils/handle-error';
   import {
@@ -233,10 +234,6 @@
     }
   };
 
-  const handleDownloadAlbum = async () => {
-    await downloadAlbum(album);
-  };
-
   const handleRemoveAlbum = async () => {
     const isConfirmed = await confirmAlbumDelete(album);
 
@@ -653,7 +650,7 @@
                 variant="ghost"
                 color="secondary"
                 aria-label={$t('download')}
-                onclick={handleDownloadAlbum}
+                onclick={() => handleDownloadAlbum(album)}
                 icon={mdiDownload}
               />
             {/if}

From 493cde9d5535a79d314f791b474d9a93603e8f19 Mon Sep 17 00:00:00 2001
From: Peter Ombodi <p.ombodi@gmail.com>
Date: Mon, 10 Nov 2025 18:20:51 +0200
Subject: [PATCH 55/84] feat: opt-in sync of deletes and restores from web to
 Android (beta timeline) (#20473)

* feature(mobile, beta, Android): handle remote asset trash/restore events and rescan media
- Handle move to trash and restore from trash for remote assets on Android
- Trigger MediaScannerConnection to rescan affected media files

* feature(mobile, beta, Android): fix rescan

* fix imports

* fix checking conditions

* refactor naming

* fix line breaks

* refactor code
rollback changes in BackgroundServicePlugin

* refactor code (use separate TrashService)

* refactor code

* parallelize restoreFromTrash calls with Future.wait
format trash.provider.dart

* try to re-format trash.provider.dart

* re-format trash.provider.dart

* rename TrashService to TrashSyncService to avoid duplicated names
revert changes in original trash.provider.dart

* refactor code (minor nitpicks)

* process restoreFromTrash sequentially instead of Future.wait

* group local assets by checksum before moving to trash
delete LocalAssetEntity records when moved to trash
refactor code

* fix format

* use checksum for asset restoration
refactro code

* fix format

* sync trash only for backup-selected assets

* feat(db): add local_trashed_asset table and integrate with restoration flow
- Add new `local_trashed_asset` table to store metadata of trashed assets
- Save trashed asset info into `local_trashed_asset` before deletion
- Use `local_trashed_asset` as source for asset restoration
- Implement file restoration by `mediaId`

* resolve merge conflicts

* fix index creating on migration

* rework trashed assets handling
- add new table trashed_local_asset
- mirror trashed assets data in trashed_local_asset.
- compute checksums for assets trashed out-of-app.
- restore assets present in trashed_local_asset and non-trashed in remote_asset.
- simplify moving-to-trash logic based on remote_asset events.

* resolve merge conflicts
use updated approach for calculating checksums

* use CurrentPlatform instead _platform
fix mocks

* revert redundant changes

* Include trashed items in getMediaChanges
Process trashed items delta during incremental sync

* fix merge conflicts

* fix format

* trashed_local_asset table mirror of local_asset table structure
trashed_local_asset<->local_asset transfer data on move to trash or restore
refactor code

* refactor and format code

* refactor TrashedAsset model
fix missed data transfering

* refactor code
remove unused model

* fix label

* fix merge conflicts

* optimize, refactor code
remove redundant code and checking
getTrashedAssetsForAlbum for iOS
tests for hash trashed assets

* format code

* fix migration
fix tests

* fix generated file

* reuse exist checksums on trash data update
handle restoration errors
fix import

* format code

* sync_stream.service depend on repos
refactor assets restoration
update dependencies in tests

* remove trashed asset model
remove trash_sync.service
refactor DriftTrashedLocalAssetRepository, LocalSyncService

* rework fetching trashed assets data on native side
optimize handling trashed assets in local sync service
refactor code

* update NativeSyncApi on iOS side
remove unused code

* optimize sync trashed assets call in full sync mode
refactor code

* fix format

* remove albumIds from getTrashedAssets params
fix upsert in trashed local asset repo
refactor code

* fix getTrashedAssets params

* fix(trash-sync): clean up NativeSyncApiImplBase and correct applyDelta

* refactor(trash-sync): optimize performance and fix minor issues

* refactor(trash-sync): add missed index

* feat(trash-sync): remove sinceLastCheckpoint param from getTrashedAssets

* fix(trash-sync): fix target table

* fix(trash-sync): remove unused extension

* fix(trash-sync): remove unused code

* fix(trash-sync): refactor code

* fix(trash-sync): reformat file

* fix(trash_sync): refactor code

* fix(trash_sync): improve moving to trash

* refactor(trash_sync): integrate MANAGE_MEDIA permission request into login flow and advanced settings

* refactor(trash_sync): add additional checking for experimental trash sync flag and MANAGE_MEDIA permission.

* refactor(trash_sync): resolve merge conflicts

* refactor(trash_sync): fix format

* resolve merge conflicts
add await for alert dialog
add missed request

* refactor(trash_sync): rework MANAGE_MEDIA info widget
show rationale text in permission request alert dialog
refactor setting getter

* fix(trash_sync): restore missing text values

* fix(trash_sync): format file

* fix(trash_sync): check backup enabled and remove remote asset existence check

* fix(trash_sync): remove checking backup enabled
test(trash_sync): cover sync-stream trash/restore paths and dedupe mocks

* test(trash_sync): cover trash/restore flows for local_sync_service

* chore(e2e): restore test-assets submodule pointer

---------

Co-authored-by: Peter Ombodi <peter.ombodi@gmail.com>
Co-authored-by: Alex <alex.tran1502@gmail.com>
---
 i18n/en.json                                  |    6 +
 .../immich/BackgroundServicePlugin.kt         |  128 +-
 .../app/alextran/immich/sync/Messages.g.kt    |   16 +
 .../alextran/immich/sync/MessagesImpl26.kt    |    5 +
 .../alextran/immich/sync/MessagesImpl30.kt    |   27 +
 .../alextran/immich/sync/MessagesImplBase.kt  |   12 +
 .../drift_schemas/main/drift_schema_v13.json  |    1 +
 mobile/ios/Runner/Sync/Messages.g.swift       |   16 +
 mobile/ios/Runner/Sync/MessagesImpl.swift     |  132 +-
 mobile/lib/constants/constants.dart           |    3 +
 mobile/lib/domain/services/hash.service.dart  |   28 +-
 .../domain/services/local_sync.service.dart   |  109 +-
 .../domain/services/sync_stream.service.dart  |   64 +-
 .../entities/trashed_local_asset.entity.dart  |   40 +
 .../trashed_local_asset.entity.drift.dart     | 1080 +++
 .../repositories/db.repository.dart           |    9 +-
 .../repositories/db.repository.drift.dart     |   20 +-
 .../repositories/db.repository.steps.dart     |  456 +
 .../repositories/local_asset.repository.dart  |   31 +
 .../repositories/remote_asset.repository.dart |    1 +
 .../trashed_local_asset.repository.dart       |  252 +
 mobile/lib/platform/native_sync_api.g.dart    |   28 +
 .../infrastructure/asset.provider.dart        |    5 +
 .../infrastructure/sync.provider.dart         |   10 +
 .../infrastructure/trash_sync.provider.dart   |   12 +
 mobile/lib/providers/trash.provider.dart      |    2 +-
 .../local_files_manager.repository.dart       |   27 +-
 .../services/local_files_manager.service.dart |   28 +
 .../lib/widgets/forms/login/login_form.dart   |   56 +
 .../widgets/settings/advanced_settings.dart   |   49 +-
 .../sync_status_and_actions.dart              |   43 +
 .../settings/settings_action_tile.dart        |   73 +
 mobile/pigeon/native_sync_api.dart            |    7 +
 mobile/test/domain/service.mock.dart          |    1 +
 .../domain/services/hash_service_test.dart    |    5 +
 .../services/local_sync_service_test.dart     |  190 +
 .../services/sync_stream_service_test.dart    |  194 +-
 mobile/test/drift/main/generated/schema.dart  |    5 +-
 .../test/drift/main/generated/schema_v13.dart | 7765 +++++++++++++++++
 mobile/test/fixtures/sync_stream.stub.dart    |   63 +
 .../test/infrastructure/repository.mock.dart  |    3 +
 mobile/test/mocks/asset_entity.mock.dart      |    4 +
 mobile/test/services/hash_service_test.dart   |    4 +-
 mobile/test/services/upload.service_test.dart |    4 +-
 44 files changed, 10866 insertions(+), 148 deletions(-)
 create mode 100644 mobile/drift_schemas/main/drift_schema_v13.json
 create mode 100644 mobile/lib/infrastructure/entities/trashed_local_asset.entity.dart
 create mode 100644 mobile/lib/infrastructure/entities/trashed_local_asset.entity.drift.dart
 create mode 100644 mobile/lib/infrastructure/repositories/trashed_local_asset.repository.dart
 create mode 100644 mobile/lib/providers/infrastructure/trash_sync.provider.dart
 create mode 100644 mobile/lib/widgets/settings/settings_action_tile.dart
 create mode 100644 mobile/test/domain/services/local_sync_service_test.dart
 create mode 100644 mobile/test/drift/main/generated/schema_v13.dart
 create mode 100644 mobile/test/mocks/asset_entity.mock.dart

diff --git a/i18n/en.json b/i18n/en.json
index a83cb07d62..644b74e715 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -475,6 +475,7 @@
   "allow_edits": "Allow edits",
   "allow_public_user_to_download": "Allow public user to download",
   "allow_public_user_to_upload": "Allow public user to upload",
+  "allowed": "Allowed",
   "alt_text_qr_code": "QR code image",
   "anti_clockwise": "Anti-clockwise",
   "api_key": "API Key",
@@ -1314,6 +1315,10 @@
   "main_menu": "Main menu",
   "make": "Make",
   "manage_geolocation": "Manage location",
+  "manage_media_access_rationale": "This permission is required for proper handling of moving assets to the trash and restoring them from it.",
+  "manage_media_access_settings": "Open settings",
+  "manage_media_access_subtitle": "Allow the Immich app to manage and move media files.",
+  "manage_media_access_title": "Media Management Access",
   "manage_shared_links": "Manage shared links",
   "manage_sharing_with_partners": "Manage sharing with partners",
   "manage_the_app_settings": "Manage the app settings",
@@ -1438,6 +1443,7 @@
   "no_results_description": "Try a synonym or more general keyword",
   "no_shared_albums_message": "Create an album to share photos and videos with people in your network",
   "no_uploads_in_progress": "No uploads in progress",
+  "not_allowed": "Not allowed",
   "not_available": "N/A",
   "not_in_any_album": "Not in any album",
   "not_selected": "Not selected",
diff --git a/mobile/android/app/src/main/kotlin/app/alextran/immich/BackgroundServicePlugin.kt b/mobile/android/app/src/main/kotlin/app/alextran/immich/BackgroundServicePlugin.kt
index ae2ec22a71..f62f25558d 100644
--- a/mobile/android/app/src/main/kotlin/app/alextran/immich/BackgroundServicePlugin.kt
+++ b/mobile/android/app/src/main/kotlin/app/alextran/immich/BackgroundServicePlugin.kt
@@ -143,7 +143,7 @@ class BackgroundServicePlugin : FlutterPlugin, MethodChannel.MethodCallHandler,
         val mediaUrls = call.argument<List<String>>("mediaUrls")
         if (mediaUrls != null) {
           if ((Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) && hasManageMediaPermission()) {
-              moveToTrash(mediaUrls, result)
+            moveToTrash(mediaUrls, result)
           } else {
             result.error("PERMISSION_DENIED", "Media permission required", null)
           }
@@ -155,15 +155,23 @@ class BackgroundServicePlugin : FlutterPlugin, MethodChannel.MethodCallHandler,
       "restoreFromTrash" -> {
         val fileName = call.argument<String>("fileName")
         val type = call.argument<Int>("type")
+        val mediaId = call.argument<String>("mediaId")
         if (fileName != null && type != null) {
           if ((Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) && hasManageMediaPermission()) {
             restoreFromTrash(fileName, type, result)
           } else {
             result.error("PERMISSION_DENIED", "Media permission required", null)
           }
-        } else {
-          result.error("INVALID_NAME", "The file name is not specified.", null)
-        }
+        } else
+          if (mediaId != null && type != null) {
+            if ((Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) && hasManageMediaPermission()) {
+              restoreFromTrashById(mediaId, type, result)
+            } else {
+              result.error("PERMISSION_DENIED", "Media permission required", null)
+            }
+          } else {
+            result.error("INVALID_PARAMS", "Required params are not specified.", null)
+          }
       }
 
       "requestManageMediaPermission" -> {
@@ -175,6 +183,17 @@ class BackgroundServicePlugin : FlutterPlugin, MethodChannel.MethodCallHandler,
         }
       }
 
+      "hasManageMediaPermission" -> {
+        if (hasManageMediaPermission()) {
+          Log.i("Manage storage permission", "Permission already granted")
+          result.success(true)
+        } else {
+          result.success(false)
+        }
+      }
+
+      "manageMediaPermission" -> requestManageMediaPermission(result)
+
       else -> result.notImplemented()
     }
   }
@@ -224,25 +243,47 @@ class BackgroundServicePlugin : FlutterPlugin, MethodChannel.MethodCallHandler,
   }
 
   @RequiresApi(Build.VERSION_CODES.R)
-  private fun toggleTrash(contentUris: List<Uri>, isTrashed: Boolean, result: Result) {
-      val activity = activityBinding?.activity
-      val contentResolver = context?.contentResolver
-      if (activity == null || contentResolver == null) {
-        result.error("TrashError", "Activity or ContentResolver not available", null)
-        return
-      }
+  private fun restoreFromTrashById(mediaId: String, type: Int, result: Result) {
+    val id = mediaId.toLongOrNull()
+    if (id == null) {
+      result.error("INVALID_ID", "The file id is not a valid number: $mediaId", null)
+      return
+    }
+    if (!isInTrash(id)) {
+      result.error("TrashNotFound", "Item with id=$id not found in trash", null)
+      return
+    }
 
-      try {
-        val pendingIntent = MediaStore.createTrashRequest(contentResolver, contentUris, isTrashed)
-        pendingResult = result // Store for onActivityResult
-        activity.startIntentSenderForResult(
-          pendingIntent.intentSender,
-          trashRequestCode,
-          null, 0, 0, 0
-        )
-      } catch (e: Exception) {
-        Log.e("TrashError", "Error creating or starting trash request", e)
-        result.error("TrashError", "Error creating or starting trash request", null)
+    val uri = ContentUris.withAppendedId(contentUriForType(type), id)
+
+    try {
+      Log.i(TAG, "restoreFromTrashById: uri=$uri (type=$type,id=$id)")
+      restoreUris(listOf(uri), result)
+    } catch (e: Exception) {
+      Log.w(TAG, "restoreFromTrashById failed", e)
+    }
+  }
+
+  @RequiresApi(Build.VERSION_CODES.R)
+  private fun toggleTrash(contentUris: List<Uri>, isTrashed: Boolean, result: Result) {
+    val activity = activityBinding?.activity
+    val contentResolver = context?.contentResolver
+    if (activity == null || contentResolver == null) {
+      result.error("TrashError", "Activity or ContentResolver not available", null)
+      return
+    }
+
+    try {
+      val pendingIntent = MediaStore.createTrashRequest(contentResolver, contentUris, isTrashed)
+      pendingResult = result // Store for onActivityResult
+      activity.startIntentSenderForResult(
+        pendingIntent.intentSender,
+        trashRequestCode,
+        null, 0, 0, 0
+      )
+    } catch (e: Exception) {
+      Log.e("TrashError", "Error creating or starting trash request", e)
+      result.error("TrashError", "Error creating or starting trash request", null)
     }
   }
 
@@ -264,14 +305,7 @@ class BackgroundServicePlugin : FlutterPlugin, MethodChannel.MethodCallHandler,
     contentResolver.query(queryUri, projection, queryArgs, null)?.use { cursor ->
       if (cursor.moveToFirst()) {
         val id = cursor.getLong(cursor.getColumnIndexOrThrow(MediaStore.Files.FileColumns._ID))
-        // same order as AssetType from dart
-        val contentUri = when (type) {
-          1 -> MediaStore.Images.Media.EXTERNAL_CONTENT_URI
-          2 -> MediaStore.Video.Media.EXTERNAL_CONTENT_URI
-          3 -> MediaStore.Audio.Media.EXTERNAL_CONTENT_URI
-          else -> queryUri
-        }
-        return ContentUris.withAppendedId(contentUri, id)
+        return ContentUris.withAppendedId(contentUriForType(type), id)
       }
     }
     return null
@@ -315,6 +349,40 @@ class BackgroundServicePlugin : FlutterPlugin, MethodChannel.MethodCallHandler,
     }
     return false
   }
+
+  @RequiresApi(Build.VERSION_CODES.R)
+  private fun isInTrash(id: Long): Boolean {
+    val contentResolver = context?.contentResolver ?: return false
+    val filesUri = MediaStore.Files.getContentUri(MediaStore.VOLUME_EXTERNAL)
+    val args = Bundle().apply {
+      putString(ContentResolver.QUERY_ARG_SQL_SELECTION, "${MediaStore.Files.FileColumns._ID}=?")
+      putStringArray(ContentResolver.QUERY_ARG_SQL_SELECTION_ARGS, arrayOf(id.toString()))
+      putInt(MediaStore.QUERY_ARG_MATCH_TRASHED, MediaStore.MATCH_ONLY)
+      putInt(ContentResolver.QUERY_ARG_LIMIT, 1)
+    }
+    return contentResolver.query(filesUri, arrayOf(MediaStore.Files.FileColumns._ID), args, null)
+      ?.use { it.moveToFirst() } == true
+  }
+
+  @RequiresApi(Build.VERSION_CODES.R)
+  private fun restoreUris(uris: List<Uri>, result: Result) {
+    if (uris.isEmpty()) {
+      result.error("TrashError", "No URIs to restore", null)
+      return
+    }
+    Log.i(TAG, "restoreUris: count=${uris.size}, first=${uris.first()}")
+    toggleTrash(uris, false, result)
+  }
+
+  @RequiresApi(Build.VERSION_CODES.Q)
+  private fun contentUriForType(type: Int): Uri =
+    when (type) {
+      // same order as AssetType from dart
+      1 -> MediaStore.Images.Media.EXTERNAL_CONTENT_URI
+      2 -> MediaStore.Video.Media.EXTERNAL_CONTENT_URI
+      3 -> MediaStore.Audio.Media.EXTERNAL_CONTENT_URI
+      else -> MediaStore.Files.getContentUri(MediaStore.VOLUME_EXTERNAL)
+    }
 }
 
 private const val TAG = "BackgroundServicePlugin"
diff --git a/mobile/android/app/src/main/kotlin/app/alextran/immich/sync/Messages.g.kt b/mobile/android/app/src/main/kotlin/app/alextran/immich/sync/Messages.g.kt
index 08ff0e821a..e6cf92f573 100644
--- a/mobile/android/app/src/main/kotlin/app/alextran/immich/sync/Messages.g.kt
+++ b/mobile/android/app/src/main/kotlin/app/alextran/immich/sync/Messages.g.kt
@@ -305,6 +305,7 @@ interface NativeSyncApi {
   fun getAssetsForAlbum(albumId: String, updatedTimeCond: Long?): List<PlatformAsset>
   fun hashAssets(assetIds: List<String>, allowNetworkAccess: Boolean, callback: (Result<List<HashResult>>) -> Unit)
   fun cancelHashing()
+  fun getTrashedAssets(): Map<String, List<PlatformAsset>>
 
   companion object {
     /** The codec used by NativeSyncApi. */
@@ -483,6 +484,21 @@ interface NativeSyncApi {
           channel.setMessageHandler(null)
         }
       }
+      run {
+        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.immich_mobile.NativeSyncApi.getTrashedAssets$separatedMessageChannelSuffix", codec, taskQueue)
+        if (api != null) {
+          channel.setMessageHandler { _, reply ->
+            val wrapped: List<Any?> = try {
+              listOf(api.getTrashedAssets())
+            } catch (exception: Throwable) {
+              MessagesPigeonUtils.wrapError(exception)
+            }
+            reply.reply(wrapped)
+          }
+        } else {
+          channel.setMessageHandler(null)
+        }
+      }
     }
   }
 }
diff --git a/mobile/android/app/src/main/kotlin/app/alextran/immich/sync/MessagesImpl26.kt b/mobile/android/app/src/main/kotlin/app/alextran/immich/sync/MessagesImpl26.kt
index 5deacc30db..6d2c35d78f 100644
--- a/mobile/android/app/src/main/kotlin/app/alextran/immich/sync/MessagesImpl26.kt
+++ b/mobile/android/app/src/main/kotlin/app/alextran/immich/sync/MessagesImpl26.kt
@@ -21,4 +21,9 @@ class NativeSyncApiImpl26(context: Context) : NativeSyncApiImplBase(context), Na
   override fun getMediaChanges(): SyncDelta {
     throw IllegalStateException("Method not supported on this Android version.")
   }
+
+  override fun getTrashedAssets(): Map<String, List<PlatformAsset>> {
+    //Method not supported on this Android version.
+    return emptyMap()
+  }
 }
diff --git a/mobile/android/app/src/main/kotlin/app/alextran/immich/sync/MessagesImpl30.kt b/mobile/android/app/src/main/kotlin/app/alextran/immich/sync/MessagesImpl30.kt
index 052032e143..ca54c9f823 100644
--- a/mobile/android/app/src/main/kotlin/app/alextran/immich/sync/MessagesImpl30.kt
+++ b/mobile/android/app/src/main/kotlin/app/alextran/immich/sync/MessagesImpl30.kt
@@ -1,7 +1,9 @@
 package app.alextran.immich.sync
 
+import android.content.ContentResolver
 import android.content.Context
 import android.os.Build
+import android.os.Bundle
 import android.provider.MediaStore
 import androidx.annotation.RequiresApi
 import androidx.annotation.RequiresExtension
@@ -86,4 +88,29 @@ class NativeSyncApiImpl30(context: Context) : NativeSyncApiImplBase(context), Na
     // Unmounted volumes are handled in dart when the album is removed
     return SyncDelta(hasChanges, changed, deleted, assetAlbums)
   }
+
+  override fun getTrashedAssets(): Map<String, List<PlatformAsset>> {
+
+    val result = LinkedHashMap<String, MutableList<PlatformAsset>>()
+    val volumes = MediaStore.getExternalVolumeNames(ctx)
+
+    for (volume in volumes) {
+
+      val queryArgs = Bundle().apply {
+        putString(ContentResolver.QUERY_ARG_SQL_SELECTION, MEDIA_SELECTION)
+        putStringArray(ContentResolver.QUERY_ARG_SQL_SELECTION_ARGS, MEDIA_SELECTION_ARGS)
+        putInt(MediaStore.QUERY_ARG_MATCH_TRASHED, MediaStore.MATCH_ONLY)
+      }
+
+      getCursor(volume, queryArgs).use { cursor ->
+        getAssets(cursor).forEach { res ->
+          if (res is AssetResult.ValidAsset) {
+            result.getOrPut(res.albumId) { mutableListOf() }.add(res.asset)
+          }
+        }
+      }
+    }
+
+    return result.mapValues { it.value.toList() }
+  }
 }
diff --git a/mobile/android/app/src/main/kotlin/app/alextran/immich/sync/MessagesImplBase.kt b/mobile/android/app/src/main/kotlin/app/alextran/immich/sync/MessagesImplBase.kt
index ca2781f7b4..b1e9dd7d44 100644
--- a/mobile/android/app/src/main/kotlin/app/alextran/immich/sync/MessagesImplBase.kt
+++ b/mobile/android/app/src/main/kotlin/app/alextran/immich/sync/MessagesImplBase.kt
@@ -4,6 +4,8 @@ import android.annotation.SuppressLint
 import android.content.ContentUris
 import android.content.Context
 import android.database.Cursor
+import android.net.Uri
+import android.os.Bundle
 import android.provider.MediaStore
 import android.util.Base64
 import androidx.core.database.getStringOrNull
@@ -81,6 +83,16 @@ open class NativeSyncApiImplBase(context: Context) : ImmichPlugin() {
     sortOrder,
   )
 
+  protected fun getCursor(
+    volume: String,
+    queryArgs: Bundle
+  ): Cursor? = ctx.contentResolver.query(
+    MediaStore.Files.getContentUri(volume),
+    ASSET_PROJECTION,
+    queryArgs,
+    null
+  )
+
   protected fun getAssets(cursor: Cursor?): Sequence<AssetResult> {
     return sequence {
       cursor?.use { c ->
diff --git a/mobile/drift_schemas/main/drift_schema_v13.json b/mobile/drift_schemas/main/drift_schema_v13.json
new file mode 100644
index 0000000000..e527e8d78a
--- /dev/null
+++ b/mobile/drift_schemas/main/drift_schema_v13.json
@@ -0,0 +1 @@
+{"_meta":{"description":"This file contains a serialized version of schema entities for drift.","version":"1.2.0"},"options":{"store_date_time_values_as_text":true},"entities":[{"id":0,"references":[],"type":"table","data":{"name":"user_entity","was_declared_in_moor":false,"columns":[{"name":"id","getter_name":"id","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"name","getter_name":"name","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"email","getter_name":"email","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"has_profile_image","getter_name":"hasProfileImage","moor_type":"bool","nullable":false,"customConstraints":null,"defaultConstraints":"CHECK (\"has_profile_image\" IN (0, 1))","dialectAwareDefaultConstraints":{"sqlite":"CHECK (\"has_profile_image\" IN (0, 1))"},"default_dart":"const CustomExpression('0')","default_client_dart":null,"dsl_features":[]},{"name":"profile_changed_at","getter_name":"profileChangedAt","moor_type":"dateTime","nullable":false,"customConstraints":null,"default_dart":"const CustomExpression('CURRENT_TIMESTAMP')","default_client_dart":null,"dsl_features":[]},{"name":"avatar_color","getter_name":"avatarColor","moor_type":"int","nullable":false,"customConstraints":null,"default_dart":"const CustomExpression('0')","default_client_dart":null,"dsl_features":[],"type_converter":{"dart_expr":"const EnumIndexConverter<AvatarColor>(AvatarColor.values)","dart_type_name":"AvatarColor"}}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["id"]}},{"id":1,"references":[0],"type":"table","data":{"name":"remote_asset_entity","was_declared_in_moor":false,"columns":[{"name":"name","getter_name":"name","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"type","getter_name":"type","moor_type":"int","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[],"type_converter":{"dart_expr":"const EnumIndexConverter<AssetType>(AssetType.values)","dart_type_name":"AssetType"}},{"name":"created_at","getter_name":"createdAt","moor_type":"dateTime","nullable":false,"customConstraints":null,"default_dart":"const CustomExpression('CURRENT_TIMESTAMP')","default_client_dart":null,"dsl_features":[]},{"name":"updated_at","getter_name":"updatedAt","moor_type":"dateTime","nullable":false,"customConstraints":null,"default_dart":"const CustomExpression('CURRENT_TIMESTAMP')","default_client_dart":null,"dsl_features":[]},{"name":"width","getter_name":"width","moor_type":"int","nullable":true,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"height","getter_name":"height","moor_type":"int","nullable":true,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"duration_in_seconds","getter_name":"durationInSeconds","moor_type":"int","nullable":true,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"id","getter_name":"id","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"checksum","getter_name":"checksum","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"is_favorite","getter_name":"isFavorite","moor_type":"bool","nullable":false,"customConstraints":null,"defaultConstraints":"CHECK (\"is_favorite\" IN (0, 1))","dialectAwareDefaultConstraints":{"sqlite":"CHECK (\"is_favorite\" IN (0, 1))"},"default_dart":"const CustomExpression('0')","default_client_dart":null,"dsl_features":[]},{"name":"owner_id","getter_name":"ownerId","moor_type":"string","nullable":false,"customConstraints":null,"defaultConstraints":"REFERENCES user_entity (id) ON DELETE CASCADE","dialectAwareDefaultConstraints":{"sqlite":"REFERENCES user_entity (id) ON DELETE CASCADE"},"default_dart":null,"default_client_dart":null,"dsl_features":["unknown"]},{"name":"local_date_time","getter_name":"localDateTime","moor_type":"dateTime","nullable":true,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"thumb_hash","getter_name":"thumbHash","moor_type":"string","nullable":true,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"deleted_at","getter_name":"deletedAt","moor_type":"dateTime","nullable":true,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"live_photo_video_id","getter_name":"livePhotoVideoId","moor_type":"string","nullable":true,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"visibility","getter_name":"visibility","moor_type":"int","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[],"type_converter":{"dart_expr":"const EnumIndexConverter<AssetVisibility>(AssetVisibility.values)","dart_type_name":"AssetVisibility"}},{"name":"stack_id","getter_name":"stackId","moor_type":"string","nullable":true,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"library_id","getter_name":"libraryId","moor_type":"string","nullable":true,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["id"]}},{"id":2,"references":[0],"type":"table","data":{"name":"stack_entity","was_declared_in_moor":false,"columns":[{"name":"id","getter_name":"id","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"created_at","getter_name":"createdAt","moor_type":"dateTime","nullable":false,"customConstraints":null,"default_dart":"const CustomExpression('CURRENT_TIMESTAMP')","default_client_dart":null,"dsl_features":[]},{"name":"updated_at","getter_name":"updatedAt","moor_type":"dateTime","nullable":false,"customConstraints":null,"default_dart":"const CustomExpression('CURRENT_TIMESTAMP')","default_client_dart":null,"dsl_features":[]},{"name":"owner_id","getter_name":"ownerId","moor_type":"string","nullable":false,"customConstraints":null,"defaultConstraints":"REFERENCES user_entity (id) ON DELETE CASCADE","dialectAwareDefaultConstraints":{"sqlite":"REFERENCES user_entity (id) ON DELETE CASCADE"},"default_dart":null,"default_client_dart":null,"dsl_features":["unknown"]},{"name":"primary_asset_id","getter_name":"primaryAssetId","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["id"]}},{"id":3,"references":[],"type":"table","data":{"name":"local_asset_entity","was_declared_in_moor":false,"columns":[{"name":"name","getter_name":"name","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"type","getter_name":"type","moor_type":"int","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[],"type_converter":{"dart_expr":"const EnumIndexConverter<AssetType>(AssetType.values)","dart_type_name":"AssetType"}},{"name":"created_at","getter_name":"createdAt","moor_type":"dateTime","nullable":false,"customConstraints":null,"default_dart":"const CustomExpression('CURRENT_TIMESTAMP')","default_client_dart":null,"dsl_features":[]},{"name":"updated_at","getter_name":"updatedAt","moor_type":"dateTime","nullable":false,"customConstraints":null,"default_dart":"const CustomExpression('CURRENT_TIMESTAMP')","default_client_dart":null,"dsl_features":[]},{"name":"width","getter_name":"width","moor_type":"int","nullable":true,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"height","getter_name":"height","moor_type":"int","nullable":true,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"duration_in_seconds","getter_name":"durationInSeconds","moor_type":"int","nullable":true,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"id","getter_name":"id","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"checksum","getter_name":"checksum","moor_type":"string","nullable":true,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"is_favorite","getter_name":"isFavorite","moor_type":"bool","nullable":false,"customConstraints":null,"defaultConstraints":"CHECK (\"is_favorite\" IN (0, 1))","dialectAwareDefaultConstraints":{"sqlite":"CHECK (\"is_favorite\" IN (0, 1))"},"default_dart":"const CustomExpression('0')","default_client_dart":null,"dsl_features":[]},{"name":"orientation","getter_name":"orientation","moor_type":"int","nullable":false,"customConstraints":null,"default_dart":"const CustomExpression('0')","default_client_dart":null,"dsl_features":[]}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["id"]}},{"id":4,"references":[0,1],"type":"table","data":{"name":"remote_album_entity","was_declared_in_moor":false,"columns":[{"name":"id","getter_name":"id","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"name","getter_name":"name","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"description","getter_name":"description","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":"const CustomExpression('\\'\\'')","default_client_dart":null,"dsl_features":[]},{"name":"created_at","getter_name":"createdAt","moor_type":"dateTime","nullable":false,"customConstraints":null,"default_dart":"const CustomExpression('CURRENT_TIMESTAMP')","default_client_dart":null,"dsl_features":[]},{"name":"updated_at","getter_name":"updatedAt","moor_type":"dateTime","nullable":false,"customConstraints":null,"default_dart":"const CustomExpression('CURRENT_TIMESTAMP')","default_client_dart":null,"dsl_features":[]},{"name":"owner_id","getter_name":"ownerId","moor_type":"string","nullable":false,"customConstraints":null,"defaultConstraints":"REFERENCES user_entity (id) ON DELETE CASCADE","dialectAwareDefaultConstraints":{"sqlite":"REFERENCES user_entity (id) ON DELETE CASCADE"},"default_dart":null,"default_client_dart":null,"dsl_features":["unknown"]},{"name":"thumbnail_asset_id","getter_name":"thumbnailAssetId","moor_type":"string","nullable":true,"customConstraints":null,"defaultConstraints":"REFERENCES remote_asset_entity (id) ON DELETE SET NULL","dialectAwareDefaultConstraints":{"sqlite":"REFERENCES remote_asset_entity (id) ON DELETE SET NULL"},"default_dart":null,"default_client_dart":null,"dsl_features":["unknown"]},{"name":"is_activity_enabled","getter_name":"isActivityEnabled","moor_type":"bool","nullable":false,"customConstraints":null,"defaultConstraints":"CHECK (\"is_activity_enabled\" IN (0, 1))","dialectAwareDefaultConstraints":{"sqlite":"CHECK (\"is_activity_enabled\" IN (0, 1))"},"default_dart":"const CustomExpression('1')","default_client_dart":null,"dsl_features":[]},{"name":"order","getter_name":"order","moor_type":"int","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[],"type_converter":{"dart_expr":"const EnumIndexConverter<AlbumAssetOrder>(AlbumAssetOrder.values)","dart_type_name":"AlbumAssetOrder"}}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["id"]}},{"id":5,"references":[4],"type":"table","data":{"name":"local_album_entity","was_declared_in_moor":false,"columns":[{"name":"id","getter_name":"id","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"name","getter_name":"name","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"updated_at","getter_name":"updatedAt","moor_type":"dateTime","nullable":false,"customConstraints":null,"default_dart":"const CustomExpression('CURRENT_TIMESTAMP')","default_client_dart":null,"dsl_features":[]},{"name":"backup_selection","getter_name":"backupSelection","moor_type":"int","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[],"type_converter":{"dart_expr":"const EnumIndexConverter<BackupSelection>(BackupSelection.values)","dart_type_name":"BackupSelection"}},{"name":"is_ios_shared_album","getter_name":"isIosSharedAlbum","moor_type":"bool","nullable":false,"customConstraints":null,"defaultConstraints":"CHECK (\"is_ios_shared_album\" IN (0, 1))","dialectAwareDefaultConstraints":{"sqlite":"CHECK (\"is_ios_shared_album\" IN (0, 1))"},"default_dart":"const CustomExpression('0')","default_client_dart":null,"dsl_features":[]},{"name":"linked_remote_album_id","getter_name":"linkedRemoteAlbumId","moor_type":"string","nullable":true,"customConstraints":null,"defaultConstraints":"REFERENCES remote_album_entity (id) ON DELETE SET NULL","dialectAwareDefaultConstraints":{"sqlite":"REFERENCES remote_album_entity (id) ON DELETE SET NULL"},"default_dart":null,"default_client_dart":null,"dsl_features":["unknown"]},{"name":"marker","getter_name":"marker_","moor_type":"bool","nullable":true,"customConstraints":null,"defaultConstraints":"CHECK (\"marker\" IN (0, 1))","dialectAwareDefaultConstraints":{"sqlite":"CHECK (\"marker\" IN (0, 1))"},"default_dart":null,"default_client_dart":null,"dsl_features":[]}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["id"]}},{"id":6,"references":[3,5],"type":"table","data":{"name":"local_album_asset_entity","was_declared_in_moor":false,"columns":[{"name":"asset_id","getter_name":"assetId","moor_type":"string","nullable":false,"customConstraints":null,"defaultConstraints":"REFERENCES local_asset_entity (id) ON DELETE CASCADE","dialectAwareDefaultConstraints":{"sqlite":"REFERENCES local_asset_entity (id) ON DELETE CASCADE"},"default_dart":null,"default_client_dart":null,"dsl_features":["unknown"]},{"name":"album_id","getter_name":"albumId","moor_type":"string","nullable":false,"customConstraints":null,"defaultConstraints":"REFERENCES local_album_entity (id) ON DELETE CASCADE","dialectAwareDefaultConstraints":{"sqlite":"REFERENCES local_album_entity (id) ON DELETE CASCADE"},"default_dart":null,"default_client_dart":null,"dsl_features":["unknown"]},{"name":"marker","getter_name":"marker_","moor_type":"bool","nullable":true,"customConstraints":null,"defaultConstraints":"CHECK (\"marker\" IN (0, 1))","dialectAwareDefaultConstraints":{"sqlite":"CHECK (\"marker\" IN (0, 1))"},"default_dart":null,"default_client_dart":null,"dsl_features":[]}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["asset_id","album_id"]}},{"id":7,"references":[3],"type":"index","data":{"on":3,"name":"idx_local_asset_checksum","sql":"CREATE INDEX IF NOT EXISTS idx_local_asset_checksum ON local_asset_entity (checksum)","unique":false,"columns":[]}},{"id":8,"references":[1],"type":"index","data":{"on":1,"name":"idx_remote_asset_owner_checksum","sql":"CREATE INDEX IF NOT EXISTS idx_remote_asset_owner_checksum ON remote_asset_entity (owner_id, checksum)","unique":false,"columns":[]}},{"id":9,"references":[1],"type":"index","data":{"on":1,"name":"UQ_remote_assets_owner_checksum","sql":"CREATE UNIQUE INDEX IF NOT EXISTS UQ_remote_assets_owner_checksum\nON remote_asset_entity (owner_id, checksum)\nWHERE (library_id IS NULL);\n","unique":true,"columns":[]}},{"id":10,"references":[1],"type":"index","data":{"on":1,"name":"UQ_remote_assets_owner_library_checksum","sql":"CREATE UNIQUE INDEX IF NOT EXISTS UQ_remote_assets_owner_library_checksum\nON remote_asset_entity (owner_id, library_id, checksum)\nWHERE (library_id IS NOT NULL);\n","unique":true,"columns":[]}},{"id":11,"references":[1],"type":"index","data":{"on":1,"name":"idx_remote_asset_checksum","sql":"CREATE INDEX IF NOT EXISTS idx_remote_asset_checksum ON remote_asset_entity (checksum)","unique":false,"columns":[]}},{"id":12,"references":[],"type":"table","data":{"name":"auth_user_entity","was_declared_in_moor":false,"columns":[{"name":"id","getter_name":"id","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"name","getter_name":"name","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"email","getter_name":"email","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"is_admin","getter_name":"isAdmin","moor_type":"bool","nullable":false,"customConstraints":null,"defaultConstraints":"CHECK (\"is_admin\" IN (0, 1))","dialectAwareDefaultConstraints":{"sqlite":"CHECK (\"is_admin\" IN (0, 1))"},"default_dart":"const CustomExpression('0')","default_client_dart":null,"dsl_features":[]},{"name":"has_profile_image","getter_name":"hasProfileImage","moor_type":"bool","nullable":false,"customConstraints":null,"defaultConstraints":"CHECK (\"has_profile_image\" IN (0, 1))","dialectAwareDefaultConstraints":{"sqlite":"CHECK (\"has_profile_image\" IN (0, 1))"},"default_dart":"const CustomExpression('0')","default_client_dart":null,"dsl_features":[]},{"name":"profile_changed_at","getter_name":"profileChangedAt","moor_type":"dateTime","nullable":false,"customConstraints":null,"default_dart":"const CustomExpression('CURRENT_TIMESTAMP')","default_client_dart":null,"dsl_features":[]},{"name":"avatar_color","getter_name":"avatarColor","moor_type":"int","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[],"type_converter":{"dart_expr":"const EnumIndexConverter<AvatarColor>(AvatarColor.values)","dart_type_name":"AvatarColor"}},{"name":"quota_size_in_bytes","getter_name":"quotaSizeInBytes","moor_type":"int","nullable":false,"customConstraints":null,"default_dart":"const CustomExpression('0')","default_client_dart":null,"dsl_features":[]},{"name":"quota_usage_in_bytes","getter_name":"quotaUsageInBytes","moor_type":"int","nullable":false,"customConstraints":null,"default_dart":"const CustomExpression('0')","default_client_dart":null,"dsl_features":[]},{"name":"pin_code","getter_name":"pinCode","moor_type":"string","nullable":true,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["id"]}},{"id":13,"references":[0],"type":"table","data":{"name":"user_metadata_entity","was_declared_in_moor":false,"columns":[{"name":"user_id","getter_name":"userId","moor_type":"string","nullable":false,"customConstraints":null,"defaultConstraints":"REFERENCES user_entity (id) ON DELETE CASCADE","dialectAwareDefaultConstraints":{"sqlite":"REFERENCES user_entity (id) ON DELETE CASCADE"},"default_dart":null,"default_client_dart":null,"dsl_features":["unknown"]},{"name":"key","getter_name":"key","moor_type":"int","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[],"type_converter":{"dart_expr":"const EnumIndexConverter<UserMetadataKey>(UserMetadataKey.values)","dart_type_name":"UserMetadataKey"}},{"name":"value","getter_name":"value","moor_type":"blob","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[],"type_converter":{"dart_expr":"userMetadataConverter","dart_type_name":"Map<String, Object?>"}}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["user_id","key"]}},{"id":14,"references":[0],"type":"table","data":{"name":"partner_entity","was_declared_in_moor":false,"columns":[{"name":"shared_by_id","getter_name":"sharedById","moor_type":"string","nullable":false,"customConstraints":null,"defaultConstraints":"REFERENCES user_entity (id) ON DELETE CASCADE","dialectAwareDefaultConstraints":{"sqlite":"REFERENCES user_entity (id) ON DELETE CASCADE"},"default_dart":null,"default_client_dart":null,"dsl_features":["unknown"]},{"name":"shared_with_id","getter_name":"sharedWithId","moor_type":"string","nullable":false,"customConstraints":null,"defaultConstraints":"REFERENCES user_entity (id) ON DELETE CASCADE","dialectAwareDefaultConstraints":{"sqlite":"REFERENCES user_entity (id) ON DELETE CASCADE"},"default_dart":null,"default_client_dart":null,"dsl_features":["unknown"]},{"name":"in_timeline","getter_name":"inTimeline","moor_type":"bool","nullable":false,"customConstraints":null,"defaultConstraints":"CHECK (\"in_timeline\" IN (0, 1))","dialectAwareDefaultConstraints":{"sqlite":"CHECK (\"in_timeline\" IN (0, 1))"},"default_dart":"const CustomExpression('0')","default_client_dart":null,"dsl_features":[]}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["shared_by_id","shared_with_id"]}},{"id":15,"references":[1],"type":"table","data":{"name":"remote_exif_entity","was_declared_in_moor":false,"columns":[{"name":"asset_id","getter_name":"assetId","moor_type":"string","nullable":false,"customConstraints":null,"defaultConstraints":"REFERENCES remote_asset_entity (id) ON DELETE CASCADE","dialectAwareDefaultConstraints":{"sqlite":"REFERENCES remote_asset_entity (id) ON DELETE CASCADE"},"default_dart":null,"default_client_dart":null,"dsl_features":["unknown"]},{"name":"city","getter_name":"city","moor_type":"string","nullable":true,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"state","getter_name":"state","moor_type":"string","nullable":true,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"country","getter_name":"country","moor_type":"string","nullable":true,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"date_time_original","getter_name":"dateTimeOriginal","moor_type":"dateTime","nullable":true,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"description","getter_name":"description","moor_type":"string","nullable":true,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"height","getter_name":"height","moor_type":"int","nullable":true,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"width","getter_name":"width","moor_type":"int","nullable":true,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"exposure_time","getter_name":"exposureTime","moor_type":"string","nullable":true,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"f_number","getter_name":"fNumber","moor_type":"double","nullable":true,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"file_size","getter_name":"fileSize","moor_type":"int","nullable":true,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"focal_length","getter_name":"focalLength","moor_type":"double","nullable":true,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"latitude","getter_name":"latitude","moor_type":"double","nullable":true,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"longitude","getter_name":"longitude","moor_type":"double","nullable":true,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"iso","getter_name":"iso","moor_type":"int","nullable":true,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"make","getter_name":"make","moor_type":"string","nullable":true,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"model","getter_name":"model","moor_type":"string","nullable":true,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"lens","getter_name":"lens","moor_type":"string","nullable":true,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"orientation","getter_name":"orientation","moor_type":"string","nullable":true,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"time_zone","getter_name":"timeZone","moor_type":"string","nullable":true,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"rating","getter_name":"rating","moor_type":"int","nullable":true,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"projection_type","getter_name":"projectionType","moor_type":"string","nullable":true,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["asset_id"]}},{"id":16,"references":[1,4],"type":"table","data":{"name":"remote_album_asset_entity","was_declared_in_moor":false,"columns":[{"name":"asset_id","getter_name":"assetId","moor_type":"string","nullable":false,"customConstraints":null,"defaultConstraints":"REFERENCES remote_asset_entity (id) ON DELETE CASCADE","dialectAwareDefaultConstraints":{"sqlite":"REFERENCES remote_asset_entity (id) ON DELETE CASCADE"},"default_dart":null,"default_client_dart":null,"dsl_features":["unknown"]},{"name":"album_id","getter_name":"albumId","moor_type":"string","nullable":false,"customConstraints":null,"defaultConstraints":"REFERENCES remote_album_entity (id) ON DELETE CASCADE","dialectAwareDefaultConstraints":{"sqlite":"REFERENCES remote_album_entity (id) ON DELETE CASCADE"},"default_dart":null,"default_client_dart":null,"dsl_features":["unknown"]}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["asset_id","album_id"]}},{"id":17,"references":[4,0],"type":"table","data":{"name":"remote_album_user_entity","was_declared_in_moor":false,"columns":[{"name":"album_id","getter_name":"albumId","moor_type":"string","nullable":false,"customConstraints":null,"defaultConstraints":"REFERENCES remote_album_entity (id) ON DELETE CASCADE","dialectAwareDefaultConstraints":{"sqlite":"REFERENCES remote_album_entity (id) ON DELETE CASCADE"},"default_dart":null,"default_client_dart":null,"dsl_features":["unknown"]},{"name":"user_id","getter_name":"userId","moor_type":"string","nullable":false,"customConstraints":null,"defaultConstraints":"REFERENCES user_entity (id) ON DELETE CASCADE","dialectAwareDefaultConstraints":{"sqlite":"REFERENCES user_entity (id) ON DELETE CASCADE"},"default_dart":null,"default_client_dart":null,"dsl_features":["unknown"]},{"name":"role","getter_name":"role","moor_type":"int","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[],"type_converter":{"dart_expr":"const EnumIndexConverter<AlbumUserRole>(AlbumUserRole.values)","dart_type_name":"AlbumUserRole"}}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["album_id","user_id"]}},{"id":18,"references":[0],"type":"table","data":{"name":"memory_entity","was_declared_in_moor":false,"columns":[{"name":"id","getter_name":"id","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"created_at","getter_name":"createdAt","moor_type":"dateTime","nullable":false,"customConstraints":null,"default_dart":"const CustomExpression('CURRENT_TIMESTAMP')","default_client_dart":null,"dsl_features":[]},{"name":"updated_at","getter_name":"updatedAt","moor_type":"dateTime","nullable":false,"customConstraints":null,"default_dart":"const CustomExpression('CURRENT_TIMESTAMP')","default_client_dart":null,"dsl_features":[]},{"name":"deleted_at","getter_name":"deletedAt","moor_type":"dateTime","nullable":true,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"owner_id","getter_name":"ownerId","moor_type":"string","nullable":false,"customConstraints":null,"defaultConstraints":"REFERENCES user_entity (id) ON DELETE CASCADE","dialectAwareDefaultConstraints":{"sqlite":"REFERENCES user_entity (id) ON DELETE CASCADE"},"default_dart":null,"default_client_dart":null,"dsl_features":["unknown"]},{"name":"type","getter_name":"type","moor_type":"int","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[],"type_converter":{"dart_expr":"const EnumIndexConverter<MemoryTypeEnum>(MemoryTypeEnum.values)","dart_type_name":"MemoryTypeEnum"}},{"name":"data","getter_name":"data","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"is_saved","getter_name":"isSaved","moor_type":"bool","nullable":false,"customConstraints":null,"defaultConstraints":"CHECK (\"is_saved\" IN (0, 1))","dialectAwareDefaultConstraints":{"sqlite":"CHECK (\"is_saved\" IN (0, 1))"},"default_dart":"const CustomExpression('0')","default_client_dart":null,"dsl_features":[]},{"name":"memory_at","getter_name":"memoryAt","moor_type":"dateTime","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"seen_at","getter_name":"seenAt","moor_type":"dateTime","nullable":true,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"show_at","getter_name":"showAt","moor_type":"dateTime","nullable":true,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"hide_at","getter_name":"hideAt","moor_type":"dateTime","nullable":true,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["id"]}},{"id":19,"references":[1,18],"type":"table","data":{"name":"memory_asset_entity","was_declared_in_moor":false,"columns":[{"name":"asset_id","getter_name":"assetId","moor_type":"string","nullable":false,"customConstraints":null,"defaultConstraints":"REFERENCES remote_asset_entity (id) ON DELETE CASCADE","dialectAwareDefaultConstraints":{"sqlite":"REFERENCES remote_asset_entity (id) ON DELETE CASCADE"},"default_dart":null,"default_client_dart":null,"dsl_features":["unknown"]},{"name":"memory_id","getter_name":"memoryId","moor_type":"string","nullable":false,"customConstraints":null,"defaultConstraints":"REFERENCES memory_entity (id) ON DELETE CASCADE","dialectAwareDefaultConstraints":{"sqlite":"REFERENCES memory_entity (id) ON DELETE CASCADE"},"default_dart":null,"default_client_dart":null,"dsl_features":["unknown"]}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["asset_id","memory_id"]}},{"id":20,"references":[0],"type":"table","data":{"name":"person_entity","was_declared_in_moor":false,"columns":[{"name":"id","getter_name":"id","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"created_at","getter_name":"createdAt","moor_type":"dateTime","nullable":false,"customConstraints":null,"default_dart":"const CustomExpression('CURRENT_TIMESTAMP')","default_client_dart":null,"dsl_features":[]},{"name":"updated_at","getter_name":"updatedAt","moor_type":"dateTime","nullable":false,"customConstraints":null,"default_dart":"const CustomExpression('CURRENT_TIMESTAMP')","default_client_dart":null,"dsl_features":[]},{"name":"owner_id","getter_name":"ownerId","moor_type":"string","nullable":false,"customConstraints":null,"defaultConstraints":"REFERENCES user_entity (id) ON DELETE CASCADE","dialectAwareDefaultConstraints":{"sqlite":"REFERENCES user_entity (id) ON DELETE CASCADE"},"default_dart":null,"default_client_dart":null,"dsl_features":["unknown"]},{"name":"name","getter_name":"name","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"face_asset_id","getter_name":"faceAssetId","moor_type":"string","nullable":true,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"is_favorite","getter_name":"isFavorite","moor_type":"bool","nullable":false,"customConstraints":null,"defaultConstraints":"CHECK (\"is_favorite\" IN (0, 1))","dialectAwareDefaultConstraints":{"sqlite":"CHECK (\"is_favorite\" IN (0, 1))"},"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"is_hidden","getter_name":"isHidden","moor_type":"bool","nullable":false,"customConstraints":null,"defaultConstraints":"CHECK (\"is_hidden\" IN (0, 1))","dialectAwareDefaultConstraints":{"sqlite":"CHECK (\"is_hidden\" IN (0, 1))"},"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"color","getter_name":"color","moor_type":"string","nullable":true,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"birth_date","getter_name":"birthDate","moor_type":"dateTime","nullable":true,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["id"]}},{"id":21,"references":[1,20],"type":"table","data":{"name":"asset_face_entity","was_declared_in_moor":false,"columns":[{"name":"id","getter_name":"id","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"asset_id","getter_name":"assetId","moor_type":"string","nullable":false,"customConstraints":null,"defaultConstraints":"REFERENCES remote_asset_entity (id) ON DELETE CASCADE","dialectAwareDefaultConstraints":{"sqlite":"REFERENCES remote_asset_entity (id) ON DELETE CASCADE"},"default_dart":null,"default_client_dart":null,"dsl_features":["unknown"]},{"name":"person_id","getter_name":"personId","moor_type":"string","nullable":true,"customConstraints":null,"defaultConstraints":"REFERENCES person_entity (id) ON DELETE SET NULL","dialectAwareDefaultConstraints":{"sqlite":"REFERENCES person_entity (id) ON DELETE SET NULL"},"default_dart":null,"default_client_dart":null,"dsl_features":["unknown"]},{"name":"image_width","getter_name":"imageWidth","moor_type":"int","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"image_height","getter_name":"imageHeight","moor_type":"int","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"bounding_box_x1","getter_name":"boundingBoxX1","moor_type":"int","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"bounding_box_y1","getter_name":"boundingBoxY1","moor_type":"int","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"bounding_box_x2","getter_name":"boundingBoxX2","moor_type":"int","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"bounding_box_y2","getter_name":"boundingBoxY2","moor_type":"int","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"source_type","getter_name":"sourceType","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["id"]}},{"id":22,"references":[],"type":"table","data":{"name":"store_entity","was_declared_in_moor":false,"columns":[{"name":"id","getter_name":"id","moor_type":"int","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"string_value","getter_name":"stringValue","moor_type":"string","nullable":true,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"int_value","getter_name":"intValue","moor_type":"int","nullable":true,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["id"]}},{"id":23,"references":[],"type":"table","data":{"name":"trashed_local_asset_entity","was_declared_in_moor":false,"columns":[{"name":"name","getter_name":"name","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"type","getter_name":"type","moor_type":"int","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[],"type_converter":{"dart_expr":"const EnumIndexConverter<AssetType>(AssetType.values)","dart_type_name":"AssetType"}},{"name":"created_at","getter_name":"createdAt","moor_type":"dateTime","nullable":false,"customConstraints":null,"default_dart":"const CustomExpression('CURRENT_TIMESTAMP')","default_client_dart":null,"dsl_features":[]},{"name":"updated_at","getter_name":"updatedAt","moor_type":"dateTime","nullable":false,"customConstraints":null,"default_dart":"const CustomExpression('CURRENT_TIMESTAMP')","default_client_dart":null,"dsl_features":[]},{"name":"width","getter_name":"width","moor_type":"int","nullable":true,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"height","getter_name":"height","moor_type":"int","nullable":true,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"duration_in_seconds","getter_name":"durationInSeconds","moor_type":"int","nullable":true,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"id","getter_name":"id","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"album_id","getter_name":"albumId","moor_type":"string","nullable":false,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"checksum","getter_name":"checksum","moor_type":"string","nullable":true,"customConstraints":null,"default_dart":null,"default_client_dart":null,"dsl_features":[]},{"name":"is_favorite","getter_name":"isFavorite","moor_type":"bool","nullable":false,"customConstraints":null,"defaultConstraints":"CHECK (\"is_favorite\" IN (0, 1))","dialectAwareDefaultConstraints":{"sqlite":"CHECK (\"is_favorite\" IN (0, 1))"},"default_dart":"const CustomExpression('0')","default_client_dart":null,"dsl_features":[]},{"name":"orientation","getter_name":"orientation","moor_type":"int","nullable":false,"customConstraints":null,"default_dart":"const CustomExpression('0')","default_client_dart":null,"dsl_features":[]}],"is_virtual":false,"without_rowid":true,"constraints":[],"strict":true,"explicit_pk":["id","album_id"]}},{"id":24,"references":[15],"type":"index","data":{"on":15,"name":"idx_lat_lng","sql":"CREATE INDEX IF NOT EXISTS idx_lat_lng ON remote_exif_entity (latitude, longitude)","unique":false,"columns":[]}},{"id":25,"references":[23],"type":"index","data":{"on":23,"name":"idx_trashed_local_asset_checksum","sql":"CREATE INDEX IF NOT EXISTS idx_trashed_local_asset_checksum ON trashed_local_asset_entity (checksum)","unique":false,"columns":[]}},{"id":26,"references":[23],"type":"index","data":{"on":23,"name":"idx_trashed_local_asset_album","sql":"CREATE INDEX IF NOT EXISTS idx_trashed_local_asset_album ON trashed_local_asset_entity (album_id)","unique":false,"columns":[]}}]}
\ No newline at end of file
diff --git a/mobile/ios/Runner/Sync/Messages.g.swift b/mobile/ios/Runner/Sync/Messages.g.swift
index 6bcafb9215..bbe18e7375 100644
--- a/mobile/ios/Runner/Sync/Messages.g.swift
+++ b/mobile/ios/Runner/Sync/Messages.g.swift
@@ -364,6 +364,7 @@ protocol NativeSyncApi {
   func getAssetsForAlbum(albumId: String, updatedTimeCond: Int64?) throws -> [PlatformAsset]
   func hashAssets(assetIds: [String], allowNetworkAccess: Bool, completion: @escaping (Result<[HashResult], Error>) -> Void)
   func cancelHashing() throws
+  func getTrashedAssets() throws -> [String: [PlatformAsset]]
 }
 
 /// Generated setup class from Pigeon to handle messages through the `binaryMessenger`.
@@ -532,5 +533,20 @@ class NativeSyncApiSetup {
     } else {
       cancelHashingChannel.setMessageHandler(nil)
     }
+    let getTrashedAssetsChannel = taskQueue == nil
+      ? FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.NativeSyncApi.getTrashedAssets\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec)
+      : FlutterBasicMessageChannel(name: "dev.flutter.pigeon.immich_mobile.NativeSyncApi.getTrashedAssets\(channelSuffix)", binaryMessenger: binaryMessenger, codec: codec, taskQueue: taskQueue)
+    if let api = api {
+      getTrashedAssetsChannel.setMessageHandler { _, reply in
+        do {
+          let result = try api.getTrashedAssets()
+          reply(wrapResult(result))
+        } catch {
+          reply(wrapError(error))
+        }
+      }
+    } else {
+      getTrashedAssetsChannel.setMessageHandler(nil)
+    }
   }
 }
diff --git a/mobile/ios/Runner/Sync/MessagesImpl.swift b/mobile/ios/Runner/Sync/MessagesImpl.swift
index 75981fb7ea..03493f57ca 100644
--- a/mobile/ios/Runner/Sync/MessagesImpl.swift
+++ b/mobile/ios/Runner/Sync/MessagesImpl.swift
@@ -3,15 +3,15 @@ import CryptoKit
 
 struct AssetWrapper: Hashable, Equatable {
   let asset: PlatformAsset
-  
+
   init(with asset: PlatformAsset) {
     self.asset = asset
   }
-  
+
   func hash(into hasher: inout Hasher) {
     hasher.combine(self.asset.id)
   }
-  
+
   static func == (lhs: AssetWrapper, rhs: AssetWrapper) -> Bool {
     return lhs.asset.id == rhs.asset.id
   }
@@ -19,31 +19,31 @@ struct AssetWrapper: Hashable, Equatable {
 
 class NativeSyncApiImpl: ImmichPlugin, NativeSyncApi, FlutterPlugin {
   static let name = "NativeSyncApi"
-  
+
   static func register(with registrar: any FlutterPluginRegistrar) {
     let instance = NativeSyncApiImpl()
     NativeSyncApiSetup.setUp(binaryMessenger: registrar.messenger(), api: instance)
     registrar.publish(instance)
   }
-  
+
   func detachFromEngine(for registrar: any FlutterPluginRegistrar) {
     super.detachFromEngine()
   }
-  
+
   private let defaults: UserDefaults
   private let changeTokenKey = "immich:changeToken"
   private let albumTypes: [PHAssetCollectionType] = [.album, .smartAlbum]
   private let recoveredAlbumSubType = 1000000219
-  
+
   private var hashTask: Task<Void?, Error>?
   private static let hashCancelledCode = "HASH_CANCELLED"
   private static let hashCancelled = Result<[HashResult], Error>.failure(PigeonError(code: hashCancelledCode, message: "Hashing cancelled", details: nil))
-  
-  
+
+
   init(with defaults: UserDefaults = .standard) {
     self.defaults = defaults
   }
-  
+
   @available(iOS 16, *)
   private func getChangeToken() -> PHPersistentChangeToken? {
     guard let data = defaults.data(forKey: changeTokenKey) else {
@@ -51,7 +51,7 @@ class NativeSyncApiImpl: ImmichPlugin, NativeSyncApi, FlutterPlugin {
     }
     return try? NSKeyedUnarchiver.unarchivedObject(ofClass: PHPersistentChangeToken.self, from: data)
   }
-  
+
   @available(iOS 16, *)
   private func saveChangeToken(token: PHPersistentChangeToken) -> Void {
     guard let data = try? NSKeyedArchiver.archivedData(withRootObject: token, requiringSecureCoding: true) else {
@@ -59,18 +59,18 @@ class NativeSyncApiImpl: ImmichPlugin, NativeSyncApi, FlutterPlugin {
     }
     defaults.set(data, forKey: changeTokenKey)
   }
-  
+
   func clearSyncCheckpoint() -> Void {
     defaults.removeObject(forKey: changeTokenKey)
   }
-  
+
   func checkpointSync() {
     guard #available(iOS 16, *) else {
       return
     }
     saveChangeToken(token: PHPhotoLibrary.shared().currentChangeToken)
   }
-  
+
   func shouldFullSync() -> Bool {
     guard #available(iOS 16, *),
           PHPhotoLibrary.authorizationStatus(for: .readWrite) == .authorized,
@@ -78,36 +78,36 @@ class NativeSyncApiImpl: ImmichPlugin, NativeSyncApi, FlutterPlugin {
       // When we do not have access to photo library, older iOS version or No token available, fallback to full sync
       return true
     }
-    
+
     guard let _ = try? PHPhotoLibrary.shared().fetchPersistentChanges(since: storedToken) else {
       // Cannot fetch persistent changes
       return true
     }
-    
+
     return false
   }
-  
+
   func getAlbums() throws -> [PlatformAlbum] {
     var albums: [PlatformAlbum] = []
-    
+
     albumTypes.forEach { type in
       let collections = PHAssetCollection.fetchAssetCollections(with: type, subtype: .any, options: nil)
       for i in 0..<collections.count {
         let album = collections.object(at: i)
-        
+
         // Ignore recovered album
         if(album.assetCollectionSubtype.rawValue == self.recoveredAlbumSubType) {
           continue;
         }
-        
+
         let options = PHFetchOptions()
         options.sortDescriptors = [NSSortDescriptor(key: "modificationDate", ascending: false)]
         options.includeHiddenAssets = false
-        
+
         let assets = getAssetsFromAlbum(in: album, options: options)
-        
+
         let isCloud = album.assetCollectionSubtype == .albumCloudShared || album.assetCollectionSubtype == .albumMyPhotoStream
-        
+
         var domainAlbum = PlatformAlbum(
           id: album.localIdentifier,
           name: album.localizedTitle!,
@@ -115,57 +115,57 @@ class NativeSyncApiImpl: ImmichPlugin, NativeSyncApi, FlutterPlugin {
           isCloud: isCloud,
           assetCount: Int64(assets.count)
         )
-        
+
         if let firstAsset = assets.firstObject {
           domainAlbum.updatedAt = firstAsset.modificationDate.map { Int64($0.timeIntervalSince1970) }
         }
-        
+
         albums.append(domainAlbum)
       }
     }
     return albums.sorted { $0.id < $1.id }
   }
-  
+
   func getMediaChanges() throws -> SyncDelta {
     guard #available(iOS 16, *) else {
       throw PigeonError(code: "UNSUPPORTED_OS", message: "This feature requires iOS 16 or later.", details: nil)
     }
-    
+
     guard PHPhotoLibrary.authorizationStatus(for: .readWrite) == .authorized else {
       throw PigeonError(code: "NO_AUTH", message: "No photo library access", details: nil)
     }
-    
+
     guard let storedToken = getChangeToken() else {
       // No token exists, definitely need a full sync
       print("MediaManager::getMediaChanges: No token found")
       throw PigeonError(code: "NO_TOKEN", message: "No stored change token", details: nil)
     }
-    
+
     let currentToken = PHPhotoLibrary.shared().currentChangeToken
     if storedToken == currentToken {
       return SyncDelta(hasChanges: false, updates: [], deletes: [], assetAlbums: [:])
     }
-    
+
     do {
       let changes = try PHPhotoLibrary.shared().fetchPersistentChanges(since: storedToken)
-      
+
       var updatedAssets: Set<AssetWrapper> = []
       var deletedAssets: Set<String> = []
-      
+
       for change in changes {
         guard let details = try? change.changeDetails(for: PHObjectType.asset) else { continue }
-        
+
         let updated = details.updatedLocalIdentifiers.union(details.insertedLocalIdentifiers)
         deletedAssets.formUnion(details.deletedLocalIdentifiers)
-        
+
         if (updated.isEmpty) { continue }
-        
+
         let options = PHFetchOptions()
         options.includeHiddenAssets = false
         let result = PHAsset.fetchAssets(withLocalIdentifiers: Array(updated), options: options)
         for i in 0..<result.count {
           let asset = result.object(at: i)
-          
+
           // Asset wrapper only uses the id for comparison. Multiple change can contain the same asset, skip duplicate changes
           let predicate = PlatformAsset(
             id: asset.localIdentifier,
@@ -178,25 +178,25 @@ class NativeSyncApiImpl: ImmichPlugin, NativeSyncApi, FlutterPlugin {
           if (updatedAssets.contains(AssetWrapper(with: predicate))) {
             continue
           }
-          
+
           let domainAsset = AssetWrapper(with: asset.toPlatformAsset())
           updatedAssets.insert(domainAsset)
         }
       }
-      
+
       let updates = Array(updatedAssets.map { $0.asset })
       return SyncDelta(hasChanges: true, updates: updates, deletes: Array(deletedAssets), assetAlbums: buildAssetAlbumsMap(assets: updates))
     }
   }
-  
-  
+
+
   private func buildAssetAlbumsMap(assets: Array<PlatformAsset>) -> [String: [String]] {
     guard !assets.isEmpty else {
       return [:]
     }
-    
+
     var albumAssets: [String: [String]] = [:]
-    
+
     for type in albumTypes {
       let collections = PHAssetCollection.fetchAssetCollections(with: type, subtype: .any, options: nil)
       collections.enumerateObjects { (album, _, _) in
@@ -211,13 +211,13 @@ class NativeSyncApiImpl: ImmichPlugin, NativeSyncApi, FlutterPlugin {
     }
     return albumAssets
   }
-  
+
   func getAssetIdsForAlbum(albumId: String) throws -> [String] {
     let collections = PHAssetCollection.fetchAssetCollections(withLocalIdentifiers: [albumId], options: nil)
     guard let album = collections.firstObject else {
       return []
     }
-    
+
     var ids: [String] = []
     let options = PHFetchOptions()
     options.includeHiddenAssets = false
@@ -227,13 +227,13 @@ class NativeSyncApiImpl: ImmichPlugin, NativeSyncApi, FlutterPlugin {
     }
     return ids
   }
-  
+
   func getAssetsCountSince(albumId: String, timestamp: Int64) throws -> Int64 {
     let collections = PHAssetCollection.fetchAssetCollections(withLocalIdentifiers: [albumId], options: nil)
     guard let album = collections.firstObject else {
       return 0
     }
-    
+
     let date = NSDate(timeIntervalSince1970: TimeInterval(timestamp))
     let options = PHFetchOptions()
     options.predicate = NSPredicate(format: "creationDate > %@ OR modificationDate > %@", date, date)
@@ -241,32 +241,32 @@ class NativeSyncApiImpl: ImmichPlugin, NativeSyncApi, FlutterPlugin {
     let assets = getAssetsFromAlbum(in: album, options: options)
     return Int64(assets.count)
   }
-  
+
   func getAssetsForAlbum(albumId: String, updatedTimeCond: Int64?) throws -> [PlatformAsset] {
     let collections = PHAssetCollection.fetchAssetCollections(withLocalIdentifiers: [albumId], options: nil)
     guard let album = collections.firstObject else {
       return []
     }
-    
+
     let options = PHFetchOptions()
     options.includeHiddenAssets = false
     if(updatedTimeCond != nil) {
       let date = NSDate(timeIntervalSince1970: TimeInterval(updatedTimeCond!))
       options.predicate = NSPredicate(format: "creationDate > %@ OR modificationDate > %@", date, date)
     }
-    
+
     let result = getAssetsFromAlbum(in: album, options: options)
     if(result.count == 0) {
       return []
     }
-    
+
     var assets: [PlatformAsset] = []
     result.enumerateObjects { (asset, _, _) in
       assets.append(asset.toPlatformAsset())
     }
     return assets
   }
-  
+
   func hashAssets(assetIds: [String], allowNetworkAccess: Bool, completion: @escaping (Result<[HashResult], Error>) -> Void) {
     if let prevTask = hashTask {
       prevTask.cancel()
@@ -284,11 +284,11 @@ class NativeSyncApiImpl: ImmichPlugin, NativeSyncApi, FlutterPlugin {
         missingAssetIds.remove(asset.localIdentifier)
         assets.append(asset)
       }
-      
+
       if Task.isCancelled {
         return self?.completeWhenActive(for: completion, with: Self.hashCancelled)
       }
-      
+
       await withTaskGroup(of: HashResult?.self) { taskGroup in
         var results = [HashResult]()
         results.reserveCapacity(assets.count)
@@ -301,28 +301,28 @@ class NativeSyncApiImpl: ImmichPlugin, NativeSyncApi, FlutterPlugin {
             return await self.hashAsset(asset, allowNetworkAccess: allowNetworkAccess)
           }
         }
-        
+
         for await result in taskGroup {
           guard let result = result else {
             return self?.completeWhenActive(for: completion, with: Self.hashCancelled)
           }
           results.append(result)
         }
-        
+
         for missing in missingAssetIds {
           results.append(HashResult(assetId: missing, error: "Asset not found in library", hash: nil))
         }
-        
+
         return self?.completeWhenActive(for: completion, with: .success(results))
       }
     }
   }
-  
+
   func cancelHashing() {
     hashTask?.cancel()
     hashTask = nil
   }
-  
+
   private func hashAsset(_ asset: PHAsset, allowNetworkAccess: Bool) async -> HashResult? {
     class RequestRef {
       var id: PHAssetResourceDataRequestID?
@@ -332,21 +332,21 @@ class NativeSyncApiImpl: ImmichPlugin, NativeSyncApi, FlutterPlugin {
       if Task.isCancelled {
         return nil
       }
-      
+
       guard let resource = asset.getResource() else {
         return HashResult(assetId: asset.localIdentifier, error: "Cannot get asset resource", hash: nil)
       }
-      
+
       if Task.isCancelled {
         return nil
       }
-      
+
       let options = PHAssetResourceRequestOptions()
       options.isNetworkAccessAllowed = allowNetworkAccess
-      
+
       return await withCheckedContinuation { continuation in
         var hasher = Insecure.SHA1()
-        
+
         requestRef.id = PHAssetResourceManager.default().requestData(
           for: resource,
           options: options,
@@ -377,7 +377,11 @@ class NativeSyncApiImpl: ImmichPlugin, NativeSyncApi, FlutterPlugin {
       PHAssetResourceManager.default().cancelDataRequest(requestId)
     })
   }
-  
+
+  func getTrashedAssets() throws -> [String: [PlatformAsset]] {
+    throw PigeonError(code: "UNSUPPORTED_OS", message: "This feature not supported on iOS.", details: nil)
+  }
+
   private func getAssetsFromAlbum(in album: PHAssetCollection, options: PHFetchOptions) -> PHFetchResult<PHAsset> {
     // Ensure to actually getting all assets for the Recents album
     if (album.assetCollectionSubtype == .smartAlbumUserLibrary) {
diff --git a/mobile/lib/constants/constants.dart b/mobile/lib/constants/constants.dart
index 03acd6a548..8d4636bbe1 100644
--- a/mobile/lib/constants/constants.dart
+++ b/mobile/lib/constants/constants.dart
@@ -58,3 +58,6 @@ const int kPhotoTabIndex = 0;
 const int kSearchTabIndex = 1;
 const int kAlbumTabIndex = 2;
 const int kLibraryTabIndex = 3;
+
+// Workaround for SQLite's variable limit (SQLITE_MAX_VARIABLE_NUMBER = 32766)
+const int kDriftMaxChunk = 32000;
diff --git a/mobile/lib/domain/services/hash.service.dart b/mobile/lib/domain/services/hash.service.dart
index 90f29b8bc1..5e81643fc5 100644
--- a/mobile/lib/domain/services/hash.service.dart
+++ b/mobile/lib/domain/services/hash.service.dart
@@ -2,8 +2,10 @@ import 'package:flutter/services.dart';
 import 'package:immich_mobile/constants/constants.dart';
 import 'package:immich_mobile/domain/models/album/local_album.model.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/extensions/platform_extensions.dart';
 import 'package:immich_mobile/infrastructure/repositories/local_album.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/local_asset.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/trashed_local_asset.repository.dart';
 import 'package:immich_mobile/platform/native_sync_api.g.dart';
 import 'package:logging/logging.dart';
 
@@ -13,6 +15,7 @@ class HashService {
   final int _batchSize;
   final DriftLocalAlbumRepository _localAlbumRepository;
   final DriftLocalAssetRepository _localAssetRepository;
+  final DriftTrashedLocalAssetRepository _trashedLocalAssetRepository;
   final NativeSyncApi _nativeSyncApi;
   final bool Function()? _cancelChecker;
   final _log = Logger('HashService');
@@ -20,11 +23,13 @@ class HashService {
   HashService({
     required DriftLocalAlbumRepository localAlbumRepository,
     required DriftLocalAssetRepository localAssetRepository,
+    required DriftTrashedLocalAssetRepository trashedLocalAssetRepository,
     required NativeSyncApi nativeSyncApi,
     bool Function()? cancelChecker,
     int? batchSize,
   }) : _localAlbumRepository = localAlbumRepository,
        _localAssetRepository = localAssetRepository,
+       _trashedLocalAssetRepository = trashedLocalAssetRepository,
        _cancelChecker = cancelChecker,
        _nativeSyncApi = nativeSyncApi,
        _batchSize = batchSize ?? kBatchHashFileLimit;
@@ -49,6 +54,14 @@ class HashService {
           await _hashAssets(album, assetsToHash);
         }
       }
+      if (CurrentPlatform.isAndroid && localAlbums.isNotEmpty) {
+        final backupAlbumIds = localAlbums.map((e) => e.id);
+        final trashedToHash = await _trashedLocalAssetRepository.getAssetsToHash(backupAlbumIds);
+        if (trashedToHash.isNotEmpty) {
+          final pseudoAlbum = LocalAlbum(id: '-pseudoAlbum', name: 'Trash', updatedAt: DateTime.now());
+          await _hashAssets(pseudoAlbum, trashedToHash, isTrashed: true);
+        }
+      }
     } on PlatformException catch (e) {
       if (e.code == _kHashCancelledCode) {
         _log.warning("Hashing cancelled by platform");
@@ -65,7 +78,7 @@ class HashService {
   /// Processes a list of [LocalAsset]s, storing their hash and updating the assets in the DB
   /// with hash for those that were successfully hashed. Hashes are looked up in a table
   /// [LocalAssetHashEntity] by local id. Only missing entries are newly hashed and added to the DB.
-  Future<void> _hashAssets(LocalAlbum album, List<LocalAsset> assetsToHash) async {
+  Future<void> _hashAssets(LocalAlbum album, List<LocalAsset> assetsToHash, {bool isTrashed = false}) async {
     final toHash = <String, LocalAsset>{};
 
     for (final asset in assetsToHash) {
@@ -76,16 +89,16 @@ class HashService {
 
       toHash[asset.id] = asset;
       if (toHash.length == _batchSize) {
-        await _processBatch(album, toHash);
+        await _processBatch(album, toHash, isTrashed);
         toHash.clear();
       }
     }
 
-    await _processBatch(album, toHash);
+    await _processBatch(album, toHash, isTrashed);
   }
 
   /// Processes a batch of assets.
-  Future<void> _processBatch(LocalAlbum album, Map<String, LocalAsset> toHash) async {
+  Future<void> _processBatch(LocalAlbum album, Map<String, LocalAsset> toHash, bool isTrashed) async {
     if (toHash.isEmpty) {
       return;
     }
@@ -120,7 +133,10 @@ class HashService {
     }
 
     _log.fine("Hashed ${hashed.length}/${toHash.length} assets");
-
-    await _localAssetRepository.updateHashes(hashed);
+    if (isTrashed) {
+      await _trashedLocalAssetRepository.updateHashes(hashed);
+    } else {
+      await _localAssetRepository.updateHashes(hashed);
+    }
   }
 }
diff --git a/mobile/lib/domain/services/local_sync.service.dart b/mobile/lib/domain/services/local_sync.service.dart
index 94a8a19e73..5cbae9c5a1 100644
--- a/mobile/lib/domain/services/local_sync.service.dart
+++ b/mobile/lib/domain/services/local_sync.service.dart
@@ -4,9 +4,14 @@ import 'package:collection/collection.dart';
 import 'package:flutter/foundation.dart';
 import 'package:immich_mobile/domain/models/album/local_album.model.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/domain/models/store.model.dart';
+import 'package:immich_mobile/entities/store.entity.dart';
 import 'package:immich_mobile/extensions/platform_extensions.dart';
 import 'package:immich_mobile/infrastructure/repositories/local_album.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/storage.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/trashed_local_asset.repository.dart';
 import 'package:immich_mobile/platform/native_sync_api.g.dart';
+import 'package:immich_mobile/repositories/local_files_manager.repository.dart';
 import 'package:immich_mobile/utils/datetime_helpers.dart';
 import 'package:immich_mobile/utils/diff.dart';
 import 'package:logging/logging.dart';
@@ -14,15 +19,34 @@ import 'package:logging/logging.dart';
 class LocalSyncService {
   final DriftLocalAlbumRepository _localAlbumRepository;
   final NativeSyncApi _nativeSyncApi;
+  final DriftTrashedLocalAssetRepository _trashedLocalAssetRepository;
+  final LocalFilesManagerRepository _localFilesManager;
+  final StorageRepository _storageRepository;
   final Logger _log = Logger("DeviceSyncService");
 
-  LocalSyncService({required DriftLocalAlbumRepository localAlbumRepository, required NativeSyncApi nativeSyncApi})
-    : _localAlbumRepository = localAlbumRepository,
-      _nativeSyncApi = nativeSyncApi;
+  LocalSyncService({
+    required DriftLocalAlbumRepository localAlbumRepository,
+    required DriftTrashedLocalAssetRepository trashedLocalAssetRepository,
+    required LocalFilesManagerRepository localFilesManager,
+    required StorageRepository storageRepository,
+    required NativeSyncApi nativeSyncApi,
+  }) : _localAlbumRepository = localAlbumRepository,
+       _trashedLocalAssetRepository = trashedLocalAssetRepository,
+       _localFilesManager = localFilesManager,
+       _storageRepository = storageRepository,
+       _nativeSyncApi = nativeSyncApi;
 
   Future<void> sync({bool full = false}) async {
     final Stopwatch stopwatch = Stopwatch()..start();
     try {
+      if (CurrentPlatform.isAndroid && Store.get(StoreKey.manageLocalMediaAndroid, false)) {
+        final hasPermission = await _localFilesManager.hasManageMediaPermission();
+        if (hasPermission) {
+          await _syncTrashedAssets();
+        } else {
+          _log.warning("syncTrashedAssets cannot proceed because MANAGE_MEDIA permission is missing");
+        }
+      }
       if (full || await _nativeSyncApi.shouldFullSync()) {
         _log.fine("Full sync request from ${full ? "user" : "native"}");
         return await fullSync();
@@ -69,7 +93,6 @@ class LocalSyncService {
           await updateAlbum(dbAlbum, album);
         }
       }
-
       await _nativeSyncApi.checkpointSync();
     } catch (e, s) {
       _log.severe("Error performing device sync", e, s);
@@ -273,6 +296,48 @@ class LocalSyncService {
   bool _albumsEqual(LocalAlbum a, LocalAlbum b) {
     return a.name == b.name && a.assetCount == b.assetCount && a.updatedAt.isAtSameMomentAs(b.updatedAt);
   }
+
+  Future<void> _syncTrashedAssets() async {
+    final trashedAssetMap = await _nativeSyncApi.getTrashedAssets();
+    await processTrashedAssets(trashedAssetMap);
+  }
+
+  @visibleForTesting
+  Future<void> processTrashedAssets(Map<String, List<PlatformAsset>> trashedAssetMap) async {
+    if (trashedAssetMap.isEmpty) {
+      _log.info("syncTrashedAssets, No trashed assets found");
+    }
+    final trashedAssets = trashedAssetMap.cast<String, List<Object?>>().entries.expand(
+      (entry) => entry.value.cast<PlatformAsset>().toTrashedAssets(entry.key),
+    );
+
+    _log.fine("syncTrashedAssets, trashedAssets: ${trashedAssets.map((e) => e.asset.id)}");
+    await _trashedLocalAssetRepository.processTrashSnapshot(trashedAssets);
+
+    final assetsToRestore = await _trashedLocalAssetRepository.getToRestore();
+    if (assetsToRestore.isNotEmpty) {
+      final restoredIds = await _localFilesManager.restoreAssetsFromTrash(assetsToRestore);
+      await _trashedLocalAssetRepository.applyRestoredAssets(restoredIds);
+    } else {
+      _log.info("syncTrashedAssets, No remote assets found for restoration");
+    }
+
+    final localAssetsToTrash = await _trashedLocalAssetRepository.getToTrash();
+    if (localAssetsToTrash.isNotEmpty) {
+      final mediaUrls = await Future.wait(
+        localAssetsToTrash.values
+            .expand((e) => e)
+            .map((localAsset) => _storageRepository.getAssetEntityForAsset(localAsset).then((e) => e?.getMediaUrl())),
+      );
+      _log.info("Moving to trash ${mediaUrls.join(", ")} assets");
+      final result = await _localFilesManager.moveToTrash(mediaUrls.nonNulls.toList());
+      if (result) {
+        await _trashedLocalAssetRepository.trashLocalAsset(localAssetsToTrash);
+      }
+    } else {
+      _log.info("syncTrashedAssets, No assets found in backup-enabled albums for move to trash");
+    }
+  }
 }
 
 extension on Iterable<PlatformAlbum> {
@@ -290,20 +355,26 @@ extension on Iterable<PlatformAlbum> {
 
 extension on Iterable<PlatformAsset> {
   List<LocalAsset> toLocalAssets() {
-    return map(
-      (e) => LocalAsset(
-        id: e.id,
-        name: e.name,
-        checksum: null,
-        type: AssetType.values.elementAtOrNull(e.type) ?? AssetType.other,
-        createdAt: tryFromSecondsSinceEpoch(e.createdAt, isUtc: true) ?? DateTime.timestamp(),
-        updatedAt: tryFromSecondsSinceEpoch(e.updatedAt, isUtc: true) ?? DateTime.timestamp(),
-        width: e.width,
-        height: e.height,
-        durationInSeconds: e.durationInSeconds,
-        orientation: e.orientation,
-        isFavorite: e.isFavorite,
-      ),
-    ).toList();
+    return map((e) => e.toLocalAsset()).toList();
+  }
+
+  Iterable<TrashedAsset> toTrashedAssets(String albumId) {
+    return map((e) => (albumId: albumId, asset: e.toLocalAsset()));
   }
 }
+
+extension on PlatformAsset {
+  LocalAsset toLocalAsset() => LocalAsset(
+    id: id,
+    name: name,
+    checksum: null,
+    type: AssetType.values.elementAtOrNull(type) ?? AssetType.other,
+    createdAt: tryFromSecondsSinceEpoch(createdAt, isUtc: true) ?? DateTime.timestamp(),
+    updatedAt: tryFromSecondsSinceEpoch(createdAt, isUtc: true) ?? DateTime.timestamp(),
+    width: width,
+    height: height,
+    durationInSeconds: durationInSeconds,
+    isFavorite: isFavorite,
+    orientation: orientation,
+  );
+}
diff --git a/mobile/lib/domain/services/sync_stream.service.dart b/mobile/lib/domain/services/sync_stream.service.dart
index 9af541e3a4..2ff0f18fcf 100644
--- a/mobile/lib/domain/services/sync_stream.service.dart
+++ b/mobile/lib/domain/services/sync_stream.service.dart
@@ -1,8 +1,15 @@
 import 'dart:async';
 
+import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/domain/models/sync_event.model.dart';
+import 'package:immich_mobile/entities/store.entity.dart';
+import 'package:immich_mobile/extensions/platform_extensions.dart';
+import 'package:immich_mobile/infrastructure/repositories/local_asset.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/storage.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/sync_api.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/sync_stream.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/trashed_local_asset.repository.dart';
+import 'package:immich_mobile/repositories/local_files_manager.repository.dart';
 import 'package:logging/logging.dart';
 import 'package:openapi/api.dart';
 
@@ -11,14 +18,26 @@ class SyncStreamService {
 
   final SyncApiRepository _syncApiRepository;
   final SyncStreamRepository _syncStreamRepository;
+  final DriftLocalAssetRepository _localAssetRepository;
+  final DriftTrashedLocalAssetRepository _trashedLocalAssetRepository;
+  final LocalFilesManagerRepository _localFilesManager;
+  final StorageRepository _storageRepository;
   final bool Function()? _cancelChecker;
 
   SyncStreamService({
     required SyncApiRepository syncApiRepository,
     required SyncStreamRepository syncStreamRepository,
+    required DriftLocalAssetRepository localAssetRepository,
+    required DriftTrashedLocalAssetRepository trashedLocalAssetRepository,
+    required LocalFilesManagerRepository localFilesManager,
+    required StorageRepository storageRepository,
     bool Function()? cancelChecker,
   }) : _syncApiRepository = syncApiRepository,
        _syncStreamRepository = syncStreamRepository,
+       _localAssetRepository = localAssetRepository,
+       _trashedLocalAssetRepository = trashedLocalAssetRepository,
+       _localFilesManager = localFilesManager,
+       _storageRepository = storageRepository,
        _cancelChecker = cancelChecker;
 
   bool get isCancelled => _cancelChecker?.call() ?? false;
@@ -83,7 +102,18 @@ class SyncStreamService {
       case SyncEntityType.partnerDeleteV1:
         return _syncStreamRepository.deletePartnerV1(data.cast());
       case SyncEntityType.assetV1:
-        return _syncStreamRepository.updateAssetsV1(data.cast());
+        final remoteSyncAssets = data.cast<SyncAssetV1>();
+        await _syncStreamRepository.updateAssetsV1(remoteSyncAssets);
+        if (CurrentPlatform.isAndroid && Store.get(StoreKey.manageLocalMediaAndroid, false)) {
+          final hasPermission = await _localFilesManager.hasManageMediaPermission();
+          if (hasPermission) {
+            await _handleRemoteTrashed(remoteSyncAssets.where((e) => e.deletedAt != null).map((e) => e.checksum));
+            await _applyRemoteRestoreToLocal();
+          } else {
+            _logger.warning("sync Trashed Assets cannot proceed because MANAGE_MEDIA permission is missing");
+          }
+        }
+        return;
       case SyncEntityType.assetDeleteV1:
         return _syncStreamRepository.deleteAssetsV1(data.cast());
       case SyncEntityType.assetExifV1:
@@ -212,4 +242,36 @@ class SyncStreamService {
       _logger.severe("Error processing AssetUploadReadyV1 websocket batch events", error, stackTrace);
     }
   }
+
+  Future<void> _handleRemoteTrashed(Iterable<String> checksums) async {
+    if (checksums.isEmpty) {
+      return Future.value();
+    } else {
+      final localAssetsToTrash = await _localAssetRepository.getAssetsFromBackupAlbums(checksums);
+      if (localAssetsToTrash.isNotEmpty) {
+        final mediaUrls = await Future.wait(
+          localAssetsToTrash.values
+              .expand((e) => e)
+              .map((localAsset) => _storageRepository.getAssetEntityForAsset(localAsset).then((e) => e?.getMediaUrl())),
+        );
+        _logger.info("Moving to trash ${mediaUrls.join(", ")} assets");
+        final result = await _localFilesManager.moveToTrash(mediaUrls.nonNulls.toList());
+        if (result) {
+          await _trashedLocalAssetRepository.trashLocalAsset(localAssetsToTrash);
+        }
+      } else {
+        _logger.info("No assets found in backup-enabled albums for assets: $checksums");
+      }
+    }
+  }
+
+  Future<void> _applyRemoteRestoreToLocal() async {
+    final assetsToRestore = await _trashedLocalAssetRepository.getToRestore();
+    if (assetsToRestore.isNotEmpty) {
+      final restoredIds = await _localFilesManager.restoreAssetsFromTrash(assetsToRestore);
+      await _trashedLocalAssetRepository.applyRestoredAssets(restoredIds);
+    } else {
+      _logger.info("No remote assets found for restoration");
+    }
+  }
 }
diff --git a/mobile/lib/infrastructure/entities/trashed_local_asset.entity.dart b/mobile/lib/infrastructure/entities/trashed_local_asset.entity.dart
new file mode 100644
index 0000000000..308130b9ea
--- /dev/null
+++ b/mobile/lib/infrastructure/entities/trashed_local_asset.entity.dart
@@ -0,0 +1,40 @@
+import 'package:drift/drift.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/infrastructure/entities/trashed_local_asset.entity.drift.dart';
+import 'package:immich_mobile/infrastructure/utils/asset.mixin.dart';
+import 'package:immich_mobile/infrastructure/utils/drift_default.mixin.dart';
+
+@TableIndex.sql('CREATE INDEX IF NOT EXISTS idx_trashed_local_asset_checksum ON trashed_local_asset_entity (checksum)')
+@TableIndex.sql('CREATE INDEX IF NOT EXISTS idx_trashed_local_asset_album ON trashed_local_asset_entity (album_id)')
+class TrashedLocalAssetEntity extends Table with DriftDefaultsMixin, AssetEntityMixin {
+  const TrashedLocalAssetEntity();
+
+  TextColumn get id => text()();
+
+  TextColumn get albumId => text()();
+
+  TextColumn get checksum => text().nullable()();
+
+  BoolColumn get isFavorite => boolean().withDefault(const Constant(false))();
+
+  IntColumn get orientation => integer().withDefault(const Constant(0))();
+
+  @override
+  Set<Column> get primaryKey => {id, albumId};
+}
+
+extension TrashedLocalAssetEntityDataDomainExtension on TrashedLocalAssetEntityData {
+  LocalAsset toLocalAsset() => LocalAsset(
+    id: id,
+    name: name,
+    checksum: checksum,
+    type: type,
+    createdAt: createdAt,
+    updatedAt: updatedAt,
+    durationInSeconds: durationInSeconds,
+    isFavorite: isFavorite,
+    height: height,
+    width: width,
+    orientation: orientation,
+  );
+}
diff --git a/mobile/lib/infrastructure/entities/trashed_local_asset.entity.drift.dart b/mobile/lib/infrastructure/entities/trashed_local_asset.entity.drift.dart
new file mode 100644
index 0000000000..aab226c3a2
--- /dev/null
+++ b/mobile/lib/infrastructure/entities/trashed_local_asset.entity.drift.dart
@@ -0,0 +1,1080 @@
+// dart format width=80
+// ignore_for_file: type=lint
+import 'package:drift/drift.dart' as i0;
+import 'package:immich_mobile/infrastructure/entities/trashed_local_asset.entity.drift.dart'
+    as i1;
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart' as i2;
+import 'package:immich_mobile/infrastructure/entities/trashed_local_asset.entity.dart'
+    as i3;
+import 'package:drift/src/runtime/query_builder/query_builder.dart' as i4;
+
+typedef $$TrashedLocalAssetEntityTableCreateCompanionBuilder =
+    i1.TrashedLocalAssetEntityCompanion Function({
+      required String name,
+      required i2.AssetType type,
+      i0.Value<DateTime> createdAt,
+      i0.Value<DateTime> updatedAt,
+      i0.Value<int?> width,
+      i0.Value<int?> height,
+      i0.Value<int?> durationInSeconds,
+      required String id,
+      required String albumId,
+      i0.Value<String?> checksum,
+      i0.Value<bool> isFavorite,
+      i0.Value<int> orientation,
+    });
+typedef $$TrashedLocalAssetEntityTableUpdateCompanionBuilder =
+    i1.TrashedLocalAssetEntityCompanion Function({
+      i0.Value<String> name,
+      i0.Value<i2.AssetType> type,
+      i0.Value<DateTime> createdAt,
+      i0.Value<DateTime> updatedAt,
+      i0.Value<int?> width,
+      i0.Value<int?> height,
+      i0.Value<int?> durationInSeconds,
+      i0.Value<String> id,
+      i0.Value<String> albumId,
+      i0.Value<String?> checksum,
+      i0.Value<bool> isFavorite,
+      i0.Value<int> orientation,
+    });
+
+class $$TrashedLocalAssetEntityTableFilterComposer
+    extends
+        i0.Composer<i0.GeneratedDatabase, i1.$TrashedLocalAssetEntityTable> {
+  $$TrashedLocalAssetEntityTableFilterComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  i0.ColumnFilters<String> get name => $composableBuilder(
+    column: $table.name,
+    builder: (column) => i0.ColumnFilters(column),
+  );
+
+  i0.ColumnWithTypeConverterFilters<i2.AssetType, i2.AssetType, int> get type =>
+      $composableBuilder(
+        column: $table.type,
+        builder: (column) => i0.ColumnWithTypeConverterFilters(column),
+      );
+
+  i0.ColumnFilters<DateTime> get createdAt => $composableBuilder(
+    column: $table.createdAt,
+    builder: (column) => i0.ColumnFilters(column),
+  );
+
+  i0.ColumnFilters<DateTime> get updatedAt => $composableBuilder(
+    column: $table.updatedAt,
+    builder: (column) => i0.ColumnFilters(column),
+  );
+
+  i0.ColumnFilters<int> get width => $composableBuilder(
+    column: $table.width,
+    builder: (column) => i0.ColumnFilters(column),
+  );
+
+  i0.ColumnFilters<int> get height => $composableBuilder(
+    column: $table.height,
+    builder: (column) => i0.ColumnFilters(column),
+  );
+
+  i0.ColumnFilters<int> get durationInSeconds => $composableBuilder(
+    column: $table.durationInSeconds,
+    builder: (column) => i0.ColumnFilters(column),
+  );
+
+  i0.ColumnFilters<String> get id => $composableBuilder(
+    column: $table.id,
+    builder: (column) => i0.ColumnFilters(column),
+  );
+
+  i0.ColumnFilters<String> get albumId => $composableBuilder(
+    column: $table.albumId,
+    builder: (column) => i0.ColumnFilters(column),
+  );
+
+  i0.ColumnFilters<String> get checksum => $composableBuilder(
+    column: $table.checksum,
+    builder: (column) => i0.ColumnFilters(column),
+  );
+
+  i0.ColumnFilters<bool> get isFavorite => $composableBuilder(
+    column: $table.isFavorite,
+    builder: (column) => i0.ColumnFilters(column),
+  );
+
+  i0.ColumnFilters<int> get orientation => $composableBuilder(
+    column: $table.orientation,
+    builder: (column) => i0.ColumnFilters(column),
+  );
+}
+
+class $$TrashedLocalAssetEntityTableOrderingComposer
+    extends
+        i0.Composer<i0.GeneratedDatabase, i1.$TrashedLocalAssetEntityTable> {
+  $$TrashedLocalAssetEntityTableOrderingComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  i0.ColumnOrderings<String> get name => $composableBuilder(
+    column: $table.name,
+    builder: (column) => i0.ColumnOrderings(column),
+  );
+
+  i0.ColumnOrderings<int> get type => $composableBuilder(
+    column: $table.type,
+    builder: (column) => i0.ColumnOrderings(column),
+  );
+
+  i0.ColumnOrderings<DateTime> get createdAt => $composableBuilder(
+    column: $table.createdAt,
+    builder: (column) => i0.ColumnOrderings(column),
+  );
+
+  i0.ColumnOrderings<DateTime> get updatedAt => $composableBuilder(
+    column: $table.updatedAt,
+    builder: (column) => i0.ColumnOrderings(column),
+  );
+
+  i0.ColumnOrderings<int> get width => $composableBuilder(
+    column: $table.width,
+    builder: (column) => i0.ColumnOrderings(column),
+  );
+
+  i0.ColumnOrderings<int> get height => $composableBuilder(
+    column: $table.height,
+    builder: (column) => i0.ColumnOrderings(column),
+  );
+
+  i0.ColumnOrderings<int> get durationInSeconds => $composableBuilder(
+    column: $table.durationInSeconds,
+    builder: (column) => i0.ColumnOrderings(column),
+  );
+
+  i0.ColumnOrderings<String> get id => $composableBuilder(
+    column: $table.id,
+    builder: (column) => i0.ColumnOrderings(column),
+  );
+
+  i0.ColumnOrderings<String> get albumId => $composableBuilder(
+    column: $table.albumId,
+    builder: (column) => i0.ColumnOrderings(column),
+  );
+
+  i0.ColumnOrderings<String> get checksum => $composableBuilder(
+    column: $table.checksum,
+    builder: (column) => i0.ColumnOrderings(column),
+  );
+
+  i0.ColumnOrderings<bool> get isFavorite => $composableBuilder(
+    column: $table.isFavorite,
+    builder: (column) => i0.ColumnOrderings(column),
+  );
+
+  i0.ColumnOrderings<int> get orientation => $composableBuilder(
+    column: $table.orientation,
+    builder: (column) => i0.ColumnOrderings(column),
+  );
+}
+
+class $$TrashedLocalAssetEntityTableAnnotationComposer
+    extends
+        i0.Composer<i0.GeneratedDatabase, i1.$TrashedLocalAssetEntityTable> {
+  $$TrashedLocalAssetEntityTableAnnotationComposer({
+    required super.$db,
+    required super.$table,
+    super.joinBuilder,
+    super.$addJoinBuilderToRootComposer,
+    super.$removeJoinBuilderFromRootComposer,
+  });
+  i0.GeneratedColumn<String> get name =>
+      $composableBuilder(column: $table.name, builder: (column) => column);
+
+  i0.GeneratedColumnWithTypeConverter<i2.AssetType, int> get type =>
+      $composableBuilder(column: $table.type, builder: (column) => column);
+
+  i0.GeneratedColumn<DateTime> get createdAt =>
+      $composableBuilder(column: $table.createdAt, builder: (column) => column);
+
+  i0.GeneratedColumn<DateTime> get updatedAt =>
+      $composableBuilder(column: $table.updatedAt, builder: (column) => column);
+
+  i0.GeneratedColumn<int> get width =>
+      $composableBuilder(column: $table.width, builder: (column) => column);
+
+  i0.GeneratedColumn<int> get height =>
+      $composableBuilder(column: $table.height, builder: (column) => column);
+
+  i0.GeneratedColumn<int> get durationInSeconds => $composableBuilder(
+    column: $table.durationInSeconds,
+    builder: (column) => column,
+  );
+
+  i0.GeneratedColumn<String> get id =>
+      $composableBuilder(column: $table.id, builder: (column) => column);
+
+  i0.GeneratedColumn<String> get albumId =>
+      $composableBuilder(column: $table.albumId, builder: (column) => column);
+
+  i0.GeneratedColumn<String> get checksum =>
+      $composableBuilder(column: $table.checksum, builder: (column) => column);
+
+  i0.GeneratedColumn<bool> get isFavorite => $composableBuilder(
+    column: $table.isFavorite,
+    builder: (column) => column,
+  );
+
+  i0.GeneratedColumn<int> get orientation => $composableBuilder(
+    column: $table.orientation,
+    builder: (column) => column,
+  );
+}
+
+class $$TrashedLocalAssetEntityTableTableManager
+    extends
+        i0.RootTableManager<
+          i0.GeneratedDatabase,
+          i1.$TrashedLocalAssetEntityTable,
+          i1.TrashedLocalAssetEntityData,
+          i1.$$TrashedLocalAssetEntityTableFilterComposer,
+          i1.$$TrashedLocalAssetEntityTableOrderingComposer,
+          i1.$$TrashedLocalAssetEntityTableAnnotationComposer,
+          $$TrashedLocalAssetEntityTableCreateCompanionBuilder,
+          $$TrashedLocalAssetEntityTableUpdateCompanionBuilder,
+          (
+            i1.TrashedLocalAssetEntityData,
+            i0.BaseReferences<
+              i0.GeneratedDatabase,
+              i1.$TrashedLocalAssetEntityTable,
+              i1.TrashedLocalAssetEntityData
+            >,
+          ),
+          i1.TrashedLocalAssetEntityData,
+          i0.PrefetchHooks Function()
+        > {
+  $$TrashedLocalAssetEntityTableTableManager(
+    i0.GeneratedDatabase db,
+    i1.$TrashedLocalAssetEntityTable table,
+  ) : super(
+        i0.TableManagerState(
+          db: db,
+          table: table,
+          createFilteringComposer: () =>
+              i1.$$TrashedLocalAssetEntityTableFilterComposer(
+                $db: db,
+                $table: table,
+              ),
+          createOrderingComposer: () =>
+              i1.$$TrashedLocalAssetEntityTableOrderingComposer(
+                $db: db,
+                $table: table,
+              ),
+          createComputedFieldComposer: () =>
+              i1.$$TrashedLocalAssetEntityTableAnnotationComposer(
+                $db: db,
+                $table: table,
+              ),
+          updateCompanionCallback:
+              ({
+                i0.Value<String> name = const i0.Value.absent(),
+                i0.Value<i2.AssetType> type = const i0.Value.absent(),
+                i0.Value<DateTime> createdAt = const i0.Value.absent(),
+                i0.Value<DateTime> updatedAt = const i0.Value.absent(),
+                i0.Value<int?> width = const i0.Value.absent(),
+                i0.Value<int?> height = const i0.Value.absent(),
+                i0.Value<int?> durationInSeconds = const i0.Value.absent(),
+                i0.Value<String> id = const i0.Value.absent(),
+                i0.Value<String> albumId = const i0.Value.absent(),
+                i0.Value<String?> checksum = const i0.Value.absent(),
+                i0.Value<bool> isFavorite = const i0.Value.absent(),
+                i0.Value<int> orientation = const i0.Value.absent(),
+              }) => i1.TrashedLocalAssetEntityCompanion(
+                name: name,
+                type: type,
+                createdAt: createdAt,
+                updatedAt: updatedAt,
+                width: width,
+                height: height,
+                durationInSeconds: durationInSeconds,
+                id: id,
+                albumId: albumId,
+                checksum: checksum,
+                isFavorite: isFavorite,
+                orientation: orientation,
+              ),
+          createCompanionCallback:
+              ({
+                required String name,
+                required i2.AssetType type,
+                i0.Value<DateTime> createdAt = const i0.Value.absent(),
+                i0.Value<DateTime> updatedAt = const i0.Value.absent(),
+                i0.Value<int?> width = const i0.Value.absent(),
+                i0.Value<int?> height = const i0.Value.absent(),
+                i0.Value<int?> durationInSeconds = const i0.Value.absent(),
+                required String id,
+                required String albumId,
+                i0.Value<String?> checksum = const i0.Value.absent(),
+                i0.Value<bool> isFavorite = const i0.Value.absent(),
+                i0.Value<int> orientation = const i0.Value.absent(),
+              }) => i1.TrashedLocalAssetEntityCompanion.insert(
+                name: name,
+                type: type,
+                createdAt: createdAt,
+                updatedAt: updatedAt,
+                width: width,
+                height: height,
+                durationInSeconds: durationInSeconds,
+                id: id,
+                albumId: albumId,
+                checksum: checksum,
+                isFavorite: isFavorite,
+                orientation: orientation,
+              ),
+          withReferenceMapper: (p0) => p0
+              .map((e) => (e.readTable(table), i0.BaseReferences(db, table, e)))
+              .toList(),
+          prefetchHooksCallback: null,
+        ),
+      );
+}
+
+typedef $$TrashedLocalAssetEntityTableProcessedTableManager =
+    i0.ProcessedTableManager<
+      i0.GeneratedDatabase,
+      i1.$TrashedLocalAssetEntityTable,
+      i1.TrashedLocalAssetEntityData,
+      i1.$$TrashedLocalAssetEntityTableFilterComposer,
+      i1.$$TrashedLocalAssetEntityTableOrderingComposer,
+      i1.$$TrashedLocalAssetEntityTableAnnotationComposer,
+      $$TrashedLocalAssetEntityTableCreateCompanionBuilder,
+      $$TrashedLocalAssetEntityTableUpdateCompanionBuilder,
+      (
+        i1.TrashedLocalAssetEntityData,
+        i0.BaseReferences<
+          i0.GeneratedDatabase,
+          i1.$TrashedLocalAssetEntityTable,
+          i1.TrashedLocalAssetEntityData
+        >,
+      ),
+      i1.TrashedLocalAssetEntityData,
+      i0.PrefetchHooks Function()
+    >;
+i0.Index get idxTrashedLocalAssetChecksum => i0.Index(
+  'idx_trashed_local_asset_checksum',
+  'CREATE INDEX IF NOT EXISTS idx_trashed_local_asset_checksum ON trashed_local_asset_entity (checksum)',
+);
+
+class $TrashedLocalAssetEntityTable extends i3.TrashedLocalAssetEntity
+    with
+        i0.TableInfo<
+          $TrashedLocalAssetEntityTable,
+          i1.TrashedLocalAssetEntityData
+        > {
+  @override
+  final i0.GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  $TrashedLocalAssetEntityTable(this.attachedDatabase, [this._alias]);
+  static const i0.VerificationMeta _nameMeta = const i0.VerificationMeta(
+    'name',
+  );
+  @override
+  late final i0.GeneratedColumn<String> name = i0.GeneratedColumn<String>(
+    'name',
+    aliasedName,
+    false,
+    type: i0.DriftSqlType.string,
+    requiredDuringInsert: true,
+  );
+  @override
+  late final i0.GeneratedColumnWithTypeConverter<i2.AssetType, int> type =
+      i0.GeneratedColumn<int>(
+        'type',
+        aliasedName,
+        false,
+        type: i0.DriftSqlType.int,
+        requiredDuringInsert: true,
+      ).withConverter<i2.AssetType>(
+        i1.$TrashedLocalAssetEntityTable.$convertertype,
+      );
+  static const i0.VerificationMeta _createdAtMeta = const i0.VerificationMeta(
+    'createdAt',
+  );
+  @override
+  late final i0.GeneratedColumn<DateTime> createdAt =
+      i0.GeneratedColumn<DateTime>(
+        'created_at',
+        aliasedName,
+        false,
+        type: i0.DriftSqlType.dateTime,
+        requiredDuringInsert: false,
+        defaultValue: i4.currentDateAndTime,
+      );
+  static const i0.VerificationMeta _updatedAtMeta = const i0.VerificationMeta(
+    'updatedAt',
+  );
+  @override
+  late final i0.GeneratedColumn<DateTime> updatedAt =
+      i0.GeneratedColumn<DateTime>(
+        'updated_at',
+        aliasedName,
+        false,
+        type: i0.DriftSqlType.dateTime,
+        requiredDuringInsert: false,
+        defaultValue: i4.currentDateAndTime,
+      );
+  static const i0.VerificationMeta _widthMeta = const i0.VerificationMeta(
+    'width',
+  );
+  @override
+  late final i0.GeneratedColumn<int> width = i0.GeneratedColumn<int>(
+    'width',
+    aliasedName,
+    true,
+    type: i0.DriftSqlType.int,
+    requiredDuringInsert: false,
+  );
+  static const i0.VerificationMeta _heightMeta = const i0.VerificationMeta(
+    'height',
+  );
+  @override
+  late final i0.GeneratedColumn<int> height = i0.GeneratedColumn<int>(
+    'height',
+    aliasedName,
+    true,
+    type: i0.DriftSqlType.int,
+    requiredDuringInsert: false,
+  );
+  static const i0.VerificationMeta _durationInSecondsMeta =
+      const i0.VerificationMeta('durationInSeconds');
+  @override
+  late final i0.GeneratedColumn<int> durationInSeconds =
+      i0.GeneratedColumn<int>(
+        'duration_in_seconds',
+        aliasedName,
+        true,
+        type: i0.DriftSqlType.int,
+        requiredDuringInsert: false,
+      );
+  static const i0.VerificationMeta _idMeta = const i0.VerificationMeta('id');
+  @override
+  late final i0.GeneratedColumn<String> id = i0.GeneratedColumn<String>(
+    'id',
+    aliasedName,
+    false,
+    type: i0.DriftSqlType.string,
+    requiredDuringInsert: true,
+  );
+  static const i0.VerificationMeta _albumIdMeta = const i0.VerificationMeta(
+    'albumId',
+  );
+  @override
+  late final i0.GeneratedColumn<String> albumId = i0.GeneratedColumn<String>(
+    'album_id',
+    aliasedName,
+    false,
+    type: i0.DriftSqlType.string,
+    requiredDuringInsert: true,
+  );
+  static const i0.VerificationMeta _checksumMeta = const i0.VerificationMeta(
+    'checksum',
+  );
+  @override
+  late final i0.GeneratedColumn<String> checksum = i0.GeneratedColumn<String>(
+    'checksum',
+    aliasedName,
+    true,
+    type: i0.DriftSqlType.string,
+    requiredDuringInsert: false,
+  );
+  static const i0.VerificationMeta _isFavoriteMeta = const i0.VerificationMeta(
+    'isFavorite',
+  );
+  @override
+  late final i0.GeneratedColumn<bool> isFavorite = i0.GeneratedColumn<bool>(
+    'is_favorite',
+    aliasedName,
+    false,
+    type: i0.DriftSqlType.bool,
+    requiredDuringInsert: false,
+    defaultConstraints: i0.GeneratedColumn.constraintIsAlways(
+      'CHECK ("is_favorite" IN (0, 1))',
+    ),
+    defaultValue: const i4.Constant(false),
+  );
+  static const i0.VerificationMeta _orientationMeta = const i0.VerificationMeta(
+    'orientation',
+  );
+  @override
+  late final i0.GeneratedColumn<int> orientation = i0.GeneratedColumn<int>(
+    'orientation',
+    aliasedName,
+    false,
+    type: i0.DriftSqlType.int,
+    requiredDuringInsert: false,
+    defaultValue: const i4.Constant(0),
+  );
+  @override
+  List<i0.GeneratedColumn> get $columns => [
+    name,
+    type,
+    createdAt,
+    updatedAt,
+    width,
+    height,
+    durationInSeconds,
+    id,
+    albumId,
+    checksum,
+    isFavorite,
+    orientation,
+  ];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'trashed_local_asset_entity';
+  @override
+  i0.VerificationContext validateIntegrity(
+    i0.Insertable<i1.TrashedLocalAssetEntityData> instance, {
+    bool isInserting = false,
+  }) {
+    final context = i0.VerificationContext();
+    final data = instance.toColumns(true);
+    if (data.containsKey('name')) {
+      context.handle(
+        _nameMeta,
+        name.isAcceptableOrUnknown(data['name']!, _nameMeta),
+      );
+    } else if (isInserting) {
+      context.missing(_nameMeta);
+    }
+    if (data.containsKey('created_at')) {
+      context.handle(
+        _createdAtMeta,
+        createdAt.isAcceptableOrUnknown(data['created_at']!, _createdAtMeta),
+      );
+    }
+    if (data.containsKey('updated_at')) {
+      context.handle(
+        _updatedAtMeta,
+        updatedAt.isAcceptableOrUnknown(data['updated_at']!, _updatedAtMeta),
+      );
+    }
+    if (data.containsKey('width')) {
+      context.handle(
+        _widthMeta,
+        width.isAcceptableOrUnknown(data['width']!, _widthMeta),
+      );
+    }
+    if (data.containsKey('height')) {
+      context.handle(
+        _heightMeta,
+        height.isAcceptableOrUnknown(data['height']!, _heightMeta),
+      );
+    }
+    if (data.containsKey('duration_in_seconds')) {
+      context.handle(
+        _durationInSecondsMeta,
+        durationInSeconds.isAcceptableOrUnknown(
+          data['duration_in_seconds']!,
+          _durationInSecondsMeta,
+        ),
+      );
+    }
+    if (data.containsKey('id')) {
+      context.handle(_idMeta, id.isAcceptableOrUnknown(data['id']!, _idMeta));
+    } else if (isInserting) {
+      context.missing(_idMeta);
+    }
+    if (data.containsKey('album_id')) {
+      context.handle(
+        _albumIdMeta,
+        albumId.isAcceptableOrUnknown(data['album_id']!, _albumIdMeta),
+      );
+    } else if (isInserting) {
+      context.missing(_albumIdMeta);
+    }
+    if (data.containsKey('checksum')) {
+      context.handle(
+        _checksumMeta,
+        checksum.isAcceptableOrUnknown(data['checksum']!, _checksumMeta),
+      );
+    }
+    if (data.containsKey('is_favorite')) {
+      context.handle(
+        _isFavoriteMeta,
+        isFavorite.isAcceptableOrUnknown(data['is_favorite']!, _isFavoriteMeta),
+      );
+    }
+    if (data.containsKey('orientation')) {
+      context.handle(
+        _orientationMeta,
+        orientation.isAcceptableOrUnknown(
+          data['orientation']!,
+          _orientationMeta,
+        ),
+      );
+    }
+    return context;
+  }
+
+  @override
+  Set<i0.GeneratedColumn> get $primaryKey => {id, albumId};
+  @override
+  i1.TrashedLocalAssetEntityData map(
+    Map<String, dynamic> data, {
+    String? tablePrefix,
+  }) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return i1.TrashedLocalAssetEntityData(
+      name: attachedDatabase.typeMapping.read(
+        i0.DriftSqlType.string,
+        data['${effectivePrefix}name'],
+      )!,
+      type: i1.$TrashedLocalAssetEntityTable.$convertertype.fromSql(
+        attachedDatabase.typeMapping.read(
+          i0.DriftSqlType.int,
+          data['${effectivePrefix}type'],
+        )!,
+      ),
+      createdAt: attachedDatabase.typeMapping.read(
+        i0.DriftSqlType.dateTime,
+        data['${effectivePrefix}created_at'],
+      )!,
+      updatedAt: attachedDatabase.typeMapping.read(
+        i0.DriftSqlType.dateTime,
+        data['${effectivePrefix}updated_at'],
+      )!,
+      width: attachedDatabase.typeMapping.read(
+        i0.DriftSqlType.int,
+        data['${effectivePrefix}width'],
+      ),
+      height: attachedDatabase.typeMapping.read(
+        i0.DriftSqlType.int,
+        data['${effectivePrefix}height'],
+      ),
+      durationInSeconds: attachedDatabase.typeMapping.read(
+        i0.DriftSqlType.int,
+        data['${effectivePrefix}duration_in_seconds'],
+      ),
+      id: attachedDatabase.typeMapping.read(
+        i0.DriftSqlType.string,
+        data['${effectivePrefix}id'],
+      )!,
+      albumId: attachedDatabase.typeMapping.read(
+        i0.DriftSqlType.string,
+        data['${effectivePrefix}album_id'],
+      )!,
+      checksum: attachedDatabase.typeMapping.read(
+        i0.DriftSqlType.string,
+        data['${effectivePrefix}checksum'],
+      ),
+      isFavorite: attachedDatabase.typeMapping.read(
+        i0.DriftSqlType.bool,
+        data['${effectivePrefix}is_favorite'],
+      )!,
+      orientation: attachedDatabase.typeMapping.read(
+        i0.DriftSqlType.int,
+        data['${effectivePrefix}orientation'],
+      )!,
+    );
+  }
+
+  @override
+  $TrashedLocalAssetEntityTable createAlias(String alias) {
+    return $TrashedLocalAssetEntityTable(attachedDatabase, alias);
+  }
+
+  static i0.JsonTypeConverter2<i2.AssetType, int, int> $convertertype =
+      const i0.EnumIndexConverter<i2.AssetType>(i2.AssetType.values);
+  @override
+  bool get withoutRowId => true;
+  @override
+  bool get isStrict => true;
+}
+
+class TrashedLocalAssetEntityData extends i0.DataClass
+    implements i0.Insertable<i1.TrashedLocalAssetEntityData> {
+  final String name;
+  final i2.AssetType type;
+  final DateTime createdAt;
+  final DateTime updatedAt;
+  final int? width;
+  final int? height;
+  final int? durationInSeconds;
+  final String id;
+  final String albumId;
+  final String? checksum;
+  final bool isFavorite;
+  final int orientation;
+  const TrashedLocalAssetEntityData({
+    required this.name,
+    required this.type,
+    required this.createdAt,
+    required this.updatedAt,
+    this.width,
+    this.height,
+    this.durationInSeconds,
+    required this.id,
+    required this.albumId,
+    this.checksum,
+    required this.isFavorite,
+    required this.orientation,
+  });
+  @override
+  Map<String, i0.Expression> toColumns(bool nullToAbsent) {
+    final map = <String, i0.Expression>{};
+    map['name'] = i0.Variable<String>(name);
+    {
+      map['type'] = i0.Variable<int>(
+        i1.$TrashedLocalAssetEntityTable.$convertertype.toSql(type),
+      );
+    }
+    map['created_at'] = i0.Variable<DateTime>(createdAt);
+    map['updated_at'] = i0.Variable<DateTime>(updatedAt);
+    if (!nullToAbsent || width != null) {
+      map['width'] = i0.Variable<int>(width);
+    }
+    if (!nullToAbsent || height != null) {
+      map['height'] = i0.Variable<int>(height);
+    }
+    if (!nullToAbsent || durationInSeconds != null) {
+      map['duration_in_seconds'] = i0.Variable<int>(durationInSeconds);
+    }
+    map['id'] = i0.Variable<String>(id);
+    map['album_id'] = i0.Variable<String>(albumId);
+    if (!nullToAbsent || checksum != null) {
+      map['checksum'] = i0.Variable<String>(checksum);
+    }
+    map['is_favorite'] = i0.Variable<bool>(isFavorite);
+    map['orientation'] = i0.Variable<int>(orientation);
+    return map;
+  }
+
+  factory TrashedLocalAssetEntityData.fromJson(
+    Map<String, dynamic> json, {
+    i0.ValueSerializer? serializer,
+  }) {
+    serializer ??= i0.driftRuntimeOptions.defaultSerializer;
+    return TrashedLocalAssetEntityData(
+      name: serializer.fromJson<String>(json['name']),
+      type: i1.$TrashedLocalAssetEntityTable.$convertertype.fromJson(
+        serializer.fromJson<int>(json['type']),
+      ),
+      createdAt: serializer.fromJson<DateTime>(json['createdAt']),
+      updatedAt: serializer.fromJson<DateTime>(json['updatedAt']),
+      width: serializer.fromJson<int?>(json['width']),
+      height: serializer.fromJson<int?>(json['height']),
+      durationInSeconds: serializer.fromJson<int?>(json['durationInSeconds']),
+      id: serializer.fromJson<String>(json['id']),
+      albumId: serializer.fromJson<String>(json['albumId']),
+      checksum: serializer.fromJson<String?>(json['checksum']),
+      isFavorite: serializer.fromJson<bool>(json['isFavorite']),
+      orientation: serializer.fromJson<int>(json['orientation']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({i0.ValueSerializer? serializer}) {
+    serializer ??= i0.driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'name': serializer.toJson<String>(name),
+      'type': serializer.toJson<int>(
+        i1.$TrashedLocalAssetEntityTable.$convertertype.toJson(type),
+      ),
+      'createdAt': serializer.toJson<DateTime>(createdAt),
+      'updatedAt': serializer.toJson<DateTime>(updatedAt),
+      'width': serializer.toJson<int?>(width),
+      'height': serializer.toJson<int?>(height),
+      'durationInSeconds': serializer.toJson<int?>(durationInSeconds),
+      'id': serializer.toJson<String>(id),
+      'albumId': serializer.toJson<String>(albumId),
+      'checksum': serializer.toJson<String?>(checksum),
+      'isFavorite': serializer.toJson<bool>(isFavorite),
+      'orientation': serializer.toJson<int>(orientation),
+    };
+  }
+
+  i1.TrashedLocalAssetEntityData copyWith({
+    String? name,
+    i2.AssetType? type,
+    DateTime? createdAt,
+    DateTime? updatedAt,
+    i0.Value<int?> width = const i0.Value.absent(),
+    i0.Value<int?> height = const i0.Value.absent(),
+    i0.Value<int?> durationInSeconds = const i0.Value.absent(),
+    String? id,
+    String? albumId,
+    i0.Value<String?> checksum = const i0.Value.absent(),
+    bool? isFavorite,
+    int? orientation,
+  }) => i1.TrashedLocalAssetEntityData(
+    name: name ?? this.name,
+    type: type ?? this.type,
+    createdAt: createdAt ?? this.createdAt,
+    updatedAt: updatedAt ?? this.updatedAt,
+    width: width.present ? width.value : this.width,
+    height: height.present ? height.value : this.height,
+    durationInSeconds: durationInSeconds.present
+        ? durationInSeconds.value
+        : this.durationInSeconds,
+    id: id ?? this.id,
+    albumId: albumId ?? this.albumId,
+    checksum: checksum.present ? checksum.value : this.checksum,
+    isFavorite: isFavorite ?? this.isFavorite,
+    orientation: orientation ?? this.orientation,
+  );
+  TrashedLocalAssetEntityData copyWithCompanion(
+    i1.TrashedLocalAssetEntityCompanion data,
+  ) {
+    return TrashedLocalAssetEntityData(
+      name: data.name.present ? data.name.value : this.name,
+      type: data.type.present ? data.type.value : this.type,
+      createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
+      updatedAt: data.updatedAt.present ? data.updatedAt.value : this.updatedAt,
+      width: data.width.present ? data.width.value : this.width,
+      height: data.height.present ? data.height.value : this.height,
+      durationInSeconds: data.durationInSeconds.present
+          ? data.durationInSeconds.value
+          : this.durationInSeconds,
+      id: data.id.present ? data.id.value : this.id,
+      albumId: data.albumId.present ? data.albumId.value : this.albumId,
+      checksum: data.checksum.present ? data.checksum.value : this.checksum,
+      isFavorite: data.isFavorite.present
+          ? data.isFavorite.value
+          : this.isFavorite,
+      orientation: data.orientation.present
+          ? data.orientation.value
+          : this.orientation,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('TrashedLocalAssetEntityData(')
+          ..write('name: $name, ')
+          ..write('type: $type, ')
+          ..write('createdAt: $createdAt, ')
+          ..write('updatedAt: $updatedAt, ')
+          ..write('width: $width, ')
+          ..write('height: $height, ')
+          ..write('durationInSeconds: $durationInSeconds, ')
+          ..write('id: $id, ')
+          ..write('albumId: $albumId, ')
+          ..write('checksum: $checksum, ')
+          ..write('isFavorite: $isFavorite, ')
+          ..write('orientation: $orientation')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(
+    name,
+    type,
+    createdAt,
+    updatedAt,
+    width,
+    height,
+    durationInSeconds,
+    id,
+    albumId,
+    checksum,
+    isFavorite,
+    orientation,
+  );
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is i1.TrashedLocalAssetEntityData &&
+          other.name == this.name &&
+          other.type == this.type &&
+          other.createdAt == this.createdAt &&
+          other.updatedAt == this.updatedAt &&
+          other.width == this.width &&
+          other.height == this.height &&
+          other.durationInSeconds == this.durationInSeconds &&
+          other.id == this.id &&
+          other.albumId == this.albumId &&
+          other.checksum == this.checksum &&
+          other.isFavorite == this.isFavorite &&
+          other.orientation == this.orientation);
+}
+
+class TrashedLocalAssetEntityCompanion
+    extends i0.UpdateCompanion<i1.TrashedLocalAssetEntityData> {
+  final i0.Value<String> name;
+  final i0.Value<i2.AssetType> type;
+  final i0.Value<DateTime> createdAt;
+  final i0.Value<DateTime> updatedAt;
+  final i0.Value<int?> width;
+  final i0.Value<int?> height;
+  final i0.Value<int?> durationInSeconds;
+  final i0.Value<String> id;
+  final i0.Value<String> albumId;
+  final i0.Value<String?> checksum;
+  final i0.Value<bool> isFavorite;
+  final i0.Value<int> orientation;
+  const TrashedLocalAssetEntityCompanion({
+    this.name = const i0.Value.absent(),
+    this.type = const i0.Value.absent(),
+    this.createdAt = const i0.Value.absent(),
+    this.updatedAt = const i0.Value.absent(),
+    this.width = const i0.Value.absent(),
+    this.height = const i0.Value.absent(),
+    this.durationInSeconds = const i0.Value.absent(),
+    this.id = const i0.Value.absent(),
+    this.albumId = const i0.Value.absent(),
+    this.checksum = const i0.Value.absent(),
+    this.isFavorite = const i0.Value.absent(),
+    this.orientation = const i0.Value.absent(),
+  });
+  TrashedLocalAssetEntityCompanion.insert({
+    required String name,
+    required i2.AssetType type,
+    this.createdAt = const i0.Value.absent(),
+    this.updatedAt = const i0.Value.absent(),
+    this.width = const i0.Value.absent(),
+    this.height = const i0.Value.absent(),
+    this.durationInSeconds = const i0.Value.absent(),
+    required String id,
+    required String albumId,
+    this.checksum = const i0.Value.absent(),
+    this.isFavorite = const i0.Value.absent(),
+    this.orientation = const i0.Value.absent(),
+  }) : name = i0.Value(name),
+       type = i0.Value(type),
+       id = i0.Value(id),
+       albumId = i0.Value(albumId);
+  static i0.Insertable<i1.TrashedLocalAssetEntityData> custom({
+    i0.Expression<String>? name,
+    i0.Expression<int>? type,
+    i0.Expression<DateTime>? createdAt,
+    i0.Expression<DateTime>? updatedAt,
+    i0.Expression<int>? width,
+    i0.Expression<int>? height,
+    i0.Expression<int>? durationInSeconds,
+    i0.Expression<String>? id,
+    i0.Expression<String>? albumId,
+    i0.Expression<String>? checksum,
+    i0.Expression<bool>? isFavorite,
+    i0.Expression<int>? orientation,
+  }) {
+    return i0.RawValuesInsertable({
+      if (name != null) 'name': name,
+      if (type != null) 'type': type,
+      if (createdAt != null) 'created_at': createdAt,
+      if (updatedAt != null) 'updated_at': updatedAt,
+      if (width != null) 'width': width,
+      if (height != null) 'height': height,
+      if (durationInSeconds != null) 'duration_in_seconds': durationInSeconds,
+      if (id != null) 'id': id,
+      if (albumId != null) 'album_id': albumId,
+      if (checksum != null) 'checksum': checksum,
+      if (isFavorite != null) 'is_favorite': isFavorite,
+      if (orientation != null) 'orientation': orientation,
+    });
+  }
+
+  i1.TrashedLocalAssetEntityCompanion copyWith({
+    i0.Value<String>? name,
+    i0.Value<i2.AssetType>? type,
+    i0.Value<DateTime>? createdAt,
+    i0.Value<DateTime>? updatedAt,
+    i0.Value<int?>? width,
+    i0.Value<int?>? height,
+    i0.Value<int?>? durationInSeconds,
+    i0.Value<String>? id,
+    i0.Value<String>? albumId,
+    i0.Value<String?>? checksum,
+    i0.Value<bool>? isFavorite,
+    i0.Value<int>? orientation,
+  }) {
+    return i1.TrashedLocalAssetEntityCompanion(
+      name: name ?? this.name,
+      type: type ?? this.type,
+      createdAt: createdAt ?? this.createdAt,
+      updatedAt: updatedAt ?? this.updatedAt,
+      width: width ?? this.width,
+      height: height ?? this.height,
+      durationInSeconds: durationInSeconds ?? this.durationInSeconds,
+      id: id ?? this.id,
+      albumId: albumId ?? this.albumId,
+      checksum: checksum ?? this.checksum,
+      isFavorite: isFavorite ?? this.isFavorite,
+      orientation: orientation ?? this.orientation,
+    );
+  }
+
+  @override
+  Map<String, i0.Expression> toColumns(bool nullToAbsent) {
+    final map = <String, i0.Expression>{};
+    if (name.present) {
+      map['name'] = i0.Variable<String>(name.value);
+    }
+    if (type.present) {
+      map['type'] = i0.Variable<int>(
+        i1.$TrashedLocalAssetEntityTable.$convertertype.toSql(type.value),
+      );
+    }
+    if (createdAt.present) {
+      map['created_at'] = i0.Variable<DateTime>(createdAt.value);
+    }
+    if (updatedAt.present) {
+      map['updated_at'] = i0.Variable<DateTime>(updatedAt.value);
+    }
+    if (width.present) {
+      map['width'] = i0.Variable<int>(width.value);
+    }
+    if (height.present) {
+      map['height'] = i0.Variable<int>(height.value);
+    }
+    if (durationInSeconds.present) {
+      map['duration_in_seconds'] = i0.Variable<int>(durationInSeconds.value);
+    }
+    if (id.present) {
+      map['id'] = i0.Variable<String>(id.value);
+    }
+    if (albumId.present) {
+      map['album_id'] = i0.Variable<String>(albumId.value);
+    }
+    if (checksum.present) {
+      map['checksum'] = i0.Variable<String>(checksum.value);
+    }
+    if (isFavorite.present) {
+      map['is_favorite'] = i0.Variable<bool>(isFavorite.value);
+    }
+    if (orientation.present) {
+      map['orientation'] = i0.Variable<int>(orientation.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('TrashedLocalAssetEntityCompanion(')
+          ..write('name: $name, ')
+          ..write('type: $type, ')
+          ..write('createdAt: $createdAt, ')
+          ..write('updatedAt: $updatedAt, ')
+          ..write('width: $width, ')
+          ..write('height: $height, ')
+          ..write('durationInSeconds: $durationInSeconds, ')
+          ..write('id: $id, ')
+          ..write('albumId: $albumId, ')
+          ..write('checksum: $checksum, ')
+          ..write('isFavorite: $isFavorite, ')
+          ..write('orientation: $orientation')
+          ..write(')'))
+        .toString();
+  }
+}
+
+i0.Index get idxTrashedLocalAssetAlbum => i0.Index(
+  'idx_trashed_local_asset_album',
+  'CREATE INDEX IF NOT EXISTS idx_trashed_local_asset_album ON trashed_local_asset_entity (album_id)',
+);
diff --git a/mobile/lib/infrastructure/repositories/db.repository.dart b/mobile/lib/infrastructure/repositories/db.repository.dart
index 7291c3a97b..548aa2e384 100644
--- a/mobile/lib/infrastructure/repositories/db.repository.dart
+++ b/mobile/lib/infrastructure/repositories/db.repository.dart
@@ -10,6 +10,7 @@ import 'package:immich_mobile/infrastructure/entities/exif.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/local_album.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/local_album_asset.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/local_asset.entity.dart';
+import 'package:immich_mobile/infrastructure/entities/trashed_local_asset.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/memory.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/memory_asset.entity.dart';
 import 'package:immich_mobile/infrastructure/entities/partner.entity.dart';
@@ -62,6 +63,7 @@ class IsarDatabaseRepository implements IDatabaseRepository {
     PersonEntity,
     AssetFaceEntity,
     StoreEntity,
+    TrashedLocalAssetEntity,
   ],
   include: {'package:immich_mobile/infrastructure/entities/merged_asset.drift'},
 )
@@ -93,7 +95,7 @@ class Drift extends $Drift implements IDatabaseRepository {
   }
 
   @override
-  int get schemaVersion => 12;
+  int get schemaVersion => 13;
 
   @override
   MigrationStrategy get migration => MigrationStrategy(
@@ -178,6 +180,11 @@ class Drift extends $Drift implements IDatabaseRepository {
               );
             }
           },
+          from12To13: (m, v13) async {
+            await m.create(v13.trashedLocalAssetEntity);
+            await m.createIndex(v13.idxTrashedLocalAssetChecksum);
+            await m.createIndex(v13.idxTrashedLocalAssetAlbum);
+          },
         ),
       );
 
diff --git a/mobile/lib/infrastructure/repositories/db.repository.drift.dart b/mobile/lib/infrastructure/repositories/db.repository.drift.dart
index e39ed8a560..bd72da949c 100644
--- a/mobile/lib/infrastructure/repositories/db.repository.drift.dart
+++ b/mobile/lib/infrastructure/repositories/db.repository.drift.dart
@@ -37,9 +37,11 @@ import 'package:immich_mobile/infrastructure/entities/asset_face.entity.drift.da
     as i17;
 import 'package:immich_mobile/infrastructure/entities/store.entity.drift.dart'
     as i18;
-import 'package:immich_mobile/infrastructure/entities/merged_asset.drift.dart'
+import 'package:immich_mobile/infrastructure/entities/trashed_local_asset.entity.drift.dart'
     as i19;
-import 'package:drift/internal/modular.dart' as i20;
+import 'package:immich_mobile/infrastructure/entities/merged_asset.drift.dart'
+    as i20;
+import 'package:drift/internal/modular.dart' as i21;
 
 abstract class $Drift extends i0.GeneratedDatabase {
   $Drift(i0.QueryExecutor e) : super(e);
@@ -77,9 +79,11 @@ abstract class $Drift extends i0.GeneratedDatabase {
   late final i17.$AssetFaceEntityTable assetFaceEntity = i17
       .$AssetFaceEntityTable(this);
   late final i18.$StoreEntityTable storeEntity = i18.$StoreEntityTable(this);
-  i19.MergedAssetDrift get mergedAssetDrift => i20.ReadDatabaseContainer(
+  late final i19.$TrashedLocalAssetEntityTable trashedLocalAssetEntity = i19
+      .$TrashedLocalAssetEntityTable(this);
+  i20.MergedAssetDrift get mergedAssetDrift => i21.ReadDatabaseContainer(
     this,
-  ).accessor<i19.MergedAssetDrift>(i19.MergedAssetDrift.new);
+  ).accessor<i20.MergedAssetDrift>(i20.MergedAssetDrift.new);
   @override
   Iterable<i0.TableInfo<i0.Table, Object?>> get allTables =>
       allSchemaEntities.whereType<i0.TableInfo<i0.Table, Object?>>();
@@ -108,7 +112,10 @@ abstract class $Drift extends i0.GeneratedDatabase {
     personEntity,
     assetFaceEntity,
     storeEntity,
+    trashedLocalAssetEntity,
     i11.idxLatLng,
+    i19.idxTrashedLocalAssetChecksum,
+    i19.idxTrashedLocalAssetAlbum,
   ];
   @override
   i0.StreamQueryUpdateRules
@@ -336,4 +343,9 @@ class $DriftManager {
       i17.$$AssetFaceEntityTableTableManager(_db, _db.assetFaceEntity);
   i18.$$StoreEntityTableTableManager get storeEntity =>
       i18.$$StoreEntityTableTableManager(_db, _db.storeEntity);
+  i19.$$TrashedLocalAssetEntityTableTableManager get trashedLocalAssetEntity =>
+      i19.$$TrashedLocalAssetEntityTableTableManager(
+        _db,
+        _db.trashedLocalAssetEntity,
+      );
 }
diff --git a/mobile/lib/infrastructure/repositories/db.repository.steps.dart b/mobile/lib/infrastructure/repositories/db.repository.steps.dart
index c973cd6f13..f2d87a7f83 100644
--- a/mobile/lib/infrastructure/repositories/db.repository.steps.dart
+++ b/mobile/lib/infrastructure/repositories/db.repository.steps.dart
@@ -5037,6 +5037,454 @@ final class Schema12 extends i0.VersionedSchema {
   );
 }
 
+final class Schema13 extends i0.VersionedSchema {
+  Schema13({required super.database}) : super(version: 13);
+  @override
+  late final List<i1.DatabaseSchemaEntity> entities = [
+    userEntity,
+    remoteAssetEntity,
+    stackEntity,
+    localAssetEntity,
+    remoteAlbumEntity,
+    localAlbumEntity,
+    localAlbumAssetEntity,
+    idxLocalAssetChecksum,
+    idxRemoteAssetOwnerChecksum,
+    uQRemoteAssetsOwnerChecksum,
+    uQRemoteAssetsOwnerLibraryChecksum,
+    idxRemoteAssetChecksum,
+    authUserEntity,
+    userMetadataEntity,
+    partnerEntity,
+    remoteExifEntity,
+    remoteAlbumAssetEntity,
+    remoteAlbumUserEntity,
+    memoryEntity,
+    memoryAssetEntity,
+    personEntity,
+    assetFaceEntity,
+    storeEntity,
+    trashedLocalAssetEntity,
+    idxLatLng,
+    idxTrashedLocalAssetChecksum,
+    idxTrashedLocalAssetAlbum,
+  ];
+  late final Shape20 userEntity = Shape20(
+    source: i0.VersionedTable(
+      entityName: 'user_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_0,
+        _column_1,
+        _column_3,
+        _column_84,
+        _column_85,
+        _column_91,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape17 remoteAssetEntity = Shape17(
+    source: i0.VersionedTable(
+      entityName: 'remote_asset_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_1,
+        _column_8,
+        _column_9,
+        _column_5,
+        _column_10,
+        _column_11,
+        _column_12,
+        _column_0,
+        _column_13,
+        _column_14,
+        _column_15,
+        _column_16,
+        _column_17,
+        _column_18,
+        _column_19,
+        _column_20,
+        _column_21,
+        _column_86,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape3 stackEntity = Shape3(
+    source: i0.VersionedTable(
+      entityName: 'stack_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [_column_0, _column_9, _column_5, _column_15, _column_75],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape2 localAssetEntity = Shape2(
+    source: i0.VersionedTable(
+      entityName: 'local_asset_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_1,
+        _column_8,
+        _column_9,
+        _column_5,
+        _column_10,
+        _column_11,
+        _column_12,
+        _column_0,
+        _column_22,
+        _column_14,
+        _column_23,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape9 remoteAlbumEntity = Shape9(
+    source: i0.VersionedTable(
+      entityName: 'remote_album_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_0,
+        _column_1,
+        _column_56,
+        _column_9,
+        _column_5,
+        _column_15,
+        _column_57,
+        _column_58,
+        _column_59,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape19 localAlbumEntity = Shape19(
+    source: i0.VersionedTable(
+      entityName: 'local_album_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_0,
+        _column_1,
+        _column_5,
+        _column_31,
+        _column_32,
+        _column_90,
+        _column_33,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape22 localAlbumAssetEntity = Shape22(
+    source: i0.VersionedTable(
+      entityName: 'local_album_asset_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(asset_id, album_id)'],
+      columns: [_column_34, _column_35, _column_33],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  final i1.Index idxLocalAssetChecksum = i1.Index(
+    'idx_local_asset_checksum',
+    'CREATE INDEX IF NOT EXISTS idx_local_asset_checksum ON local_asset_entity (checksum)',
+  );
+  final i1.Index idxRemoteAssetOwnerChecksum = i1.Index(
+    'idx_remote_asset_owner_checksum',
+    'CREATE INDEX IF NOT EXISTS idx_remote_asset_owner_checksum ON remote_asset_entity (owner_id, checksum)',
+  );
+  final i1.Index uQRemoteAssetsOwnerChecksum = i1.Index(
+    'UQ_remote_assets_owner_checksum',
+    'CREATE UNIQUE INDEX IF NOT EXISTS UQ_remote_assets_owner_checksum ON remote_asset_entity (owner_id, checksum) WHERE(library_id IS NULL)',
+  );
+  final i1.Index uQRemoteAssetsOwnerLibraryChecksum = i1.Index(
+    'UQ_remote_assets_owner_library_checksum',
+    'CREATE UNIQUE INDEX IF NOT EXISTS UQ_remote_assets_owner_library_checksum ON remote_asset_entity (owner_id, library_id, checksum) WHERE(library_id IS NOT NULL)',
+  );
+  final i1.Index idxRemoteAssetChecksum = i1.Index(
+    'idx_remote_asset_checksum',
+    'CREATE INDEX IF NOT EXISTS idx_remote_asset_checksum ON remote_asset_entity (checksum)',
+  );
+  late final Shape21 authUserEntity = Shape21(
+    source: i0.VersionedTable(
+      entityName: 'auth_user_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_0,
+        _column_1,
+        _column_3,
+        _column_2,
+        _column_84,
+        _column_85,
+        _column_92,
+        _column_93,
+        _column_7,
+        _column_94,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape4 userMetadataEntity = Shape4(
+    source: i0.VersionedTable(
+      entityName: 'user_metadata_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(user_id, "key")'],
+      columns: [_column_25, _column_26, _column_27],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape5 partnerEntity = Shape5(
+    source: i0.VersionedTable(
+      entityName: 'partner_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(shared_by_id, shared_with_id)'],
+      columns: [_column_28, _column_29, _column_30],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape8 remoteExifEntity = Shape8(
+    source: i0.VersionedTable(
+      entityName: 'remote_exif_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(asset_id)'],
+      columns: [
+        _column_36,
+        _column_37,
+        _column_38,
+        _column_39,
+        _column_40,
+        _column_41,
+        _column_11,
+        _column_10,
+        _column_42,
+        _column_43,
+        _column_44,
+        _column_45,
+        _column_46,
+        _column_47,
+        _column_48,
+        _column_49,
+        _column_50,
+        _column_51,
+        _column_52,
+        _column_53,
+        _column_54,
+        _column_55,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape7 remoteAlbumAssetEntity = Shape7(
+    source: i0.VersionedTable(
+      entityName: 'remote_album_asset_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(asset_id, album_id)'],
+      columns: [_column_36, _column_60],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape10 remoteAlbumUserEntity = Shape10(
+    source: i0.VersionedTable(
+      entityName: 'remote_album_user_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(album_id, user_id)'],
+      columns: [_column_60, _column_25, _column_61],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape11 memoryEntity = Shape11(
+    source: i0.VersionedTable(
+      entityName: 'memory_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_0,
+        _column_9,
+        _column_5,
+        _column_18,
+        _column_15,
+        _column_8,
+        _column_62,
+        _column_63,
+        _column_64,
+        _column_65,
+        _column_66,
+        _column_67,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape12 memoryAssetEntity = Shape12(
+    source: i0.VersionedTable(
+      entityName: 'memory_asset_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(asset_id, memory_id)'],
+      columns: [_column_36, _column_68],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape14 personEntity = Shape14(
+    source: i0.VersionedTable(
+      entityName: 'person_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_0,
+        _column_9,
+        _column_5,
+        _column_15,
+        _column_1,
+        _column_69,
+        _column_71,
+        _column_72,
+        _column_73,
+        _column_74,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape15 assetFaceEntity = Shape15(
+    source: i0.VersionedTable(
+      entityName: 'asset_face_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [
+        _column_0,
+        _column_36,
+        _column_76,
+        _column_77,
+        _column_78,
+        _column_79,
+        _column_80,
+        _column_81,
+        _column_82,
+        _column_83,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape18 storeEntity = Shape18(
+    source: i0.VersionedTable(
+      entityName: 'store_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id)'],
+      columns: [_column_87, _column_88, _column_89],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  late final Shape23 trashedLocalAssetEntity = Shape23(
+    source: i0.VersionedTable(
+      entityName: 'trashed_local_asset_entity',
+      withoutRowId: true,
+      isStrict: true,
+      tableConstraints: ['PRIMARY KEY(id, album_id)'],
+      columns: [
+        _column_1,
+        _column_8,
+        _column_9,
+        _column_5,
+        _column_10,
+        _column_11,
+        _column_12,
+        _column_0,
+        _column_95,
+        _column_22,
+        _column_14,
+        _column_23,
+      ],
+      attachedDatabase: database,
+    ),
+    alias: null,
+  );
+  final i1.Index idxLatLng = i1.Index(
+    'idx_lat_lng',
+    'CREATE INDEX IF NOT EXISTS idx_lat_lng ON remote_exif_entity (latitude, longitude)',
+  );
+  final i1.Index idxTrashedLocalAssetChecksum = i1.Index(
+    'idx_trashed_local_asset_checksum',
+    'CREATE INDEX IF NOT EXISTS idx_trashed_local_asset_checksum ON trashed_local_asset_entity (checksum)',
+  );
+  final i1.Index idxTrashedLocalAssetAlbum = i1.Index(
+    'idx_trashed_local_asset_album',
+    'CREATE INDEX IF NOT EXISTS idx_trashed_local_asset_album ON trashed_local_asset_entity (album_id)',
+  );
+}
+
+class Shape23 extends i0.VersionedTable {
+  Shape23({required super.source, required super.alias}) : super.aliased();
+  i1.GeneratedColumn<String> get name =>
+      columnsByName['name']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<int> get type =>
+      columnsByName['type']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<DateTime> get createdAt =>
+      columnsByName['created_at']! as i1.GeneratedColumn<DateTime>;
+  i1.GeneratedColumn<DateTime> get updatedAt =>
+      columnsByName['updated_at']! as i1.GeneratedColumn<DateTime>;
+  i1.GeneratedColumn<int> get width =>
+      columnsByName['width']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<int> get height =>
+      columnsByName['height']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<int> get durationInSeconds =>
+      columnsByName['duration_in_seconds']! as i1.GeneratedColumn<int>;
+  i1.GeneratedColumn<String> get id =>
+      columnsByName['id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get albumId =>
+      columnsByName['album_id']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<String> get checksum =>
+      columnsByName['checksum']! as i1.GeneratedColumn<String>;
+  i1.GeneratedColumn<bool> get isFavorite =>
+      columnsByName['is_favorite']! as i1.GeneratedColumn<bool>;
+  i1.GeneratedColumn<int> get orientation =>
+      columnsByName['orientation']! as i1.GeneratedColumn<int>;
+}
+
+i1.GeneratedColumn<String> _column_95(String aliasedName) =>
+    i1.GeneratedColumn<String>(
+      'album_id',
+      aliasedName,
+      false,
+      type: i1.DriftSqlType.string,
+    );
 i0.MigrationStepWithVersion migrationSteps({
   required Future<void> Function(i1.Migrator m, Schema2 schema) from1To2,
   required Future<void> Function(i1.Migrator m, Schema3 schema) from2To3,
@@ -5049,6 +5497,7 @@ i0.MigrationStepWithVersion migrationSteps({
   required Future<void> Function(i1.Migrator m, Schema10 schema) from9To10,
   required Future<void> Function(i1.Migrator m, Schema11 schema) from10To11,
   required Future<void> Function(i1.Migrator m, Schema12 schema) from11To12,
+  required Future<void> Function(i1.Migrator m, Schema13 schema) from12To13,
 }) {
   return (currentVersion, database) async {
     switch (currentVersion) {
@@ -5107,6 +5556,11 @@ i0.MigrationStepWithVersion migrationSteps({
         final migrator = i1.Migrator(database, schema);
         await from11To12(migrator, schema);
         return 12;
+      case 12:
+        final schema = Schema13(database: database);
+        final migrator = i1.Migrator(database, schema);
+        await from12To13(migrator, schema);
+        return 13;
       default:
         throw ArgumentError.value('Unknown migration from $currentVersion');
     }
@@ -5125,6 +5579,7 @@ i1.OnUpgrade stepByStep({
   required Future<void> Function(i1.Migrator m, Schema10 schema) from9To10,
   required Future<void> Function(i1.Migrator m, Schema11 schema) from10To11,
   required Future<void> Function(i1.Migrator m, Schema12 schema) from11To12,
+  required Future<void> Function(i1.Migrator m, Schema13 schema) from12To13,
 }) => i0.VersionedSchema.stepByStepHelper(
   step: migrationSteps(
     from1To2: from1To2,
@@ -5138,5 +5593,6 @@ i1.OnUpgrade stepByStep({
     from9To10: from9To10,
     from10To11: from10To11,
     from11To12: from11To12,
+    from12To13: from12To13,
   ),
 );
diff --git a/mobile/lib/infrastructure/repositories/local_asset.repository.dart b/mobile/lib/infrastructure/repositories/local_asset.repository.dart
index 2b76472c9e..4d30e09716 100644
--- a/mobile/lib/infrastructure/repositories/local_asset.repository.dart
+++ b/mobile/lib/infrastructure/repositories/local_asset.repository.dart
@@ -1,4 +1,6 @@
+import 'package:collection/collection.dart';
 import 'package:drift/drift.dart';
+import 'package:immich_mobile/constants/constants.dart';
 import 'package:immich_mobile/domain/models/album/local_album.model.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/infrastructure/entities/local_album.entity.dart';
@@ -8,6 +10,7 @@ import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
 
 class DriftLocalAssetRepository extends DriftDatabaseRepository {
   final Drift _db;
+
   const DriftLocalAssetRepository(this._db) : super(_db);
 
   SingleOrNullSelectable<LocalAsset?> _assetSelectable(String id) {
@@ -95,4 +98,32 @@ class DriftLocalAssetRepository extends DriftDatabaseRepository {
     }
     return query.map((localAlbum) => localAlbum.toDto()).get();
   }
+
+  Future<Map<String, List<LocalAsset>>> getAssetsFromBackupAlbums(Iterable<String> checksums) async {
+    if (checksums.isEmpty) {
+      return {};
+    }
+
+    final result = <String, List<LocalAsset>>{};
+
+    for (final slice in checksums.toSet().slices(kDriftMaxChunk)) {
+      final rows =
+          await (_db.select(_db.localAlbumAssetEntity).join([
+                innerJoin(_db.localAlbumEntity, _db.localAlbumAssetEntity.albumId.equalsExp(_db.localAlbumEntity.id)),
+                innerJoin(_db.localAssetEntity, _db.localAlbumAssetEntity.assetId.equalsExp(_db.localAssetEntity.id)),
+              ])..where(
+                _db.localAlbumEntity.backupSelection.equalsValue(BackupSelection.selected) &
+                    _db.localAssetEntity.checksum.isIn(slice),
+              ))
+              .get();
+
+      for (final row in rows) {
+        final albumId = row.readTable(_db.localAlbumAssetEntity).albumId;
+        final assetData = row.readTable(_db.localAssetEntity);
+        final asset = assetData.toDto();
+        (result[albumId] ??= <LocalAsset>[]).add(asset);
+      }
+    }
+    return result;
+  }
 }
diff --git a/mobile/lib/infrastructure/repositories/remote_asset.repository.dart b/mobile/lib/infrastructure/repositories/remote_asset.repository.dart
index be55c21afc..96c204ea0e 100644
--- a/mobile/lib/infrastructure/repositories/remote_asset.repository.dart
+++ b/mobile/lib/infrastructure/repositories/remote_asset.repository.dart
@@ -12,6 +12,7 @@ import 'package:maplibre_gl/maplibre_gl.dart';
 
 class RemoteAssetRepository extends DriftDatabaseRepository {
   final Drift _db;
+
   const RemoteAssetRepository(this._db) : super(_db);
 
   /// For testing purposes
diff --git a/mobile/lib/infrastructure/repositories/trashed_local_asset.repository.dart b/mobile/lib/infrastructure/repositories/trashed_local_asset.repository.dart
new file mode 100644
index 0000000000..498e4227b7
--- /dev/null
+++ b/mobile/lib/infrastructure/repositories/trashed_local_asset.repository.dart
@@ -0,0 +1,252 @@
+import 'package:collection/collection.dart';
+import 'package:drift/drift.dart';
+import 'package:immich_mobile/constants/constants.dart';
+import 'package:immich_mobile/domain/models/album/local_album.model.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/infrastructure/entities/local_asset.entity.dart';
+import 'package:immich_mobile/infrastructure/entities/local_asset.entity.drift.dart';
+import 'package:immich_mobile/infrastructure/entities/trashed_local_asset.entity.dart';
+import 'package:immich_mobile/infrastructure/entities/trashed_local_asset.entity.drift.dart';
+import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';
+
+typedef TrashedAsset = ({String albumId, LocalAsset asset});
+
+class DriftTrashedLocalAssetRepository extends DriftDatabaseRepository {
+  final Drift _db;
+
+  const DriftTrashedLocalAssetRepository(this._db) : super(_db);
+
+  Future<void> updateHashes(Map<String, String> hashes) {
+    if (hashes.isEmpty) {
+      return Future.value();
+    }
+    return _db.batch((batch) async {
+      for (final entry in hashes.entries) {
+        batch.update(
+          _db.trashedLocalAssetEntity,
+          TrashedLocalAssetEntityCompanion(checksum: Value(entry.value)),
+          where: (e) => e.id.equals(entry.key),
+        );
+      }
+    });
+  }
+
+  Future<List<LocalAsset>> getAssetsToHash(Iterable<String> albumIds) {
+    final query = _db.trashedLocalAssetEntity.select()..where((r) => r.albumId.isIn(albumIds) & r.checksum.isNull());
+    return query.map((row) => row.toLocalAsset()).get();
+  }
+
+  Future<Iterable<LocalAsset>> getToRestore() async {
+    final selectedAlbumIds = (_db.selectOnly(_db.localAlbumEntity)
+      ..addColumns([_db.localAlbumEntity.id])
+      ..where(_db.localAlbumEntity.backupSelection.equalsValue(BackupSelection.selected)));
+
+    final rows =
+        await (_db.select(_db.trashedLocalAssetEntity).join([
+              innerJoin(
+                _db.remoteAssetEntity,
+                _db.remoteAssetEntity.checksum.equalsExp(_db.trashedLocalAssetEntity.checksum),
+              ),
+            ])..where(
+              _db.trashedLocalAssetEntity.albumId.isInQuery(selectedAlbumIds) &
+                  _db.remoteAssetEntity.deletedAt.isNull(),
+            ))
+            .get();
+
+    return rows.map((result) => result.readTable(_db.trashedLocalAssetEntity).toLocalAsset());
+  }
+
+  /// Applies resulted snapshot of trashed assets:
+  /// - upserts incoming rows
+  /// - deletes rows that are not present in the snapshot
+  Future<void> processTrashSnapshot(Iterable<TrashedAsset> trashedAssets) async {
+    if (trashedAssets.isEmpty) {
+      await _db.delete(_db.trashedLocalAssetEntity).go();
+      return;
+    }
+    final assetIds = trashedAssets.map((e) => e.asset.id).toSet();
+    Map<String, String> localChecksumById = await _getCachedChecksums(assetIds);
+
+    return _db.transaction(() async {
+      await _db.batch((batch) {
+        for (final item in trashedAssets) {
+          final effectiveChecksum = localChecksumById[item.asset.id] ?? item.asset.checksum;
+          final companion = TrashedLocalAssetEntityCompanion.insert(
+            id: item.asset.id,
+            albumId: item.albumId,
+            checksum: Value(effectiveChecksum),
+            name: item.asset.name,
+            type: item.asset.type,
+            createdAt: Value(item.asset.createdAt),
+            updatedAt: Value(item.asset.updatedAt),
+            width: Value(item.asset.width),
+            height: Value(item.asset.height),
+            durationInSeconds: Value(item.asset.durationInSeconds),
+            isFavorite: Value(item.asset.isFavorite),
+            orientation: Value(item.asset.orientation),
+          );
+
+          batch.insert<$TrashedLocalAssetEntityTable, TrashedLocalAssetEntityData>(
+            _db.trashedLocalAssetEntity,
+            companion,
+            onConflict: DoUpdate((_) => companion, where: (old) => old.updatedAt.isNotValue(item.asset.updatedAt)),
+          );
+        }
+      });
+
+      if (assetIds.length <= kDriftMaxChunk) {
+        await (_db.delete(_db.trashedLocalAssetEntity)..where((row) => row.id.isNotIn(assetIds))).go();
+      } else {
+        final existingIds = await (_db.selectOnly(
+          _db.trashedLocalAssetEntity,
+        )..addColumns([_db.trashedLocalAssetEntity.id])).map((r) => r.read(_db.trashedLocalAssetEntity.id)!).get();
+        final idToDelete = existingIds.where((id) => !assetIds.contains(id));
+        for (final slice in idToDelete.slices(kDriftMaxChunk)) {
+          await (_db.delete(_db.trashedLocalAssetEntity)..where((t) => t.id.isIn(slice))).go();
+        }
+      }
+    });
+  }
+
+  Stream<int> watchCount() {
+    return (_db.selectOnly(_db.trashedLocalAssetEntity)..addColumns([_db.trashedLocalAssetEntity.id.count()]))
+        .watchSingle()
+        .map((row) => row.read<int>(_db.trashedLocalAssetEntity.id.count()) ?? 0);
+  }
+
+  Stream<int> watchHashedCount() {
+    return (_db.selectOnly(_db.trashedLocalAssetEntity)
+          ..addColumns([_db.trashedLocalAssetEntity.id.count()])
+          ..where(_db.trashedLocalAssetEntity.checksum.isNotNull()))
+        .watchSingle()
+        .map((row) => row.read<int>(_db.trashedLocalAssetEntity.id.count()) ?? 0);
+  }
+
+  Future<void> trashLocalAsset(Map<String, List<LocalAsset>> assetsByAlbums) async {
+    if (assetsByAlbums.isEmpty) {
+      return;
+    }
+
+    final companions = <TrashedLocalAssetEntityCompanion>[];
+    final idToDelete = <String>{};
+
+    for (final entry in assetsByAlbums.entries) {
+      for (final asset in entry.value) {
+        idToDelete.add(asset.id);
+        companions.add(
+          TrashedLocalAssetEntityCompanion(
+            id: Value(asset.id),
+            name: Value(asset.name),
+            albumId: Value(entry.key),
+            checksum: Value(asset.checksum),
+            type: Value(asset.type),
+            width: Value(asset.width),
+            height: Value(asset.height),
+            durationInSeconds: Value(asset.durationInSeconds),
+            isFavorite: Value(asset.isFavorite),
+            orientation: Value(asset.orientation),
+            createdAt: Value(asset.createdAt),
+            updatedAt: Value(asset.updatedAt),
+          ),
+        );
+      }
+    }
+
+    await _db.transaction(() async {
+      for (final companion in companions) {
+        await _db.into(_db.trashedLocalAssetEntity).insertOnConflictUpdate(companion);
+      }
+
+      for (final slice in idToDelete.slices(kDriftMaxChunk)) {
+        await (_db.delete(_db.localAssetEntity)..where((t) => t.id.isIn(slice))).go();
+      }
+    });
+  }
+
+  Future<void> applyRestoredAssets(List<String> idList) async {
+    if (idList.isEmpty) {
+      return;
+    }
+
+    final trashedAssets = <TrashedLocalAssetEntityData>[];
+
+    for (final slice in idList.slices(kDriftMaxChunk)) {
+      final q = _db.select(_db.trashedLocalAssetEntity)..where((t) => t.id.isIn(slice));
+      trashedAssets.addAll(await q.get());
+    }
+
+    if (trashedAssets.isEmpty) {
+      return;
+    }
+
+    final companions = trashedAssets.map((e) {
+      return LocalAssetEntityCompanion.insert(
+        id: e.id,
+        name: e.name,
+        type: e.type,
+        createdAt: Value(e.createdAt),
+        updatedAt: Value(e.updatedAt),
+        width: Value(e.width),
+        height: Value(e.height),
+        durationInSeconds: Value(e.durationInSeconds),
+        checksum: Value(e.checksum),
+        isFavorite: Value(e.isFavorite),
+        orientation: Value(e.orientation),
+      );
+    });
+
+    await _db.transaction(() async {
+      for (final companion in companions) {
+        await _db.into(_db.localAssetEntity).insertOnConflictUpdate(companion);
+      }
+      for (final slice in idList.slices(kDriftMaxChunk)) {
+        await (_db.delete(_db.trashedLocalAssetEntity)..where((t) => t.id.isIn(slice))).go();
+      }
+    });
+  }
+
+  Future<Map<String, List<LocalAsset>>> getToTrash() async {
+    final result = <String, List<LocalAsset>>{};
+
+    final rows =
+        await (_db.select(_db.localAlbumAssetEntity).join([
+              innerJoin(_db.localAlbumEntity, _db.localAlbumAssetEntity.albumId.equalsExp(_db.localAlbumEntity.id)),
+              innerJoin(_db.localAssetEntity, _db.localAlbumAssetEntity.assetId.equalsExp(_db.localAssetEntity.id)),
+              leftOuterJoin(
+                _db.remoteAssetEntity,
+                _db.remoteAssetEntity.checksum.equalsExp(_db.localAssetEntity.checksum),
+              ),
+            ])..where(
+              _db.localAlbumEntity.backupSelection.equalsValue(BackupSelection.selected) &
+                  _db.remoteAssetEntity.deletedAt.isNotNull(),
+            ))
+            .get();
+
+    for (final row in rows) {
+      final albumId = row.readTable(_db.localAlbumAssetEntity).albumId;
+      final asset = row.readTable(_db.localAssetEntity).toDto();
+      (result[albumId] ??= <LocalAsset>[]).add(asset);
+    }
+
+    return result;
+  }
+
+  //attempt to reuse existing checksums
+  Future<Map<String, String>> _getCachedChecksums(Set<String> assetIds) async {
+    final localChecksumById = <String, String>{};
+
+    for (final slice in assetIds.slices(kDriftMaxChunk)) {
+      final rows =
+          await (_db.selectOnly(_db.localAssetEntity)
+                ..where(_db.localAssetEntity.id.isIn(slice) & _db.localAssetEntity.checksum.isNotNull())
+                ..addColumns([_db.localAssetEntity.id, _db.localAssetEntity.checksum]))
+              .get();
+
+      for (final r in rows) {
+        localChecksumById[r.read(_db.localAssetEntity.id)!] = r.read(_db.localAssetEntity.checksum)!;
+      }
+    }
+
+    return localChecksumById;
+  }
+}
diff --git a/mobile/lib/platform/native_sync_api.g.dart b/mobile/lib/platform/native_sync_api.g.dart
index 8e4b900292..34ed7a5e2b 100644
--- a/mobile/lib/platform/native_sync_api.g.dart
+++ b/mobile/lib/platform/native_sync_api.g.dart
@@ -562,4 +562,32 @@ class NativeSyncApi {
       return;
     }
   }
+
+  Future<Map<String, List<PlatformAsset>>> getTrashedAssets() async {
+    final String pigeonVar_channelName =
+        'dev.flutter.pigeon.immich_mobile.NativeSyncApi.getTrashedAssets$pigeonVar_messageChannelSuffix';
+    final BasicMessageChannel<Object?> pigeonVar_channel = BasicMessageChannel<Object?>(
+      pigeonVar_channelName,
+      pigeonChannelCodec,
+      binaryMessenger: pigeonVar_binaryMessenger,
+    );
+    final Future<Object?> pigeonVar_sendFuture = pigeonVar_channel.send(null);
+    final List<Object?>? pigeonVar_replyList = await pigeonVar_sendFuture as List<Object?>?;
+    if (pigeonVar_replyList == null) {
+      throw _createConnectionError(pigeonVar_channelName);
+    } else if (pigeonVar_replyList.length > 1) {
+      throw PlatformException(
+        code: pigeonVar_replyList[0]! as String,
+        message: pigeonVar_replyList[1] as String?,
+        details: pigeonVar_replyList[2],
+      );
+    } else if (pigeonVar_replyList[0] == null) {
+      throw PlatformException(
+        code: 'null-error',
+        message: 'Host platform returned null value for non-null return value.',
+      );
+    } else {
+      return (pigeonVar_replyList[0] as Map<Object?, Object?>?)!.cast<String, List<PlatformAsset>>();
+    }
+  }
 }
diff --git a/mobile/lib/providers/infrastructure/asset.provider.dart b/mobile/lib/providers/infrastructure/asset.provider.dart
index 4b51ce33bd..70cb200bf1 100644
--- a/mobile/lib/providers/infrastructure/asset.provider.dart
+++ b/mobile/lib/providers/infrastructure/asset.provider.dart
@@ -2,6 +2,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/services/asset.service.dart';
 import 'package:immich_mobile/infrastructure/repositories/local_asset.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/remote_asset.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/trashed_local_asset.repository.dart';
 import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
 import 'package:immich_mobile/providers/user.provider.dart';
 
@@ -13,6 +14,10 @@ final remoteAssetRepositoryProvider = Provider<RemoteAssetRepository>(
   (ref) => RemoteAssetRepository(ref.watch(driftProvider)),
 );
 
+final trashedLocalAssetRepository = Provider<DriftTrashedLocalAssetRepository>(
+  (ref) => DriftTrashedLocalAssetRepository(ref.watch(driftProvider)),
+);
+
 final assetServiceProvider = Provider(
   (ref) => AssetService(
     remoteAssetRepository: ref.watch(remoteAssetRepositoryProvider),
diff --git a/mobile/lib/providers/infrastructure/sync.provider.dart b/mobile/lib/providers/infrastructure/sync.provider.dart
index f03754505c..6ba9c4bb78 100644
--- a/mobile/lib/providers/infrastructure/sync.provider.dart
+++ b/mobile/lib/providers/infrastructure/sync.provider.dart
@@ -10,11 +10,17 @@ import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/cancel.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/db.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/local_files_manager.repository.dart';
 
 final syncStreamServiceProvider = Provider(
   (ref) => SyncStreamService(
     syncApiRepository: ref.watch(syncApiRepositoryProvider),
     syncStreamRepository: ref.watch(syncStreamRepositoryProvider),
+    localAssetRepository: ref.watch(localAssetRepository),
+    trashedLocalAssetRepository: ref.watch(trashedLocalAssetRepository),
+    localFilesManager: ref.watch(localFilesManagerRepositoryProvider),
+    storageRepository: ref.watch(storageRepositoryProvider),
     cancelChecker: ref.watch(cancellationProvider),
   ),
 );
@@ -26,6 +32,9 @@ final syncStreamRepositoryProvider = Provider((ref) => SyncStreamRepository(ref.
 final localSyncServiceProvider = Provider(
   (ref) => LocalSyncService(
     localAlbumRepository: ref.watch(localAlbumRepository),
+    trashedLocalAssetRepository: ref.watch(trashedLocalAssetRepository),
+    localFilesManager: ref.watch(localFilesManagerRepositoryProvider),
+    storageRepository: ref.watch(storageRepositoryProvider),
     nativeSyncApi: ref.watch(nativeSyncApiProvider),
   ),
 );
@@ -35,5 +44,6 @@ final hashServiceProvider = Provider(
     localAlbumRepository: ref.watch(localAlbumRepository),
     localAssetRepository: ref.watch(localAssetRepository),
     nativeSyncApi: ref.watch(nativeSyncApiProvider),
+    trashedLocalAssetRepository: ref.watch(trashedLocalAssetRepository),
   ),
 );
diff --git a/mobile/lib/providers/infrastructure/trash_sync.provider.dart b/mobile/lib/providers/infrastructure/trash_sync.provider.dart
new file mode 100644
index 0000000000..a783080f33
--- /dev/null
+++ b/mobile/lib/providers/infrastructure/trash_sync.provider.dart
@@ -0,0 +1,12 @@
+import 'package:async/async.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
+
+typedef TrashedAssetsCount = ({int total, int hashed});
+
+final trashedAssetsCountProvider = StreamProvider<TrashedAssetsCount>((ref) {
+  final repo = ref.watch(trashedLocalAssetRepository);
+  final total$ = repo.watchCount();
+  final hashed$ = repo.watchHashedCount();
+  return StreamZip<int>([total$, hashed$]).map((values) => (total: values[0], hashed: values[1]));
+});
diff --git a/mobile/lib/providers/trash.provider.dart b/mobile/lib/providers/trash.provider.dart
index adf3b1027b..41b9160b9b 100644
--- a/mobile/lib/providers/trash.provider.dart
+++ b/mobile/lib/providers/trash.provider.dart
@@ -1,6 +1,6 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/services/trash.service.dart';
 import 'package:immich_mobile/entities/asset.entity.dart';
+import 'package:immich_mobile/services/trash.service.dart';
 import 'package:logging/logging.dart';
 
 class TrashNotifier extends StateNotifier<bool> {
diff --git a/mobile/lib/repositories/local_files_manager.repository.dart b/mobile/lib/repositories/local_files_manager.repository.dart
index 519d79b49b..765c9a6f0e 100644
--- a/mobile/lib/repositories/local_files_manager.repository.dart
+++ b/mobile/lib/repositories/local_files_manager.repository.dart
@@ -1,13 +1,16 @@
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/services/local_files_manager.service.dart';
+import 'package:logging/logging.dart';
 
 final localFilesManagerRepositoryProvider = Provider(
   (ref) => LocalFilesManagerRepository(ref.watch(localFileManagerServiceProvider)),
 );
 
 class LocalFilesManagerRepository {
-  const LocalFilesManagerRepository(this._service);
+  LocalFilesManagerRepository(this._service);
 
+  final Logger _logger = Logger('SyncStreamService');
   final LocalFilesManagerService _service;
 
   Future<bool> moveToTrash(List<String> mediaUrls) async {
@@ -21,4 +24,26 @@ class LocalFilesManagerRepository {
   Future<bool> requestManageMediaPermission() async {
     return await _service.requestManageMediaPermission();
   }
+
+  Future<bool> hasManageMediaPermission() async {
+    return await _service.hasManageMediaPermission();
+  }
+
+  Future<bool> manageMediaPermission() async {
+    return await _service.manageMediaPermission();
+  }
+
+  Future<List<String>> restoreAssetsFromTrash(Iterable<LocalAsset> assets) async {
+    final restoredIds = <String>[];
+    for (final asset in assets) {
+      _logger.info("Restoring from trash, localId: ${asset.id}, remoteId: ${asset.checksum}");
+      try {
+        await _service.restoreFromTrashById(asset.id, asset.type.index);
+        restoredIds.add(asset.id);
+      } catch (e) {
+        _logger.warning("Restoring failure: $e");
+      }
+    }
+    return restoredIds;
+  }
 }
diff --git a/mobile/lib/services/local_files_manager.service.dart b/mobile/lib/services/local_files_manager.service.dart
index 7cb3067342..0cc00f3e4b 100644
--- a/mobile/lib/services/local_files_manager.service.dart
+++ b/mobile/lib/services/local_files_manager.service.dart
@@ -6,6 +6,7 @@ final localFileManagerServiceProvider = Provider<LocalFilesManagerService>((ref)
 
 class LocalFilesManagerService {
   const LocalFilesManagerService();
+
   static final Logger _logger = Logger('LocalFilesManager');
   static const MethodChannel _channel = MethodChannel('file_trash');
 
@@ -27,6 +28,15 @@ class LocalFilesManagerService {
     }
   }
 
+  Future<bool> restoreFromTrashById(String mediaId, int type) async {
+    try {
+      return await _channel.invokeMethod('restoreFromTrash', {'mediaId': mediaId, 'type': type});
+    } catch (e, s) {
+      _logger.warning('Error restore file from trash by Id', e, s);
+      return false;
+    }
+  }
+
   Future<bool> requestManageMediaPermission() async {
     try {
       return await _channel.invokeMethod('requestManageMediaPermission');
@@ -35,4 +45,22 @@ class LocalFilesManagerService {
       return false;
     }
   }
+
+  Future<bool> hasManageMediaPermission() async {
+    try {
+      return await _channel.invokeMethod('hasManageMediaPermission');
+    } catch (e, s) {
+      _logger.warning('Error requesting manage media permission state', e, s);
+      return false;
+    }
+  }
+
+  Future<bool> manageMediaPermission() async {
+    try {
+      return await _channel.invokeMethod('manageMediaPermission');
+    } catch (e, s) {
+      _logger.warning('Error requesting manage media permission settings', e, s);
+      return false;
+    }
+  }
 }
diff --git a/mobile/lib/widgets/forms/login/login_form.dart b/mobile/lib/widgets/forms/login/login_form.dart
index bb987d5bc0..f810973298 100644
--- a/mobile/lib/widgets/forms/login/login_form.dart
+++ b/mobile/lib/widgets/forms/login/login_form.dart
@@ -21,6 +21,7 @@ import 'package:immich_mobile/providers/gallery_permission.provider.dart';
 import 'package:immich_mobile/providers/oauth.provider.dart';
 import 'package:immich_mobile/providers/server_info.provider.dart';
 import 'package:immich_mobile/providers/websocket.provider.dart';
+import 'package:immich_mobile/repositories/local_files_manager.repository.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/utils/provider_utils.dart';
 import 'package:immich_mobile/utils/url_helper.dart';
@@ -177,6 +178,55 @@ class LoginForm extends HookConsumerWidget {
       }
     }
 
+    getManageMediaPermission() async {
+      final hasPermission = await ref.read(localFilesManagerRepositoryProvider).hasManageMediaPermission();
+      if (!hasPermission) {
+        await showDialog(
+          context: context,
+          builder: (BuildContext context) {
+            return AlertDialog(
+              shape: const RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(10))),
+              elevation: 5,
+              title: Text(
+                'manage_media_access_title',
+                style: TextStyle(fontSize: 16, fontWeight: FontWeight.bold, color: context.primaryColor),
+              ).tr(),
+              content: SingleChildScrollView(
+                child: ListBody(
+                  children: [
+                    const Text('manage_media_access_subtitle', style: TextStyle(fontSize: 14)).tr(),
+                    const SizedBox(height: 4),
+                    const Text('manage_media_access_rationale', style: TextStyle(fontSize: 12)).tr(),
+                  ],
+                ),
+              ),
+              actions: [
+                TextButton(
+                  onPressed: () => Navigator.of(context).pop(),
+                  child: Text(
+                    'cancel'.tr(),
+                    style: TextStyle(fontWeight: FontWeight.w600, color: context.primaryColor),
+                  ),
+                ),
+                TextButton(
+                  onPressed: () {
+                    ref.read(localFilesManagerRepositoryProvider).requestManageMediaPermission();
+                    Navigator.of(context).pop();
+                  },
+                  child: Text(
+                    'manage_media_access_settings'.tr(),
+                    style: TextStyle(fontWeight: FontWeight.w600, color: context.primaryColor),
+                  ),
+                ),
+              ],
+            );
+          },
+        );
+      }
+    }
+
+    bool isSyncRemoteDeletionsMode() => Platform.isAndroid && Store.get(StoreKey.manageLocalMediaAndroid, false);
+
     login() async {
       TextInput.finishAutofillContext();
 
@@ -194,6 +244,9 @@ class LoginForm extends HookConsumerWidget {
           final isBeta = Store.isBetaTimelineEnabled;
           if (isBeta) {
             await ref.read(galleryPermissionNotifier.notifier).requestGalleryPermission();
+            if (isSyncRemoteDeletionsMode()) {
+              await getManageMediaPermission();
+            }
             unawaited(handleSyncFlow());
             ref.read(websocketProvider.notifier).connect();
             unawaited(context.replaceRoute(const TabShellRoute()));
@@ -293,6 +346,9 @@ class LoginForm extends HookConsumerWidget {
             }
             if (isBeta) {
               await ref.read(galleryPermissionNotifier.notifier).requestGalleryPermission();
+              if (isSyncRemoteDeletionsMode()) {
+                await getManageMediaPermission();
+              }
               unawaited(handleSyncFlow());
               unawaited(context.replaceRoute(const TabShellRoute()));
               return;
diff --git a/mobile/lib/widgets/settings/advanced_settings.dart b/mobile/lib/widgets/settings/advanced_settings.dart
index 9255a7ae52..aee28c9449 100644
--- a/mobile/lib/widgets/settings/advanced_settings.dart
+++ b/mobile/lib/widgets/settings/advanced_settings.dart
@@ -8,8 +8,8 @@ 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/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/readonly_mode.provider.dart';
+import 'package:immich_mobile/providers/user.provider.dart';
 import 'package:immich_mobile/repositories/local_files_manager.repository.dart';
 import 'package:immich_mobile/services/app_settings.service.dart';
 import 'package:immich_mobile/utils/hooks/app_settings_update_hook.dart';
@@ -17,6 +17,7 @@ import 'package:immich_mobile/utils/http_ssl_options.dart';
 import 'package:immich_mobile/widgets/settings/beta_timeline_list_tile.dart';
 import 'package:immich_mobile/widgets/settings/custom_proxy_headers_settings/custom_proxy_headers_settings.dart';
 import 'package:immich_mobile/widgets/settings/local_storage_settings.dart';
+import 'package:immich_mobile/widgets/settings/settings_action_tile.dart';
 import 'package:immich_mobile/widgets/settings/settings_slider_list_tile.dart';
 import 'package:immich_mobile/widgets/settings/settings_sub_page_scaffold.dart';
 import 'package:immich_mobile/widgets/settings/settings_switch_list_tile.dart';
@@ -25,12 +26,15 @@ import 'package:logging/logging.dart';
 
 class AdvancedSettings extends HookConsumerWidget {
   const AdvancedSettings({super.key});
+
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     bool isLoggedIn = ref.read(currentUserProvider) != null;
 
     final advancedTroubleshooting = useAppSettingsState(AppSettingsEnum.advancedTroubleshooting);
     final manageLocalMediaAndroid = useAppSettingsState(AppSettingsEnum.manageLocalMediaAndroid);
+    final isManageMediaSupported = useState(false);
+    final manageMediaAndroidPermission = useState(false);
     final levelId = useAppSettingsState(AppSettingsEnum.logLevel);
     final preferRemote = useAppSettingsState(AppSettingsEnum.preferRemoteImage);
     final allowSelfSignedSSLCert = useAppSettingsState(AppSettingsEnum.allowSelfSignedSSLCert);
@@ -51,6 +55,18 @@ class AdvancedSettings extends HookConsumerWidget {
       return false;
     }
 
+    useEffect(() {
+      () async {
+        isManageMediaSupported.value = await checkAndroidVersion();
+        if (isManageMediaSupported.value) {
+          manageMediaAndroidPermission.value = await ref
+              .read(localFilesManagerRepositoryProvider)
+              .hasManageMediaPermission();
+        }
+      }();
+      return null;
+    }, []);
+
     final advancedSettings = [
       SettingsSwitchListTile(
         enabled: true,
@@ -58,11 +74,10 @@ class AdvancedSettings extends HookConsumerWidget {
         title: "advanced_settings_troubleshooting_title".tr(),
         subtitle: "advanced_settings_troubleshooting_subtitle".tr(),
       ),
-      FutureBuilder<bool>(
-        future: checkAndroidVersion(),
-        builder: (context, snapshot) {
-          if (snapshot.hasData && snapshot.data == true) {
-            return SettingsSwitchListTile(
+      if (isManageMediaSupported.value)
+        Column(
+          children: [
+            SettingsSwitchListTile(
               enabled: true,
               valueNotifier: manageLocalMediaAndroid,
               title: "advanced_settings_sync_remote_deletions_title".tr(),
@@ -71,14 +86,24 @@ class AdvancedSettings extends HookConsumerWidget {
                 if (value) {
                   final result = await ref.read(localFilesManagerRepositoryProvider).requestManageMediaPermission();
                   manageLocalMediaAndroid.value = result;
+                  manageMediaAndroidPermission.value = result;
                 }
               },
-            );
-          } else {
-            return const SizedBox.shrink();
-          }
-        },
-      ),
+            ),
+            SettingsActionTile(
+              title: "manage_media_access_title".tr(),
+              statusText: manageMediaAndroidPermission.value ? "allowed".tr() : "not_allowed".tr(),
+              subtitle: "manage_media_access_rationale".tr(),
+              statusColor: manageLocalMediaAndroid.value && !manageMediaAndroidPermission.value
+                  ? const Color.fromARGB(255, 243, 188, 106)
+                  : null,
+              onActionTap: () async {
+                final result = await ref.read(localFilesManagerRepositoryProvider).manageMediaPermission();
+                manageMediaAndroidPermission.value = result;
+              },
+            ),
+          ],
+        ),
       SettingsSliderListTile(
         text: "advanced_settings_log_level_title".tr(namedArgs: {'level': logLevel}),
         valueNotifier: levelId,
diff --git a/mobile/lib/widgets/settings/beta_sync_settings/sync_status_and_actions.dart b/mobile/lib/widgets/settings/beta_sync_settings/sync_status_and_actions.dart
index a5bca24f81..0296a6bd99 100644
--- a/mobile/lib/widgets/settings/beta_sync_settings/sync_status_and_actions.dart
+++ b/mobile/lib/widgets/settings/beta_sync_settings/sync_status_and_actions.dart
@@ -3,14 +3,18 @@ import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/extensions/platform_extensions.dart';
 import 'package:immich_mobile/extensions/translate_extensions.dart';
+import 'package:immich_mobile/providers/app_settings.provider.dart';
 import 'package:immich_mobile/providers/background_sync.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/db.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/memory.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/storage.provider.dart';
+import 'package:immich_mobile/providers/infrastructure/trash_sync.provider.dart';
 import 'package:immich_mobile/providers/sync_status.provider.dart';
+import 'package:immich_mobile/services/app_settings.service.dart';
 import 'package:immich_mobile/widgets/settings/beta_sync_settings/entity_count_tile.dart';
 import 'package:path/path.dart' as path;
 import 'package:path_provider/path_provider.dart';
@@ -229,6 +233,7 @@ class _SyncStatsCounts extends ConsumerWidget {
     final localAlbumService = ref.watch(localAlbumServiceProvider);
     final remoteAlbumService = ref.watch(remoteAlbumServiceProvider);
     final memoryService = ref.watch(driftMemoryServiceProvider);
+    final appSettingsService = ref.watch(appSettingsServiceProvider);
 
     Future<List<dynamic>> loadCounts() async {
       final assetCounts = assetService.getAssetCounts();
@@ -351,6 +356,44 @@ class _SyncStatsCounts extends ConsumerWidget {
                 ],
               ),
             ),
+            // To be removed once the experimental feature is stable
+            if (CurrentPlatform.isAndroid &&
+                appSettingsService.getSetting<bool>(AppSettingsEnum.manageLocalMediaAndroid)) ...[
+              _SectionHeaderText(text: "trash".t(context: context)),
+              Consumer(
+                builder: (context, ref, _) {
+                  final counts = ref.watch(trashedAssetsCountProvider);
+                  return counts.when(
+                    data: (c) => Padding(
+                      padding: const EdgeInsets.fromLTRB(16, 8, 16, 16),
+                      child: Flex(
+                        direction: Axis.horizontal,
+                        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                        spacing: 8.0,
+                        children: [
+                          Expanded(
+                            child: EntitiyCountTile(
+                              label: "local".t(context: context),
+                              count: c.total,
+                              icon: Icons.delete_outline,
+                            ),
+                          ),
+                          Expanded(
+                            child: EntitiyCountTile(
+                              label: "hashed_assets".t(context: context),
+                              count: c.hashed,
+                              icon: Icons.tag,
+                            ),
+                          ),
+                        ],
+                      ),
+                    ),
+                    loading: () => const CircularProgressIndicator(),
+                    error: (e, st) => Text('Error: $e'),
+                  );
+                },
+              ),
+            ],
           ],
         );
       },
diff --git a/mobile/lib/widgets/settings/settings_action_tile.dart b/mobile/lib/widgets/settings/settings_action_tile.dart
new file mode 100644
index 0000000000..b2b5988fa5
--- /dev/null
+++ b/mobile/lib/widgets/settings/settings_action_tile.dart
@@ -0,0 +1,73 @@
+import 'package:flutter/material.dart';
+import 'package:immich_mobile/extensions/theme_extensions.dart';
+
+class SettingsActionTile extends StatelessWidget {
+  const SettingsActionTile({
+    super.key,
+    required this.title,
+    required this.subtitle,
+    required this.onActionTap,
+    this.statusText,
+    this.statusColor,
+    this.contentPadding,
+    this.titleStyle,
+    this.subtitleStyle,
+  });
+
+  final String title;
+  final String subtitle;
+  final String? statusText;
+  final Color? statusColor;
+  final VoidCallback onActionTap;
+  final EdgeInsets? contentPadding;
+  final TextStyle? titleStyle;
+  final TextStyle? subtitleStyle;
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+
+    return ListTile(
+      isThreeLine: true,
+      onTap: onActionTap,
+      titleAlignment: ListTileTitleAlignment.center,
+      title: Row(
+        children: [
+          Expanded(
+            child: Text(
+              title,
+              style: titleStyle ?? theme.textTheme.bodyLarge?.copyWith(fontWeight: FontWeight.w500, height: 1.5),
+            ),
+          ),
+          if (statusText != null)
+            Padding(
+              padding: const EdgeInsets.only(left: 8),
+              child: Chip(
+                label: Text(
+                  statusText!,
+                  style: theme.textTheme.labelMedium?.copyWith(
+                    color: statusColor ?? theme.colorScheme.onSurfaceVariant,
+                  ),
+                ),
+                backgroundColor: theme.colorScheme.surface,
+                side: BorderSide(color: statusColor ?? theme.colorScheme.outlineVariant),
+                shape: StadiumBorder(side: BorderSide(color: statusColor ?? theme.colorScheme.outlineVariant)),
+                materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
+                visualDensity: VisualDensity.compact,
+                padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 0),
+              ),
+            ),
+        ],
+      ),
+      subtitle: Padding(
+        padding: const EdgeInsets.only(top: 4.0, right: 18.0),
+        child: Text(
+          subtitle,
+          style: subtitleStyle ?? theme.textTheme.bodyMedium?.copyWith(color: theme.colorScheme.onSurfaceSecondary),
+        ),
+      ),
+      trailing: Icon(Icons.arrow_forward_ios, size: 16, color: theme.colorScheme.onSurfaceVariant),
+      contentPadding: contentPadding ?? const EdgeInsets.symmetric(horizontal: 20.0, vertical: 8.0),
+    );
+  }
+}
diff --git a/mobile/pigeon/native_sync_api.dart b/mobile/pigeon/native_sync_api.dart
index ac08a68ca3..822e2eddb3 100644
--- a/mobile/pigeon/native_sync_api.dart
+++ b/mobile/pigeon/native_sync_api.dart
@@ -14,8 +14,10 @@ import 'package:pigeon/pigeon.dart';
 class PlatformAsset {
   final String id;
   final String name;
+
   // Follows AssetType enum from base_asset.model.dart
   final int type;
+
   // Seconds since epoch
   final int? createdAt;
   final int? updatedAt;
@@ -42,6 +44,7 @@ class PlatformAsset {
 class PlatformAlbum {
   final String id;
   final String name;
+
   // Seconds since epoch
   final int? updatedAt;
   final bool isCloud;
@@ -60,6 +63,7 @@ class SyncDelta {
   final bool hasChanges;
   final List<PlatformAsset> updates;
   final List<String> deletes;
+
   // Asset -> Album mapping
   final Map<String, List<String>> assetAlbums;
 
@@ -107,4 +111,7 @@ abstract class NativeSyncApi {
   List<HashResult> hashAssets(List<String> assetIds, {bool allowNetworkAccess = false});
 
   void cancelHashing();
+
+  @TaskQueue(type: TaskQueueType.serialBackgroundThread)
+  Map<String, List<PlatformAsset>> getTrashedAssets();
 }
diff --git a/mobile/test/domain/service.mock.dart b/mobile/test/domain/service.mock.dart
index 8293faf125..0bab675889 100644
--- a/mobile/test/domain/service.mock.dart
+++ b/mobile/test/domain/service.mock.dart
@@ -17,3 +17,4 @@ class MockNativeSyncApi extends Mock implements NativeSyncApi {}
 class MockAppSettingsService extends Mock implements AppSettingsService {}
 
 class MockUploadService extends Mock implements UploadService {}
+
diff --git a/mobile/test/domain/services/hash_service_test.dart b/mobile/test/domain/services/hash_service_test.dart
index 20d60b6866..3529ecca38 100644
--- a/mobile/test/domain/services/hash_service_test.dart
+++ b/mobile/test/domain/services/hash_service_test.dart
@@ -14,16 +14,19 @@ void main() {
   late MockLocalAlbumRepository mockAlbumRepo;
   late MockLocalAssetRepository mockAssetRepo;
   late MockNativeSyncApi mockNativeApi;
+  late MockTrashedLocalAssetRepository mockTrashedAssetRepo;
 
   setUp(() {
     mockAlbumRepo = MockLocalAlbumRepository();
     mockAssetRepo = MockLocalAssetRepository();
     mockNativeApi = MockNativeSyncApi();
+    mockTrashedAssetRepo = MockTrashedLocalAssetRepository();
 
     sut = HashService(
       localAlbumRepository: mockAlbumRepo,
       localAssetRepository: mockAssetRepo,
       nativeSyncApi: mockNativeApi,
+      trashedLocalAssetRepository: mockTrashedAssetRepo,
     );
 
     registerFallbackValue(LocalAlbumStub.recent);
@@ -114,6 +117,7 @@ void main() {
         localAssetRepository: mockAssetRepo,
         nativeSyncApi: mockNativeApi,
         batchSize: batchSize,
+        trashedLocalAssetRepository: mockTrashedAssetRepo,
       );
 
       final album = LocalAlbumStub.recent;
@@ -186,4 +190,5 @@ void main() {
       verify(() => mockNativeApi.hashAssets([asset2.id], allowNetworkAccess: false)).called(1);
     });
   });
+
 }
diff --git a/mobile/test/domain/services/local_sync_service_test.dart b/mobile/test/domain/services/local_sync_service_test.dart
new file mode 100644
index 0000000000..2f236971e0
--- /dev/null
+++ b/mobile/test/domain/services/local_sync_service_test.dart
@@ -0,0 +1,190 @@
+import 'package:drift/drift.dart' as drift;
+import 'package:drift/native.dart';
+import 'package:flutter/foundation.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/domain/models/store.model.dart';
+import 'package:immich_mobile/domain/services/local_sync.service.dart';
+import 'package:immich_mobile/domain/services/store.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/local_album.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/storage.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/store.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/trashed_local_asset.repository.dart';
+import 'package:immich_mobile/platform/native_sync_api.g.dart';
+import 'package:immich_mobile/repositories/local_files_manager.repository.dart';
+import 'package:mocktail/mocktail.dart';
+
+import '../../domain/service.mock.dart';
+import '../../fixtures/asset.stub.dart';
+import '../../infrastructure/repository.mock.dart';
+import '../../mocks/asset_entity.mock.dart';
+import '../../repository.mocks.dart';
+
+void main() {
+  late LocalSyncService sut;
+  late DriftLocalAlbumRepository mockLocalAlbumRepository;
+  late DriftTrashedLocalAssetRepository mockTrashedLocalAssetRepository;
+  late LocalFilesManagerRepository mockLocalFilesManager;
+  late StorageRepository mockStorageRepository;
+  late MockNativeSyncApi mockNativeSyncApi;
+  late Drift db;
+
+  setUpAll(() async {
+    TestWidgetsFlutterBinding.ensureInitialized();
+    debugDefaultTargetPlatformOverride = TargetPlatform.android;
+
+    db = Drift(drift.DatabaseConnection(NativeDatabase.memory(), closeStreamsSynchronously: true));
+    await StoreService.init(storeRepository: DriftStoreRepository(db));
+  });
+
+  tearDownAll(() async {
+    debugDefaultTargetPlatformOverride = null;
+    await Store.clear();
+    await db.close();
+  });
+
+  setUp(() async {
+    mockLocalAlbumRepository = MockLocalAlbumRepository();
+    mockTrashedLocalAssetRepository = MockTrashedLocalAssetRepository();
+    mockLocalFilesManager = MockLocalFilesManagerRepository();
+    mockStorageRepository = MockStorageRepository();
+    mockNativeSyncApi = MockNativeSyncApi();
+
+    when(() => mockNativeSyncApi.shouldFullSync()).thenAnswer((_) async => false);
+    when(() => mockNativeSyncApi.getMediaChanges()).thenAnswer(
+      (_) async => SyncDelta(
+        hasChanges: false,
+        updates: const [],
+        deletes: const [],
+        assetAlbums: const {},
+      ),
+    );
+    when(() => mockNativeSyncApi.getTrashedAssets()).thenAnswer((_) async => {});
+    when(() => mockTrashedLocalAssetRepository.processTrashSnapshot(any())).thenAnswer((_) async {});
+    when(() => mockTrashedLocalAssetRepository.getToRestore()).thenAnswer((_) async => []);
+    when(() => mockTrashedLocalAssetRepository.getToTrash()).thenAnswer((_) async => {});
+    when(() => mockTrashedLocalAssetRepository.applyRestoredAssets(any())).thenAnswer((_) async {});
+    when(() => mockTrashedLocalAssetRepository.trashLocalAsset(any())).thenAnswer((_) async {});
+    when(() => mockLocalFilesManager.moveToTrash(any<List<String>>())).thenAnswer((_) async => true);
+
+    sut = LocalSyncService(
+      localAlbumRepository: mockLocalAlbumRepository,
+      trashedLocalAssetRepository: mockTrashedLocalAssetRepository,
+      localFilesManager: mockLocalFilesManager,
+      storageRepository: mockStorageRepository,
+      nativeSyncApi: mockNativeSyncApi,
+    );
+
+    await Store.put(StoreKey.manageLocalMediaAndroid, false);
+    when(() => mockLocalFilesManager.hasManageMediaPermission()).thenAnswer((_) async => false);
+  });
+
+  group('LocalSyncService - syncTrashedAssets gating', () {
+    test('invokes syncTrashedAssets when Android flag enabled and permission granted', () async {
+      await Store.put(StoreKey.manageLocalMediaAndroid, true);
+      when(() => mockLocalFilesManager.hasManageMediaPermission()).thenAnswer((_) async => true);
+
+      await sut.sync();
+
+      verify(() => mockNativeSyncApi.getTrashedAssets()).called(1);
+      verify(() => mockTrashedLocalAssetRepository.processTrashSnapshot(any())).called(1);
+    });
+
+    test('skips syncTrashedAssets when store flag disabled', () async {
+      await Store.put(StoreKey.manageLocalMediaAndroid, false);
+      when(() => mockLocalFilesManager.hasManageMediaPermission()).thenAnswer((_) async => true);
+
+      await sut.sync();
+
+      verifyNever(() => mockNativeSyncApi.getTrashedAssets());
+    });
+
+    test('skips syncTrashedAssets when MANAGE_MEDIA permission absent', () async {
+      await Store.put(StoreKey.manageLocalMediaAndroid, true);
+      when(() => mockLocalFilesManager.hasManageMediaPermission()).thenAnswer((_) async => false);
+
+      await sut.sync();
+
+      verifyNever(() => mockNativeSyncApi.getTrashedAssets());
+    });
+
+    test('skips syncTrashedAssets on non-Android platforms', () async {
+      debugDefaultTargetPlatformOverride = TargetPlatform.iOS;
+      addTearDown(() => debugDefaultTargetPlatformOverride = TargetPlatform.android);
+
+      await Store.put(StoreKey.manageLocalMediaAndroid, true);
+      when(() => mockLocalFilesManager.hasManageMediaPermission()).thenAnswer((_) async => true);
+
+      await sut.sync();
+
+      verifyNever(() => mockNativeSyncApi.getTrashedAssets());
+    });
+  });
+
+  group('LocalSyncService - syncTrashedAssets behavior', () {
+    test('processes trashed snapshot, restores assets, and trashes local files', () async {
+      final platformAsset = PlatformAsset(
+        id: 'remote-id',
+        name: 'remote.jpg',
+        type: AssetType.image.index,
+        durationInSeconds: 0,
+        orientation: 0,
+        isFavorite: false,
+      );
+
+      final assetsToRestore = [LocalAssetStub.image1];
+      when(() => mockTrashedLocalAssetRepository.getToRestore()).thenAnswer((_) async => assetsToRestore);
+      final restoredIds = ['image1'];
+      when(() => mockLocalFilesManager.restoreAssetsFromTrash(any())).thenAnswer((invocation) async {
+        final Iterable<LocalAsset> requested = invocation.positionalArguments.first as Iterable<LocalAsset>;
+        expect(requested, orderedEquals(assetsToRestore));
+        return restoredIds;
+      });
+
+      final localAssetToTrash = LocalAssetStub.image2.copyWith(id: 'local-trash', checksum: 'checksum-trash');
+      when(() => mockTrashedLocalAssetRepository.getToTrash()).thenAnswer((_) async => {'album-a': [localAssetToTrash]});
+
+      final assetEntity = MockAssetEntity();
+      when(() => assetEntity.getMediaUrl()).thenAnswer((_) async => 'content://local-trash');
+      when(() => mockStorageRepository.getAssetEntityForAsset(localAssetToTrash)).thenAnswer((_) async => assetEntity);
+
+      await sut.processTrashedAssets({'album-a': [platformAsset]});
+
+      verify(() => mockTrashedLocalAssetRepository.processTrashSnapshot(any())).called(1);
+      verify(() => mockTrashedLocalAssetRepository.getToTrash()).called(1);
+
+      verify(() => mockLocalFilesManager.restoreAssetsFromTrash(any())).called(1);
+      verify(() => mockTrashedLocalAssetRepository.applyRestoredAssets(restoredIds)).called(1);
+
+      verify(() => mockStorageRepository.getAssetEntityForAsset(localAssetToTrash)).called(1);
+      final moveArgs =
+          verify(() => mockLocalFilesManager.moveToTrash(captureAny())).captured.single as List<String>;
+      expect(moveArgs, ['content://local-trash']);
+      final trashArgs =
+          verify(() => mockTrashedLocalAssetRepository.trashLocalAsset(captureAny())).captured.single
+              as Map<String, List<LocalAsset>>;
+      expect(trashArgs.keys, ['album-a']);
+      expect(trashArgs['album-a'], [localAssetToTrash]);
+    });
+
+    test('does not attempt restore when repository has no assets to restore', () async {
+      when(() => mockTrashedLocalAssetRepository.getToRestore()).thenAnswer((_) async => []);
+
+      await sut.processTrashedAssets({});
+
+      verifyNever(() => mockLocalFilesManager.restoreAssetsFromTrash(any()));
+      verifyNever(() => mockTrashedLocalAssetRepository.applyRestoredAssets(any()));
+    });
+
+    test('does not move local assets when repository finds nothing to trash', () async {
+      when(() => mockTrashedLocalAssetRepository.getToTrash()).thenAnswer((_) async => {});
+
+      await sut.processTrashedAssets({});
+
+      verifyNever(() => mockLocalFilesManager.moveToTrash(any()));
+      verifyNever(() => mockTrashedLocalAssetRepository.trashLocalAsset(any()));
+    });
+  });
+}
diff --git a/mobile/test/domain/services/sync_stream_service_test.dart b/mobile/test/domain/services/sync_stream_service_test.dart
index 0126b11e46..109b54a907 100644
--- a/mobile/test/domain/services/sync_stream_service_test.dart
+++ b/mobile/test/domain/services/sync_stream_service_test.dart
@@ -1,14 +1,30 @@
 import 'dart:async';
 
+import 'package:drift/drift.dart' as drift;
+import 'package:drift/native.dart';
+import 'package:flutter/foundation.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
+import 'package:immich_mobile/domain/models/store.model.dart';
 import 'package:immich_mobile/domain/models/sync_event.model.dart';
+import 'package:immich_mobile/domain/services/store.service.dart';
 import 'package:immich_mobile/domain/services/sync_stream.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/local_asset.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/storage.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/store.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/sync_api.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/sync_stream.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/trashed_local_asset.repository.dart';
+import 'package:immich_mobile/repositories/local_files_manager.repository.dart';
 import 'package:mocktail/mocktail.dart';
 
+import '../../fixtures/asset.stub.dart';
 import '../../fixtures/sync_stream.stub.dart';
 import '../../infrastructure/repository.mock.dart';
+import '../../mocks/asset_entity.mock.dart';
+import '../../repository.mocks.dart';
 
 class _AbortCallbackWrapper {
   const _AbortCallbackWrapper();
@@ -30,15 +46,40 @@ void main() {
   late SyncStreamService sut;
   late SyncStreamRepository mockSyncStreamRepo;
   late SyncApiRepository mockSyncApiRepo;
+  late DriftLocalAssetRepository mockLocalAssetRepo;
+  late DriftTrashedLocalAssetRepository mockTrashedLocalAssetRepo;
+  late LocalFilesManagerRepository mockLocalFilesManagerRepo;
+  late StorageRepository mockStorageRepo;
   late Future<void> Function(List<SyncEvent>, Function(), Function()) handleEventsCallback;
   late _MockAbortCallbackWrapper mockAbortCallbackWrapper;
   late _MockAbortCallbackWrapper mockResetCallbackWrapper;
+  late Drift db;
+  late bool hasManageMediaPermission;
+
+  setUpAll(() async {
+    TestWidgetsFlutterBinding.ensureInitialized();
+    debugDefaultTargetPlatformOverride = TargetPlatform.android;
+    registerFallbackValue(LocalAssetStub.image1);
+
+    db = Drift(drift.DatabaseConnection(NativeDatabase.memory(), closeStreamsSynchronously: true));
+    await StoreService.init(storeRepository: DriftStoreRepository(db));
+  });
+
+  tearDownAll(() async {
+    debugDefaultTargetPlatformOverride = null;
+    await Store.clear();
+    await db.close();
+  });
 
   successHandler(Invocation _) async => true;
 
-  setUp(() {
+  setUp(() async {
     mockSyncStreamRepo = MockSyncStreamRepository();
     mockSyncApiRepo = MockSyncApiRepository();
+    mockLocalAssetRepo = MockLocalAssetRepository();
+    mockTrashedLocalAssetRepo = MockTrashedLocalAssetRepository();
+    mockLocalFilesManagerRepo = MockLocalFilesManagerRepository();
+    mockStorageRepo = MockStorageRepository();
     mockAbortCallbackWrapper = _MockAbortCallbackWrapper();
     mockResetCallbackWrapper = _MockAbortCallbackWrapper();
 
@@ -87,7 +128,25 @@ void main() {
     when(() => mockSyncStreamRepo.updateAssetFacesV1(any())).thenAnswer(successHandler);
     when(() => mockSyncStreamRepo.deleteAssetFacesV1(any())).thenAnswer(successHandler);
 
-    sut = SyncStreamService(syncApiRepository: mockSyncApiRepo, syncStreamRepository: mockSyncStreamRepo);
+    sut = SyncStreamService(
+      syncApiRepository: mockSyncApiRepo,
+      syncStreamRepository: mockSyncStreamRepo,
+      localAssetRepository: mockLocalAssetRepo,
+      trashedLocalAssetRepository: mockTrashedLocalAssetRepo,
+      localFilesManager: mockLocalFilesManagerRepo,
+      storageRepository: mockStorageRepo,
+    );
+
+    when(() => mockLocalAssetRepo.getAssetsFromBackupAlbums(any())).thenAnswer((_) async => {});
+    when(() => mockTrashedLocalAssetRepo.trashLocalAsset(any())).thenAnswer((_) async {});
+    when(() => mockTrashedLocalAssetRepo.getToRestore()).thenAnswer((_) async => []);
+    when(() => mockTrashedLocalAssetRepo.applyRestoredAssets(any())).thenAnswer((_) async {});
+    hasManageMediaPermission = false;
+    when(() => mockLocalFilesManagerRepo.hasManageMediaPermission()).thenAnswer((_) async => hasManageMediaPermission);
+    when(() => mockLocalFilesManagerRepo.moveToTrash(any())).thenAnswer((_) async => true);
+    when(() => mockLocalFilesManagerRepo.restoreAssetsFromTrash(any())).thenAnswer((_) async => []);
+    when(() => mockStorageRepo.getAssetEntityForAsset(any())).thenAnswer((_) async => null);
+    await Store.put(StoreKey.manageLocalMediaAndroid, false);
   });
 
   Future<void> simulateEvents(List<SyncEvent> events) async {
@@ -152,6 +211,10 @@ void main() {
       sut = SyncStreamService(
         syncApiRepository: mockSyncApiRepo,
         syncStreamRepository: mockSyncStreamRepo,
+        localAssetRepository: mockLocalAssetRepo,
+        trashedLocalAssetRepository: mockTrashedLocalAssetRepo,
+        localFilesManager: mockLocalFilesManagerRepo,
+        storageRepository: mockStorageRepo,
         cancelChecker: cancellationChecker.call,
       );
       await sut.sync();
@@ -187,6 +250,10 @@ void main() {
       sut = SyncStreamService(
         syncApiRepository: mockSyncApiRepo,
         syncStreamRepository: mockSyncStreamRepo,
+        localAssetRepository: mockLocalAssetRepo,
+        trashedLocalAssetRepository: mockTrashedLocalAssetRepo,
+        localFilesManager: mockLocalFilesManagerRepo,
+        storageRepository: mockStorageRepo,
         cancelChecker: cancellationChecker.call,
       );
 
@@ -296,4 +363,127 @@ void main() {
       verify(() => mockSyncApiRepo.ack(["5"])).called(1);
     });
   });
+
+  group("SyncStreamService - remote trash & restore", () {
+    setUp(() async {
+      await Store.put(StoreKey.manageLocalMediaAndroid, true);
+      hasManageMediaPermission = true;
+    });
+
+    tearDown(() async {
+      await Store.put(StoreKey.manageLocalMediaAndroid, false);
+      hasManageMediaPermission = false;
+    });
+
+    test("moves backed up local and merged assets to device trash when remote trash events are received", () async {
+      final localAsset = LocalAssetStub.image1.copyWith(id: 'local-only', checksum: 'checksum-local', remoteId: null);
+      final mergedAsset = LocalAssetStub.image2.copyWith(
+        id: 'merged-local',
+        checksum: 'checksum-merged',
+        remoteId: 'remote-merged',
+      );
+      final assetsByAlbum = {
+        'album-a': [localAsset],
+        'album-b': [mergedAsset],
+      };
+      when(() => mockLocalAssetRepo.getAssetsFromBackupAlbums(any())).thenAnswer((invocation) async {
+        final Iterable<String> requestedChecksums = invocation.positionalArguments.first as Iterable<String>;
+        expect(requestedChecksums.toSet(), equals({'checksum-local', 'checksum-merged', 'checksum-remote-only'}));
+        return assetsByAlbum;
+      });
+
+      final localEntity = MockAssetEntity();
+      when(() => localEntity.getMediaUrl()).thenAnswer((_) async => 'content://local-only');
+      when(() => mockStorageRepo.getAssetEntityForAsset(localAsset)).thenAnswer((_) async => localEntity);
+
+      final mergedEntity = MockAssetEntity();
+      when(() => mergedEntity.getMediaUrl()).thenAnswer((_) async => 'content://merged-local');
+      when(() => mockStorageRepo.getAssetEntityForAsset(mergedAsset)).thenAnswer((_) async => mergedEntity);
+
+      when(() => mockLocalFilesManagerRepo.moveToTrash(any())).thenAnswer((invocation) async {
+        final urls = invocation.positionalArguments.first as List<String>;
+        expect(urls, unorderedEquals(['content://local-only', 'content://merged-local']));
+        return true;
+      });
+
+      final events = [
+        SyncStreamStub.assetTrashed(
+          id: 'remote-1',
+          checksum: localAsset.checksum!,
+          ack: 'asset-remote-local-1',
+          trashedAt: DateTime(2025, 5, 1),
+        ),
+        SyncStreamStub.assetTrashed(
+          id: 'remote-2',
+          checksum: mergedAsset.checksum!,
+          ack: 'asset-remote-merged-2',
+          trashedAt: DateTime(2025, 5, 2),
+        ),
+        SyncStreamStub.assetTrashed(
+          id: 'remote-3',
+          checksum: 'checksum-remote-only',
+          ack: 'asset-remote-only-3',
+          trashedAt: DateTime(2025, 5, 3),
+        ),
+      ];
+
+      await simulateEvents(events);
+
+      verify(() => mockTrashedLocalAssetRepo.trashLocalAsset(assetsByAlbum)).called(1);
+      verify(() => mockSyncApiRepo.ack(['asset-remote-only-3'])).called(1);
+    });
+
+    test("skips device trashing when no local assets match the remote trash payload", () async {
+      final events = [
+        SyncStreamStub.assetTrashed(
+          id: 'remote-only',
+          checksum: 'checksum-only',
+          ack: 'asset-remote-only-9',
+          trashedAt: DateTime(2025, 6, 1),
+        ),
+      ];
+
+      await simulateEvents(events);
+
+      verify(() => mockLocalAssetRepo.getAssetsFromBackupAlbums(any())).called(1);
+      verifyNever(() => mockLocalFilesManagerRepo.moveToTrash(any()));
+      verifyNever(() => mockTrashedLocalAssetRepo.trashLocalAsset(any()));
+    });
+
+    test("does not request local deletions for permanent remote delete events", () async {
+      final events = [SyncStreamStub.assetDeleteV1];
+
+      await simulateEvents(events);
+
+      verifyNever(() => mockLocalAssetRepo.getAssetsFromBackupAlbums(any()));
+      verifyNever(() => mockLocalFilesManagerRepo.moveToTrash(any()));
+      verify(() => mockSyncStreamRepo.deleteAssetsV1(any())).called(1);
+    });
+
+    test("restores trashed local assets once the matching remote assets leave the trash", () async {
+      final trashedAssets = [
+        LocalAssetStub.image1.copyWith(id: 'trashed-1', checksum: 'checksum-trash', remoteId: 'remote-1'),
+      ];
+      when(() => mockTrashedLocalAssetRepo.getToRestore()).thenAnswer((_) async => trashedAssets);
+
+      final restoredIds = ['trashed-1'];
+      when(() => mockLocalFilesManagerRepo.restoreAssetsFromTrash(any())).thenAnswer((invocation) async {
+        final Iterable<LocalAsset> requestedAssets = invocation.positionalArguments.first as Iterable<LocalAsset>;
+        expect(requestedAssets, orderedEquals(trashedAssets));
+        return restoredIds;
+      });
+
+      final events = [
+        SyncStreamStub.assetModified(
+          id: 'remote-1',
+          checksum: 'checksum-trash',
+          ack: 'asset-remote-1-11',
+        ),
+      ];
+
+      await simulateEvents(events);
+
+      verify(() => mockTrashedLocalAssetRepo.applyRestoredAssets(restoredIds)).called(1);
+    });
+  });
 }
diff --git a/mobile/test/drift/main/generated/schema.dart b/mobile/test/drift/main/generated/schema.dart
index 073a86078f..69dff89fb1 100644
--- a/mobile/test/drift/main/generated/schema.dart
+++ b/mobile/test/drift/main/generated/schema.dart
@@ -15,6 +15,7 @@ import 'schema_v9.dart' as v9;
 import 'schema_v10.dart' as v10;
 import 'schema_v11.dart' as v11;
 import 'schema_v12.dart' as v12;
+import 'schema_v13.dart' as v13;
 
 class GeneratedHelper implements SchemaInstantiationHelper {
   @override
@@ -44,10 +45,12 @@ class GeneratedHelper implements SchemaInstantiationHelper {
         return v11.DatabaseAtV11(db);
       case 12:
         return v12.DatabaseAtV12(db);
+      case 13:
+        return v13.DatabaseAtV13(db);
       default:
         throw MissingSchemaException(version, versions);
     }
   }
 
-  static const versions = const [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12];
+  static const versions = const [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13];
 }
diff --git a/mobile/test/drift/main/generated/schema_v13.dart b/mobile/test/drift/main/generated/schema_v13.dart
new file mode 100644
index 0000000000..da0d853678
--- /dev/null
+++ b/mobile/test/drift/main/generated/schema_v13.dart
@@ -0,0 +1,7765 @@
+// dart format width=80
+// GENERATED CODE, DO NOT EDIT BY HAND.
+// ignore_for_file: type=lint
+import 'package:drift/drift.dart';
+
+class UserEntity extends Table with TableInfo<UserEntity, UserEntityData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  UserEntity(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<String> id = GeneratedColumn<String>(
+    'id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+  );
+  late final GeneratedColumn<String> name = GeneratedColumn<String>(
+    'name',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+  );
+  late final GeneratedColumn<String> email = GeneratedColumn<String>(
+    'email',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+  );
+  late final GeneratedColumn<bool> hasProfileImage = GeneratedColumn<bool>(
+    'has_profile_image',
+    aliasedName,
+    false,
+    type: DriftSqlType.bool,
+    requiredDuringInsert: false,
+    defaultConstraints: GeneratedColumn.constraintIsAlways(
+      'CHECK ("has_profile_image" IN (0, 1))',
+    ),
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<DateTime> profileChangedAt =
+      GeneratedColumn<DateTime>(
+        'profile_changed_at',
+        aliasedName,
+        false,
+        type: DriftSqlType.dateTime,
+        requiredDuringInsert: false,
+        defaultValue: const CustomExpression('CURRENT_TIMESTAMP'),
+      );
+  late final GeneratedColumn<int> avatarColor = GeneratedColumn<int>(
+    'avatar_color',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    defaultValue: const CustomExpression('0'),
+  );
+  @override
+  List<GeneratedColumn> get $columns => [
+    id,
+    name,
+    email,
+    hasProfileImage,
+    profileChangedAt,
+    avatarColor,
+  ];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'user_entity';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {id};
+  @override
+  UserEntityData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return UserEntityData(
+      id: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}id'],
+      )!,
+      name: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}name'],
+      )!,
+      email: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}email'],
+      )!,
+      hasProfileImage: attachedDatabase.typeMapping.read(
+        DriftSqlType.bool,
+        data['${effectivePrefix}has_profile_image'],
+      )!,
+      profileChangedAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.dateTime,
+        data['${effectivePrefix}profile_changed_at'],
+      )!,
+      avatarColor: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}avatar_color'],
+      )!,
+    );
+  }
+
+  @override
+  UserEntity createAlias(String alias) {
+    return UserEntity(attachedDatabase, alias);
+  }
+
+  @override
+  bool get withoutRowId => true;
+  @override
+  bool get isStrict => true;
+}
+
+class UserEntityData extends DataClass implements Insertable<UserEntityData> {
+  final String id;
+  final String name;
+  final String email;
+  final bool hasProfileImage;
+  final DateTime profileChangedAt;
+  final int avatarColor;
+  const UserEntityData({
+    required this.id,
+    required this.name,
+    required this.email,
+    required this.hasProfileImage,
+    required this.profileChangedAt,
+    required this.avatarColor,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['id'] = Variable<String>(id);
+    map['name'] = Variable<String>(name);
+    map['email'] = Variable<String>(email);
+    map['has_profile_image'] = Variable<bool>(hasProfileImage);
+    map['profile_changed_at'] = Variable<DateTime>(profileChangedAt);
+    map['avatar_color'] = Variable<int>(avatarColor);
+    return map;
+  }
+
+  factory UserEntityData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return UserEntityData(
+      id: serializer.fromJson<String>(json['id']),
+      name: serializer.fromJson<String>(json['name']),
+      email: serializer.fromJson<String>(json['email']),
+      hasProfileImage: serializer.fromJson<bool>(json['hasProfileImage']),
+      profileChangedAt: serializer.fromJson<DateTime>(json['profileChangedAt']),
+      avatarColor: serializer.fromJson<int>(json['avatarColor']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'id': serializer.toJson<String>(id),
+      'name': serializer.toJson<String>(name),
+      'email': serializer.toJson<String>(email),
+      'hasProfileImage': serializer.toJson<bool>(hasProfileImage),
+      'profileChangedAt': serializer.toJson<DateTime>(profileChangedAt),
+      'avatarColor': serializer.toJson<int>(avatarColor),
+    };
+  }
+
+  UserEntityData copyWith({
+    String? id,
+    String? name,
+    String? email,
+    bool? hasProfileImage,
+    DateTime? profileChangedAt,
+    int? avatarColor,
+  }) => UserEntityData(
+    id: id ?? this.id,
+    name: name ?? this.name,
+    email: email ?? this.email,
+    hasProfileImage: hasProfileImage ?? this.hasProfileImage,
+    profileChangedAt: profileChangedAt ?? this.profileChangedAt,
+    avatarColor: avatarColor ?? this.avatarColor,
+  );
+  UserEntityData copyWithCompanion(UserEntityCompanion data) {
+    return UserEntityData(
+      id: data.id.present ? data.id.value : this.id,
+      name: data.name.present ? data.name.value : this.name,
+      email: data.email.present ? data.email.value : this.email,
+      hasProfileImage: data.hasProfileImage.present
+          ? data.hasProfileImage.value
+          : this.hasProfileImage,
+      profileChangedAt: data.profileChangedAt.present
+          ? data.profileChangedAt.value
+          : this.profileChangedAt,
+      avatarColor: data.avatarColor.present
+          ? data.avatarColor.value
+          : this.avatarColor,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('UserEntityData(')
+          ..write('id: $id, ')
+          ..write('name: $name, ')
+          ..write('email: $email, ')
+          ..write('hasProfileImage: $hasProfileImage, ')
+          ..write('profileChangedAt: $profileChangedAt, ')
+          ..write('avatarColor: $avatarColor')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(
+    id,
+    name,
+    email,
+    hasProfileImage,
+    profileChangedAt,
+    avatarColor,
+  );
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is UserEntityData &&
+          other.id == this.id &&
+          other.name == this.name &&
+          other.email == this.email &&
+          other.hasProfileImage == this.hasProfileImage &&
+          other.profileChangedAt == this.profileChangedAt &&
+          other.avatarColor == this.avatarColor);
+}
+
+class UserEntityCompanion extends UpdateCompanion<UserEntityData> {
+  final Value<String> id;
+  final Value<String> name;
+  final Value<String> email;
+  final Value<bool> hasProfileImage;
+  final Value<DateTime> profileChangedAt;
+  final Value<int> avatarColor;
+  const UserEntityCompanion({
+    this.id = const Value.absent(),
+    this.name = const Value.absent(),
+    this.email = const Value.absent(),
+    this.hasProfileImage = const Value.absent(),
+    this.profileChangedAt = const Value.absent(),
+    this.avatarColor = const Value.absent(),
+  });
+  UserEntityCompanion.insert({
+    required String id,
+    required String name,
+    required String email,
+    this.hasProfileImage = const Value.absent(),
+    this.profileChangedAt = const Value.absent(),
+    this.avatarColor = const Value.absent(),
+  }) : id = Value(id),
+       name = Value(name),
+       email = Value(email);
+  static Insertable<UserEntityData> custom({
+    Expression<String>? id,
+    Expression<String>? name,
+    Expression<String>? email,
+    Expression<bool>? hasProfileImage,
+    Expression<DateTime>? profileChangedAt,
+    Expression<int>? avatarColor,
+  }) {
+    return RawValuesInsertable({
+      if (id != null) 'id': id,
+      if (name != null) 'name': name,
+      if (email != null) 'email': email,
+      if (hasProfileImage != null) 'has_profile_image': hasProfileImage,
+      if (profileChangedAt != null) 'profile_changed_at': profileChangedAt,
+      if (avatarColor != null) 'avatar_color': avatarColor,
+    });
+  }
+
+  UserEntityCompanion copyWith({
+    Value<String>? id,
+    Value<String>? name,
+    Value<String>? email,
+    Value<bool>? hasProfileImage,
+    Value<DateTime>? profileChangedAt,
+    Value<int>? avatarColor,
+  }) {
+    return UserEntityCompanion(
+      id: id ?? this.id,
+      name: name ?? this.name,
+      email: email ?? this.email,
+      hasProfileImage: hasProfileImage ?? this.hasProfileImage,
+      profileChangedAt: profileChangedAt ?? this.profileChangedAt,
+      avatarColor: avatarColor ?? this.avatarColor,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (id.present) {
+      map['id'] = Variable<String>(id.value);
+    }
+    if (name.present) {
+      map['name'] = Variable<String>(name.value);
+    }
+    if (email.present) {
+      map['email'] = Variable<String>(email.value);
+    }
+    if (hasProfileImage.present) {
+      map['has_profile_image'] = Variable<bool>(hasProfileImage.value);
+    }
+    if (profileChangedAt.present) {
+      map['profile_changed_at'] = Variable<DateTime>(profileChangedAt.value);
+    }
+    if (avatarColor.present) {
+      map['avatar_color'] = Variable<int>(avatarColor.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('UserEntityCompanion(')
+          ..write('id: $id, ')
+          ..write('name: $name, ')
+          ..write('email: $email, ')
+          ..write('hasProfileImage: $hasProfileImage, ')
+          ..write('profileChangedAt: $profileChangedAt, ')
+          ..write('avatarColor: $avatarColor')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class RemoteAssetEntity extends Table
+    with TableInfo<RemoteAssetEntity, RemoteAssetEntityData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  RemoteAssetEntity(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<String> name = GeneratedColumn<String>(
+    'name',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+  );
+  late final GeneratedColumn<int> type = GeneratedColumn<int>(
+    'type',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+  );
+  late final GeneratedColumn<DateTime> createdAt = GeneratedColumn<DateTime>(
+    'created_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.dateTime,
+    requiredDuringInsert: false,
+    defaultValue: const CustomExpression('CURRENT_TIMESTAMP'),
+  );
+  late final GeneratedColumn<DateTime> updatedAt = GeneratedColumn<DateTime>(
+    'updated_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.dateTime,
+    requiredDuringInsert: false,
+    defaultValue: const CustomExpression('CURRENT_TIMESTAMP'),
+  );
+  late final GeneratedColumn<int> width = GeneratedColumn<int>(
+    'width',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+  );
+  late final GeneratedColumn<int> height = GeneratedColumn<int>(
+    'height',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+  );
+  late final GeneratedColumn<int> durationInSeconds = GeneratedColumn<int>(
+    'duration_in_seconds',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+  );
+  late final GeneratedColumn<String> id = GeneratedColumn<String>(
+    'id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+  );
+  late final GeneratedColumn<String> checksum = GeneratedColumn<String>(
+    'checksum',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+  );
+  late final GeneratedColumn<bool> isFavorite = GeneratedColumn<bool>(
+    'is_favorite',
+    aliasedName,
+    false,
+    type: DriftSqlType.bool,
+    requiredDuringInsert: false,
+    defaultConstraints: GeneratedColumn.constraintIsAlways(
+      'CHECK ("is_favorite" IN (0, 1))',
+    ),
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<String> ownerId = GeneratedColumn<String>(
+    'owner_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    defaultConstraints: GeneratedColumn.constraintIsAlways(
+      'REFERENCES user_entity (id) ON DELETE CASCADE',
+    ),
+  );
+  late final GeneratedColumn<DateTime> localDateTime =
+      GeneratedColumn<DateTime>(
+        'local_date_time',
+        aliasedName,
+        true,
+        type: DriftSqlType.dateTime,
+        requiredDuringInsert: false,
+      );
+  late final GeneratedColumn<String> thumbHash = GeneratedColumn<String>(
+    'thumb_hash',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+  );
+  late final GeneratedColumn<DateTime> deletedAt = GeneratedColumn<DateTime>(
+    'deleted_at',
+    aliasedName,
+    true,
+    type: DriftSqlType.dateTime,
+    requiredDuringInsert: false,
+  );
+  late final GeneratedColumn<String> livePhotoVideoId = GeneratedColumn<String>(
+    'live_photo_video_id',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+  );
+  late final GeneratedColumn<int> visibility = GeneratedColumn<int>(
+    'visibility',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+  );
+  late final GeneratedColumn<String> stackId = GeneratedColumn<String>(
+    'stack_id',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+  );
+  late final GeneratedColumn<String> libraryId = GeneratedColumn<String>(
+    'library_id',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+  );
+  @override
+  List<GeneratedColumn> get $columns => [
+    name,
+    type,
+    createdAt,
+    updatedAt,
+    width,
+    height,
+    durationInSeconds,
+    id,
+    checksum,
+    isFavorite,
+    ownerId,
+    localDateTime,
+    thumbHash,
+    deletedAt,
+    livePhotoVideoId,
+    visibility,
+    stackId,
+    libraryId,
+  ];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'remote_asset_entity';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {id};
+  @override
+  RemoteAssetEntityData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return RemoteAssetEntityData(
+      name: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}name'],
+      )!,
+      type: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}type'],
+      )!,
+      createdAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.dateTime,
+        data['${effectivePrefix}created_at'],
+      )!,
+      updatedAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.dateTime,
+        data['${effectivePrefix}updated_at'],
+      )!,
+      width: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}width'],
+      ),
+      height: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}height'],
+      ),
+      durationInSeconds: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}duration_in_seconds'],
+      ),
+      id: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}id'],
+      )!,
+      checksum: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}checksum'],
+      )!,
+      isFavorite: attachedDatabase.typeMapping.read(
+        DriftSqlType.bool,
+        data['${effectivePrefix}is_favorite'],
+      )!,
+      ownerId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}owner_id'],
+      )!,
+      localDateTime: attachedDatabase.typeMapping.read(
+        DriftSqlType.dateTime,
+        data['${effectivePrefix}local_date_time'],
+      ),
+      thumbHash: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}thumb_hash'],
+      ),
+      deletedAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.dateTime,
+        data['${effectivePrefix}deleted_at'],
+      ),
+      livePhotoVideoId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}live_photo_video_id'],
+      ),
+      visibility: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}visibility'],
+      )!,
+      stackId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}stack_id'],
+      ),
+      libraryId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}library_id'],
+      ),
+    );
+  }
+
+  @override
+  RemoteAssetEntity createAlias(String alias) {
+    return RemoteAssetEntity(attachedDatabase, alias);
+  }
+
+  @override
+  bool get withoutRowId => true;
+  @override
+  bool get isStrict => true;
+}
+
+class RemoteAssetEntityData extends DataClass
+    implements Insertable<RemoteAssetEntityData> {
+  final String name;
+  final int type;
+  final DateTime createdAt;
+  final DateTime updatedAt;
+  final int? width;
+  final int? height;
+  final int? durationInSeconds;
+  final String id;
+  final String checksum;
+  final bool isFavorite;
+  final String ownerId;
+  final DateTime? localDateTime;
+  final String? thumbHash;
+  final DateTime? deletedAt;
+  final String? livePhotoVideoId;
+  final int visibility;
+  final String? stackId;
+  final String? libraryId;
+  const RemoteAssetEntityData({
+    required this.name,
+    required this.type,
+    required this.createdAt,
+    required this.updatedAt,
+    this.width,
+    this.height,
+    this.durationInSeconds,
+    required this.id,
+    required this.checksum,
+    required this.isFavorite,
+    required this.ownerId,
+    this.localDateTime,
+    this.thumbHash,
+    this.deletedAt,
+    this.livePhotoVideoId,
+    required this.visibility,
+    this.stackId,
+    this.libraryId,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['name'] = Variable<String>(name);
+    map['type'] = Variable<int>(type);
+    map['created_at'] = Variable<DateTime>(createdAt);
+    map['updated_at'] = Variable<DateTime>(updatedAt);
+    if (!nullToAbsent || width != null) {
+      map['width'] = Variable<int>(width);
+    }
+    if (!nullToAbsent || height != null) {
+      map['height'] = Variable<int>(height);
+    }
+    if (!nullToAbsent || durationInSeconds != null) {
+      map['duration_in_seconds'] = Variable<int>(durationInSeconds);
+    }
+    map['id'] = Variable<String>(id);
+    map['checksum'] = Variable<String>(checksum);
+    map['is_favorite'] = Variable<bool>(isFavorite);
+    map['owner_id'] = Variable<String>(ownerId);
+    if (!nullToAbsent || localDateTime != null) {
+      map['local_date_time'] = Variable<DateTime>(localDateTime);
+    }
+    if (!nullToAbsent || thumbHash != null) {
+      map['thumb_hash'] = Variable<String>(thumbHash);
+    }
+    if (!nullToAbsent || deletedAt != null) {
+      map['deleted_at'] = Variable<DateTime>(deletedAt);
+    }
+    if (!nullToAbsent || livePhotoVideoId != null) {
+      map['live_photo_video_id'] = Variable<String>(livePhotoVideoId);
+    }
+    map['visibility'] = Variable<int>(visibility);
+    if (!nullToAbsent || stackId != null) {
+      map['stack_id'] = Variable<String>(stackId);
+    }
+    if (!nullToAbsent || libraryId != null) {
+      map['library_id'] = Variable<String>(libraryId);
+    }
+    return map;
+  }
+
+  factory RemoteAssetEntityData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return RemoteAssetEntityData(
+      name: serializer.fromJson<String>(json['name']),
+      type: serializer.fromJson<int>(json['type']),
+      createdAt: serializer.fromJson<DateTime>(json['createdAt']),
+      updatedAt: serializer.fromJson<DateTime>(json['updatedAt']),
+      width: serializer.fromJson<int?>(json['width']),
+      height: serializer.fromJson<int?>(json['height']),
+      durationInSeconds: serializer.fromJson<int?>(json['durationInSeconds']),
+      id: serializer.fromJson<String>(json['id']),
+      checksum: serializer.fromJson<String>(json['checksum']),
+      isFavorite: serializer.fromJson<bool>(json['isFavorite']),
+      ownerId: serializer.fromJson<String>(json['ownerId']),
+      localDateTime: serializer.fromJson<DateTime?>(json['localDateTime']),
+      thumbHash: serializer.fromJson<String?>(json['thumbHash']),
+      deletedAt: serializer.fromJson<DateTime?>(json['deletedAt']),
+      livePhotoVideoId: serializer.fromJson<String?>(json['livePhotoVideoId']),
+      visibility: serializer.fromJson<int>(json['visibility']),
+      stackId: serializer.fromJson<String?>(json['stackId']),
+      libraryId: serializer.fromJson<String?>(json['libraryId']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'name': serializer.toJson<String>(name),
+      'type': serializer.toJson<int>(type),
+      'createdAt': serializer.toJson<DateTime>(createdAt),
+      'updatedAt': serializer.toJson<DateTime>(updatedAt),
+      'width': serializer.toJson<int?>(width),
+      'height': serializer.toJson<int?>(height),
+      'durationInSeconds': serializer.toJson<int?>(durationInSeconds),
+      'id': serializer.toJson<String>(id),
+      'checksum': serializer.toJson<String>(checksum),
+      'isFavorite': serializer.toJson<bool>(isFavorite),
+      'ownerId': serializer.toJson<String>(ownerId),
+      'localDateTime': serializer.toJson<DateTime?>(localDateTime),
+      'thumbHash': serializer.toJson<String?>(thumbHash),
+      'deletedAt': serializer.toJson<DateTime?>(deletedAt),
+      'livePhotoVideoId': serializer.toJson<String?>(livePhotoVideoId),
+      'visibility': serializer.toJson<int>(visibility),
+      'stackId': serializer.toJson<String?>(stackId),
+      'libraryId': serializer.toJson<String?>(libraryId),
+    };
+  }
+
+  RemoteAssetEntityData copyWith({
+    String? name,
+    int? type,
+    DateTime? createdAt,
+    DateTime? updatedAt,
+    Value<int?> width = const Value.absent(),
+    Value<int?> height = const Value.absent(),
+    Value<int?> durationInSeconds = const Value.absent(),
+    String? id,
+    String? checksum,
+    bool? isFavorite,
+    String? ownerId,
+    Value<DateTime?> localDateTime = const Value.absent(),
+    Value<String?> thumbHash = const Value.absent(),
+    Value<DateTime?> deletedAt = const Value.absent(),
+    Value<String?> livePhotoVideoId = const Value.absent(),
+    int? visibility,
+    Value<String?> stackId = const Value.absent(),
+    Value<String?> libraryId = const Value.absent(),
+  }) => RemoteAssetEntityData(
+    name: name ?? this.name,
+    type: type ?? this.type,
+    createdAt: createdAt ?? this.createdAt,
+    updatedAt: updatedAt ?? this.updatedAt,
+    width: width.present ? width.value : this.width,
+    height: height.present ? height.value : this.height,
+    durationInSeconds: durationInSeconds.present
+        ? durationInSeconds.value
+        : this.durationInSeconds,
+    id: id ?? this.id,
+    checksum: checksum ?? this.checksum,
+    isFavorite: isFavorite ?? this.isFavorite,
+    ownerId: ownerId ?? this.ownerId,
+    localDateTime: localDateTime.present
+        ? localDateTime.value
+        : this.localDateTime,
+    thumbHash: thumbHash.present ? thumbHash.value : this.thumbHash,
+    deletedAt: deletedAt.present ? deletedAt.value : this.deletedAt,
+    livePhotoVideoId: livePhotoVideoId.present
+        ? livePhotoVideoId.value
+        : this.livePhotoVideoId,
+    visibility: visibility ?? this.visibility,
+    stackId: stackId.present ? stackId.value : this.stackId,
+    libraryId: libraryId.present ? libraryId.value : this.libraryId,
+  );
+  RemoteAssetEntityData copyWithCompanion(RemoteAssetEntityCompanion data) {
+    return RemoteAssetEntityData(
+      name: data.name.present ? data.name.value : this.name,
+      type: data.type.present ? data.type.value : this.type,
+      createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
+      updatedAt: data.updatedAt.present ? data.updatedAt.value : this.updatedAt,
+      width: data.width.present ? data.width.value : this.width,
+      height: data.height.present ? data.height.value : this.height,
+      durationInSeconds: data.durationInSeconds.present
+          ? data.durationInSeconds.value
+          : this.durationInSeconds,
+      id: data.id.present ? data.id.value : this.id,
+      checksum: data.checksum.present ? data.checksum.value : this.checksum,
+      isFavorite: data.isFavorite.present
+          ? data.isFavorite.value
+          : this.isFavorite,
+      ownerId: data.ownerId.present ? data.ownerId.value : this.ownerId,
+      localDateTime: data.localDateTime.present
+          ? data.localDateTime.value
+          : this.localDateTime,
+      thumbHash: data.thumbHash.present ? data.thumbHash.value : this.thumbHash,
+      deletedAt: data.deletedAt.present ? data.deletedAt.value : this.deletedAt,
+      livePhotoVideoId: data.livePhotoVideoId.present
+          ? data.livePhotoVideoId.value
+          : this.livePhotoVideoId,
+      visibility: data.visibility.present
+          ? data.visibility.value
+          : this.visibility,
+      stackId: data.stackId.present ? data.stackId.value : this.stackId,
+      libraryId: data.libraryId.present ? data.libraryId.value : this.libraryId,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('RemoteAssetEntityData(')
+          ..write('name: $name, ')
+          ..write('type: $type, ')
+          ..write('createdAt: $createdAt, ')
+          ..write('updatedAt: $updatedAt, ')
+          ..write('width: $width, ')
+          ..write('height: $height, ')
+          ..write('durationInSeconds: $durationInSeconds, ')
+          ..write('id: $id, ')
+          ..write('checksum: $checksum, ')
+          ..write('isFavorite: $isFavorite, ')
+          ..write('ownerId: $ownerId, ')
+          ..write('localDateTime: $localDateTime, ')
+          ..write('thumbHash: $thumbHash, ')
+          ..write('deletedAt: $deletedAt, ')
+          ..write('livePhotoVideoId: $livePhotoVideoId, ')
+          ..write('visibility: $visibility, ')
+          ..write('stackId: $stackId, ')
+          ..write('libraryId: $libraryId')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(
+    name,
+    type,
+    createdAt,
+    updatedAt,
+    width,
+    height,
+    durationInSeconds,
+    id,
+    checksum,
+    isFavorite,
+    ownerId,
+    localDateTime,
+    thumbHash,
+    deletedAt,
+    livePhotoVideoId,
+    visibility,
+    stackId,
+    libraryId,
+  );
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is RemoteAssetEntityData &&
+          other.name == this.name &&
+          other.type == this.type &&
+          other.createdAt == this.createdAt &&
+          other.updatedAt == this.updatedAt &&
+          other.width == this.width &&
+          other.height == this.height &&
+          other.durationInSeconds == this.durationInSeconds &&
+          other.id == this.id &&
+          other.checksum == this.checksum &&
+          other.isFavorite == this.isFavorite &&
+          other.ownerId == this.ownerId &&
+          other.localDateTime == this.localDateTime &&
+          other.thumbHash == this.thumbHash &&
+          other.deletedAt == this.deletedAt &&
+          other.livePhotoVideoId == this.livePhotoVideoId &&
+          other.visibility == this.visibility &&
+          other.stackId == this.stackId &&
+          other.libraryId == this.libraryId);
+}
+
+class RemoteAssetEntityCompanion
+    extends UpdateCompanion<RemoteAssetEntityData> {
+  final Value<String> name;
+  final Value<int> type;
+  final Value<DateTime> createdAt;
+  final Value<DateTime> updatedAt;
+  final Value<int?> width;
+  final Value<int?> height;
+  final Value<int?> durationInSeconds;
+  final Value<String> id;
+  final Value<String> checksum;
+  final Value<bool> isFavorite;
+  final Value<String> ownerId;
+  final Value<DateTime?> localDateTime;
+  final Value<String?> thumbHash;
+  final Value<DateTime?> deletedAt;
+  final Value<String?> livePhotoVideoId;
+  final Value<int> visibility;
+  final Value<String?> stackId;
+  final Value<String?> libraryId;
+  const RemoteAssetEntityCompanion({
+    this.name = const Value.absent(),
+    this.type = const Value.absent(),
+    this.createdAt = const Value.absent(),
+    this.updatedAt = const Value.absent(),
+    this.width = const Value.absent(),
+    this.height = const Value.absent(),
+    this.durationInSeconds = const Value.absent(),
+    this.id = const Value.absent(),
+    this.checksum = const Value.absent(),
+    this.isFavorite = const Value.absent(),
+    this.ownerId = const Value.absent(),
+    this.localDateTime = const Value.absent(),
+    this.thumbHash = const Value.absent(),
+    this.deletedAt = const Value.absent(),
+    this.livePhotoVideoId = const Value.absent(),
+    this.visibility = const Value.absent(),
+    this.stackId = const Value.absent(),
+    this.libraryId = const Value.absent(),
+  });
+  RemoteAssetEntityCompanion.insert({
+    required String name,
+    required int type,
+    this.createdAt = const Value.absent(),
+    this.updatedAt = const Value.absent(),
+    this.width = const Value.absent(),
+    this.height = const Value.absent(),
+    this.durationInSeconds = const Value.absent(),
+    required String id,
+    required String checksum,
+    this.isFavorite = const Value.absent(),
+    required String ownerId,
+    this.localDateTime = const Value.absent(),
+    this.thumbHash = const Value.absent(),
+    this.deletedAt = const Value.absent(),
+    this.livePhotoVideoId = const Value.absent(),
+    required int visibility,
+    this.stackId = const Value.absent(),
+    this.libraryId = const Value.absent(),
+  }) : name = Value(name),
+       type = Value(type),
+       id = Value(id),
+       checksum = Value(checksum),
+       ownerId = Value(ownerId),
+       visibility = Value(visibility);
+  static Insertable<RemoteAssetEntityData> custom({
+    Expression<String>? name,
+    Expression<int>? type,
+    Expression<DateTime>? createdAt,
+    Expression<DateTime>? updatedAt,
+    Expression<int>? width,
+    Expression<int>? height,
+    Expression<int>? durationInSeconds,
+    Expression<String>? id,
+    Expression<String>? checksum,
+    Expression<bool>? isFavorite,
+    Expression<String>? ownerId,
+    Expression<DateTime>? localDateTime,
+    Expression<String>? thumbHash,
+    Expression<DateTime>? deletedAt,
+    Expression<String>? livePhotoVideoId,
+    Expression<int>? visibility,
+    Expression<String>? stackId,
+    Expression<String>? libraryId,
+  }) {
+    return RawValuesInsertable({
+      if (name != null) 'name': name,
+      if (type != null) 'type': type,
+      if (createdAt != null) 'created_at': createdAt,
+      if (updatedAt != null) 'updated_at': updatedAt,
+      if (width != null) 'width': width,
+      if (height != null) 'height': height,
+      if (durationInSeconds != null) 'duration_in_seconds': durationInSeconds,
+      if (id != null) 'id': id,
+      if (checksum != null) 'checksum': checksum,
+      if (isFavorite != null) 'is_favorite': isFavorite,
+      if (ownerId != null) 'owner_id': ownerId,
+      if (localDateTime != null) 'local_date_time': localDateTime,
+      if (thumbHash != null) 'thumb_hash': thumbHash,
+      if (deletedAt != null) 'deleted_at': deletedAt,
+      if (livePhotoVideoId != null) 'live_photo_video_id': livePhotoVideoId,
+      if (visibility != null) 'visibility': visibility,
+      if (stackId != null) 'stack_id': stackId,
+      if (libraryId != null) 'library_id': libraryId,
+    });
+  }
+
+  RemoteAssetEntityCompanion copyWith({
+    Value<String>? name,
+    Value<int>? type,
+    Value<DateTime>? createdAt,
+    Value<DateTime>? updatedAt,
+    Value<int?>? width,
+    Value<int?>? height,
+    Value<int?>? durationInSeconds,
+    Value<String>? id,
+    Value<String>? checksum,
+    Value<bool>? isFavorite,
+    Value<String>? ownerId,
+    Value<DateTime?>? localDateTime,
+    Value<String?>? thumbHash,
+    Value<DateTime?>? deletedAt,
+    Value<String?>? livePhotoVideoId,
+    Value<int>? visibility,
+    Value<String?>? stackId,
+    Value<String?>? libraryId,
+  }) {
+    return RemoteAssetEntityCompanion(
+      name: name ?? this.name,
+      type: type ?? this.type,
+      createdAt: createdAt ?? this.createdAt,
+      updatedAt: updatedAt ?? this.updatedAt,
+      width: width ?? this.width,
+      height: height ?? this.height,
+      durationInSeconds: durationInSeconds ?? this.durationInSeconds,
+      id: id ?? this.id,
+      checksum: checksum ?? this.checksum,
+      isFavorite: isFavorite ?? this.isFavorite,
+      ownerId: ownerId ?? this.ownerId,
+      localDateTime: localDateTime ?? this.localDateTime,
+      thumbHash: thumbHash ?? this.thumbHash,
+      deletedAt: deletedAt ?? this.deletedAt,
+      livePhotoVideoId: livePhotoVideoId ?? this.livePhotoVideoId,
+      visibility: visibility ?? this.visibility,
+      stackId: stackId ?? this.stackId,
+      libraryId: libraryId ?? this.libraryId,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (name.present) {
+      map['name'] = Variable<String>(name.value);
+    }
+    if (type.present) {
+      map['type'] = Variable<int>(type.value);
+    }
+    if (createdAt.present) {
+      map['created_at'] = Variable<DateTime>(createdAt.value);
+    }
+    if (updatedAt.present) {
+      map['updated_at'] = Variable<DateTime>(updatedAt.value);
+    }
+    if (width.present) {
+      map['width'] = Variable<int>(width.value);
+    }
+    if (height.present) {
+      map['height'] = Variable<int>(height.value);
+    }
+    if (durationInSeconds.present) {
+      map['duration_in_seconds'] = Variable<int>(durationInSeconds.value);
+    }
+    if (id.present) {
+      map['id'] = Variable<String>(id.value);
+    }
+    if (checksum.present) {
+      map['checksum'] = Variable<String>(checksum.value);
+    }
+    if (isFavorite.present) {
+      map['is_favorite'] = Variable<bool>(isFavorite.value);
+    }
+    if (ownerId.present) {
+      map['owner_id'] = Variable<String>(ownerId.value);
+    }
+    if (localDateTime.present) {
+      map['local_date_time'] = Variable<DateTime>(localDateTime.value);
+    }
+    if (thumbHash.present) {
+      map['thumb_hash'] = Variable<String>(thumbHash.value);
+    }
+    if (deletedAt.present) {
+      map['deleted_at'] = Variable<DateTime>(deletedAt.value);
+    }
+    if (livePhotoVideoId.present) {
+      map['live_photo_video_id'] = Variable<String>(livePhotoVideoId.value);
+    }
+    if (visibility.present) {
+      map['visibility'] = Variable<int>(visibility.value);
+    }
+    if (stackId.present) {
+      map['stack_id'] = Variable<String>(stackId.value);
+    }
+    if (libraryId.present) {
+      map['library_id'] = Variable<String>(libraryId.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('RemoteAssetEntityCompanion(')
+          ..write('name: $name, ')
+          ..write('type: $type, ')
+          ..write('createdAt: $createdAt, ')
+          ..write('updatedAt: $updatedAt, ')
+          ..write('width: $width, ')
+          ..write('height: $height, ')
+          ..write('durationInSeconds: $durationInSeconds, ')
+          ..write('id: $id, ')
+          ..write('checksum: $checksum, ')
+          ..write('isFavorite: $isFavorite, ')
+          ..write('ownerId: $ownerId, ')
+          ..write('localDateTime: $localDateTime, ')
+          ..write('thumbHash: $thumbHash, ')
+          ..write('deletedAt: $deletedAt, ')
+          ..write('livePhotoVideoId: $livePhotoVideoId, ')
+          ..write('visibility: $visibility, ')
+          ..write('stackId: $stackId, ')
+          ..write('libraryId: $libraryId')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class StackEntity extends Table with TableInfo<StackEntity, StackEntityData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  StackEntity(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<String> id = GeneratedColumn<String>(
+    'id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+  );
+  late final GeneratedColumn<DateTime> createdAt = GeneratedColumn<DateTime>(
+    'created_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.dateTime,
+    requiredDuringInsert: false,
+    defaultValue: const CustomExpression('CURRENT_TIMESTAMP'),
+  );
+  late final GeneratedColumn<DateTime> updatedAt = GeneratedColumn<DateTime>(
+    'updated_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.dateTime,
+    requiredDuringInsert: false,
+    defaultValue: const CustomExpression('CURRENT_TIMESTAMP'),
+  );
+  late final GeneratedColumn<String> ownerId = GeneratedColumn<String>(
+    'owner_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    defaultConstraints: GeneratedColumn.constraintIsAlways(
+      'REFERENCES user_entity (id) ON DELETE CASCADE',
+    ),
+  );
+  late final GeneratedColumn<String> primaryAssetId = GeneratedColumn<String>(
+    'primary_asset_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+  );
+  @override
+  List<GeneratedColumn> get $columns => [
+    id,
+    createdAt,
+    updatedAt,
+    ownerId,
+    primaryAssetId,
+  ];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'stack_entity';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {id};
+  @override
+  StackEntityData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return StackEntityData(
+      id: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}id'],
+      )!,
+      createdAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.dateTime,
+        data['${effectivePrefix}created_at'],
+      )!,
+      updatedAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.dateTime,
+        data['${effectivePrefix}updated_at'],
+      )!,
+      ownerId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}owner_id'],
+      )!,
+      primaryAssetId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}primary_asset_id'],
+      )!,
+    );
+  }
+
+  @override
+  StackEntity createAlias(String alias) {
+    return StackEntity(attachedDatabase, alias);
+  }
+
+  @override
+  bool get withoutRowId => true;
+  @override
+  bool get isStrict => true;
+}
+
+class StackEntityData extends DataClass implements Insertable<StackEntityData> {
+  final String id;
+  final DateTime createdAt;
+  final DateTime updatedAt;
+  final String ownerId;
+  final String primaryAssetId;
+  const StackEntityData({
+    required this.id,
+    required this.createdAt,
+    required this.updatedAt,
+    required this.ownerId,
+    required this.primaryAssetId,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['id'] = Variable<String>(id);
+    map['created_at'] = Variable<DateTime>(createdAt);
+    map['updated_at'] = Variable<DateTime>(updatedAt);
+    map['owner_id'] = Variable<String>(ownerId);
+    map['primary_asset_id'] = Variable<String>(primaryAssetId);
+    return map;
+  }
+
+  factory StackEntityData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return StackEntityData(
+      id: serializer.fromJson<String>(json['id']),
+      createdAt: serializer.fromJson<DateTime>(json['createdAt']),
+      updatedAt: serializer.fromJson<DateTime>(json['updatedAt']),
+      ownerId: serializer.fromJson<String>(json['ownerId']),
+      primaryAssetId: serializer.fromJson<String>(json['primaryAssetId']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'id': serializer.toJson<String>(id),
+      'createdAt': serializer.toJson<DateTime>(createdAt),
+      'updatedAt': serializer.toJson<DateTime>(updatedAt),
+      'ownerId': serializer.toJson<String>(ownerId),
+      'primaryAssetId': serializer.toJson<String>(primaryAssetId),
+    };
+  }
+
+  StackEntityData copyWith({
+    String? id,
+    DateTime? createdAt,
+    DateTime? updatedAt,
+    String? ownerId,
+    String? primaryAssetId,
+  }) => StackEntityData(
+    id: id ?? this.id,
+    createdAt: createdAt ?? this.createdAt,
+    updatedAt: updatedAt ?? this.updatedAt,
+    ownerId: ownerId ?? this.ownerId,
+    primaryAssetId: primaryAssetId ?? this.primaryAssetId,
+  );
+  StackEntityData copyWithCompanion(StackEntityCompanion data) {
+    return StackEntityData(
+      id: data.id.present ? data.id.value : this.id,
+      createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
+      updatedAt: data.updatedAt.present ? data.updatedAt.value : this.updatedAt,
+      ownerId: data.ownerId.present ? data.ownerId.value : this.ownerId,
+      primaryAssetId: data.primaryAssetId.present
+          ? data.primaryAssetId.value
+          : this.primaryAssetId,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('StackEntityData(')
+          ..write('id: $id, ')
+          ..write('createdAt: $createdAt, ')
+          ..write('updatedAt: $updatedAt, ')
+          ..write('ownerId: $ownerId, ')
+          ..write('primaryAssetId: $primaryAssetId')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode =>
+      Object.hash(id, createdAt, updatedAt, ownerId, primaryAssetId);
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is StackEntityData &&
+          other.id == this.id &&
+          other.createdAt == this.createdAt &&
+          other.updatedAt == this.updatedAt &&
+          other.ownerId == this.ownerId &&
+          other.primaryAssetId == this.primaryAssetId);
+}
+
+class StackEntityCompanion extends UpdateCompanion<StackEntityData> {
+  final Value<String> id;
+  final Value<DateTime> createdAt;
+  final Value<DateTime> updatedAt;
+  final Value<String> ownerId;
+  final Value<String> primaryAssetId;
+  const StackEntityCompanion({
+    this.id = const Value.absent(),
+    this.createdAt = const Value.absent(),
+    this.updatedAt = const Value.absent(),
+    this.ownerId = const Value.absent(),
+    this.primaryAssetId = const Value.absent(),
+  });
+  StackEntityCompanion.insert({
+    required String id,
+    this.createdAt = const Value.absent(),
+    this.updatedAt = const Value.absent(),
+    required String ownerId,
+    required String primaryAssetId,
+  }) : id = Value(id),
+       ownerId = Value(ownerId),
+       primaryAssetId = Value(primaryAssetId);
+  static Insertable<StackEntityData> custom({
+    Expression<String>? id,
+    Expression<DateTime>? createdAt,
+    Expression<DateTime>? updatedAt,
+    Expression<String>? ownerId,
+    Expression<String>? primaryAssetId,
+  }) {
+    return RawValuesInsertable({
+      if (id != null) 'id': id,
+      if (createdAt != null) 'created_at': createdAt,
+      if (updatedAt != null) 'updated_at': updatedAt,
+      if (ownerId != null) 'owner_id': ownerId,
+      if (primaryAssetId != null) 'primary_asset_id': primaryAssetId,
+    });
+  }
+
+  StackEntityCompanion copyWith({
+    Value<String>? id,
+    Value<DateTime>? createdAt,
+    Value<DateTime>? updatedAt,
+    Value<String>? ownerId,
+    Value<String>? primaryAssetId,
+  }) {
+    return StackEntityCompanion(
+      id: id ?? this.id,
+      createdAt: createdAt ?? this.createdAt,
+      updatedAt: updatedAt ?? this.updatedAt,
+      ownerId: ownerId ?? this.ownerId,
+      primaryAssetId: primaryAssetId ?? this.primaryAssetId,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (id.present) {
+      map['id'] = Variable<String>(id.value);
+    }
+    if (createdAt.present) {
+      map['created_at'] = Variable<DateTime>(createdAt.value);
+    }
+    if (updatedAt.present) {
+      map['updated_at'] = Variable<DateTime>(updatedAt.value);
+    }
+    if (ownerId.present) {
+      map['owner_id'] = Variable<String>(ownerId.value);
+    }
+    if (primaryAssetId.present) {
+      map['primary_asset_id'] = Variable<String>(primaryAssetId.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('StackEntityCompanion(')
+          ..write('id: $id, ')
+          ..write('createdAt: $createdAt, ')
+          ..write('updatedAt: $updatedAt, ')
+          ..write('ownerId: $ownerId, ')
+          ..write('primaryAssetId: $primaryAssetId')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class LocalAssetEntity extends Table
+    with TableInfo<LocalAssetEntity, LocalAssetEntityData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  LocalAssetEntity(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<String> name = GeneratedColumn<String>(
+    'name',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+  );
+  late final GeneratedColumn<int> type = GeneratedColumn<int>(
+    'type',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+  );
+  late final GeneratedColumn<DateTime> createdAt = GeneratedColumn<DateTime>(
+    'created_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.dateTime,
+    requiredDuringInsert: false,
+    defaultValue: const CustomExpression('CURRENT_TIMESTAMP'),
+  );
+  late final GeneratedColumn<DateTime> updatedAt = GeneratedColumn<DateTime>(
+    'updated_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.dateTime,
+    requiredDuringInsert: false,
+    defaultValue: const CustomExpression('CURRENT_TIMESTAMP'),
+  );
+  late final GeneratedColumn<int> width = GeneratedColumn<int>(
+    'width',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+  );
+  late final GeneratedColumn<int> height = GeneratedColumn<int>(
+    'height',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+  );
+  late final GeneratedColumn<int> durationInSeconds = GeneratedColumn<int>(
+    'duration_in_seconds',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+  );
+  late final GeneratedColumn<String> id = GeneratedColumn<String>(
+    'id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+  );
+  late final GeneratedColumn<String> checksum = GeneratedColumn<String>(
+    'checksum',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+  );
+  late final GeneratedColumn<bool> isFavorite = GeneratedColumn<bool>(
+    'is_favorite',
+    aliasedName,
+    false,
+    type: DriftSqlType.bool,
+    requiredDuringInsert: false,
+    defaultConstraints: GeneratedColumn.constraintIsAlways(
+      'CHECK ("is_favorite" IN (0, 1))',
+    ),
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> orientation = GeneratedColumn<int>(
+    'orientation',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    defaultValue: const CustomExpression('0'),
+  );
+  @override
+  List<GeneratedColumn> get $columns => [
+    name,
+    type,
+    createdAt,
+    updatedAt,
+    width,
+    height,
+    durationInSeconds,
+    id,
+    checksum,
+    isFavorite,
+    orientation,
+  ];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'local_asset_entity';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {id};
+  @override
+  LocalAssetEntityData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return LocalAssetEntityData(
+      name: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}name'],
+      )!,
+      type: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}type'],
+      )!,
+      createdAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.dateTime,
+        data['${effectivePrefix}created_at'],
+      )!,
+      updatedAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.dateTime,
+        data['${effectivePrefix}updated_at'],
+      )!,
+      width: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}width'],
+      ),
+      height: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}height'],
+      ),
+      durationInSeconds: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}duration_in_seconds'],
+      ),
+      id: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}id'],
+      )!,
+      checksum: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}checksum'],
+      ),
+      isFavorite: attachedDatabase.typeMapping.read(
+        DriftSqlType.bool,
+        data['${effectivePrefix}is_favorite'],
+      )!,
+      orientation: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}orientation'],
+      )!,
+    );
+  }
+
+  @override
+  LocalAssetEntity createAlias(String alias) {
+    return LocalAssetEntity(attachedDatabase, alias);
+  }
+
+  @override
+  bool get withoutRowId => true;
+  @override
+  bool get isStrict => true;
+}
+
+class LocalAssetEntityData extends DataClass
+    implements Insertable<LocalAssetEntityData> {
+  final String name;
+  final int type;
+  final DateTime createdAt;
+  final DateTime updatedAt;
+  final int? width;
+  final int? height;
+  final int? durationInSeconds;
+  final String id;
+  final String? checksum;
+  final bool isFavorite;
+  final int orientation;
+  const LocalAssetEntityData({
+    required this.name,
+    required this.type,
+    required this.createdAt,
+    required this.updatedAt,
+    this.width,
+    this.height,
+    this.durationInSeconds,
+    required this.id,
+    this.checksum,
+    required this.isFavorite,
+    required this.orientation,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['name'] = Variable<String>(name);
+    map['type'] = Variable<int>(type);
+    map['created_at'] = Variable<DateTime>(createdAt);
+    map['updated_at'] = Variable<DateTime>(updatedAt);
+    if (!nullToAbsent || width != null) {
+      map['width'] = Variable<int>(width);
+    }
+    if (!nullToAbsent || height != null) {
+      map['height'] = Variable<int>(height);
+    }
+    if (!nullToAbsent || durationInSeconds != null) {
+      map['duration_in_seconds'] = Variable<int>(durationInSeconds);
+    }
+    map['id'] = Variable<String>(id);
+    if (!nullToAbsent || checksum != null) {
+      map['checksum'] = Variable<String>(checksum);
+    }
+    map['is_favorite'] = Variable<bool>(isFavorite);
+    map['orientation'] = Variable<int>(orientation);
+    return map;
+  }
+
+  factory LocalAssetEntityData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return LocalAssetEntityData(
+      name: serializer.fromJson<String>(json['name']),
+      type: serializer.fromJson<int>(json['type']),
+      createdAt: serializer.fromJson<DateTime>(json['createdAt']),
+      updatedAt: serializer.fromJson<DateTime>(json['updatedAt']),
+      width: serializer.fromJson<int?>(json['width']),
+      height: serializer.fromJson<int?>(json['height']),
+      durationInSeconds: serializer.fromJson<int?>(json['durationInSeconds']),
+      id: serializer.fromJson<String>(json['id']),
+      checksum: serializer.fromJson<String?>(json['checksum']),
+      isFavorite: serializer.fromJson<bool>(json['isFavorite']),
+      orientation: serializer.fromJson<int>(json['orientation']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'name': serializer.toJson<String>(name),
+      'type': serializer.toJson<int>(type),
+      'createdAt': serializer.toJson<DateTime>(createdAt),
+      'updatedAt': serializer.toJson<DateTime>(updatedAt),
+      'width': serializer.toJson<int?>(width),
+      'height': serializer.toJson<int?>(height),
+      'durationInSeconds': serializer.toJson<int?>(durationInSeconds),
+      'id': serializer.toJson<String>(id),
+      'checksum': serializer.toJson<String?>(checksum),
+      'isFavorite': serializer.toJson<bool>(isFavorite),
+      'orientation': serializer.toJson<int>(orientation),
+    };
+  }
+
+  LocalAssetEntityData copyWith({
+    String? name,
+    int? type,
+    DateTime? createdAt,
+    DateTime? updatedAt,
+    Value<int?> width = const Value.absent(),
+    Value<int?> height = const Value.absent(),
+    Value<int?> durationInSeconds = const Value.absent(),
+    String? id,
+    Value<String?> checksum = const Value.absent(),
+    bool? isFavorite,
+    int? orientation,
+  }) => LocalAssetEntityData(
+    name: name ?? this.name,
+    type: type ?? this.type,
+    createdAt: createdAt ?? this.createdAt,
+    updatedAt: updatedAt ?? this.updatedAt,
+    width: width.present ? width.value : this.width,
+    height: height.present ? height.value : this.height,
+    durationInSeconds: durationInSeconds.present
+        ? durationInSeconds.value
+        : this.durationInSeconds,
+    id: id ?? this.id,
+    checksum: checksum.present ? checksum.value : this.checksum,
+    isFavorite: isFavorite ?? this.isFavorite,
+    orientation: orientation ?? this.orientation,
+  );
+  LocalAssetEntityData copyWithCompanion(LocalAssetEntityCompanion data) {
+    return LocalAssetEntityData(
+      name: data.name.present ? data.name.value : this.name,
+      type: data.type.present ? data.type.value : this.type,
+      createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
+      updatedAt: data.updatedAt.present ? data.updatedAt.value : this.updatedAt,
+      width: data.width.present ? data.width.value : this.width,
+      height: data.height.present ? data.height.value : this.height,
+      durationInSeconds: data.durationInSeconds.present
+          ? data.durationInSeconds.value
+          : this.durationInSeconds,
+      id: data.id.present ? data.id.value : this.id,
+      checksum: data.checksum.present ? data.checksum.value : this.checksum,
+      isFavorite: data.isFavorite.present
+          ? data.isFavorite.value
+          : this.isFavorite,
+      orientation: data.orientation.present
+          ? data.orientation.value
+          : this.orientation,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('LocalAssetEntityData(')
+          ..write('name: $name, ')
+          ..write('type: $type, ')
+          ..write('createdAt: $createdAt, ')
+          ..write('updatedAt: $updatedAt, ')
+          ..write('width: $width, ')
+          ..write('height: $height, ')
+          ..write('durationInSeconds: $durationInSeconds, ')
+          ..write('id: $id, ')
+          ..write('checksum: $checksum, ')
+          ..write('isFavorite: $isFavorite, ')
+          ..write('orientation: $orientation')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(
+    name,
+    type,
+    createdAt,
+    updatedAt,
+    width,
+    height,
+    durationInSeconds,
+    id,
+    checksum,
+    isFavorite,
+    orientation,
+  );
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is LocalAssetEntityData &&
+          other.name == this.name &&
+          other.type == this.type &&
+          other.createdAt == this.createdAt &&
+          other.updatedAt == this.updatedAt &&
+          other.width == this.width &&
+          other.height == this.height &&
+          other.durationInSeconds == this.durationInSeconds &&
+          other.id == this.id &&
+          other.checksum == this.checksum &&
+          other.isFavorite == this.isFavorite &&
+          other.orientation == this.orientation);
+}
+
+class LocalAssetEntityCompanion extends UpdateCompanion<LocalAssetEntityData> {
+  final Value<String> name;
+  final Value<int> type;
+  final Value<DateTime> createdAt;
+  final Value<DateTime> updatedAt;
+  final Value<int?> width;
+  final Value<int?> height;
+  final Value<int?> durationInSeconds;
+  final Value<String> id;
+  final Value<String?> checksum;
+  final Value<bool> isFavorite;
+  final Value<int> orientation;
+  const LocalAssetEntityCompanion({
+    this.name = const Value.absent(),
+    this.type = const Value.absent(),
+    this.createdAt = const Value.absent(),
+    this.updatedAt = const Value.absent(),
+    this.width = const Value.absent(),
+    this.height = const Value.absent(),
+    this.durationInSeconds = const Value.absent(),
+    this.id = const Value.absent(),
+    this.checksum = const Value.absent(),
+    this.isFavorite = const Value.absent(),
+    this.orientation = const Value.absent(),
+  });
+  LocalAssetEntityCompanion.insert({
+    required String name,
+    required int type,
+    this.createdAt = const Value.absent(),
+    this.updatedAt = const Value.absent(),
+    this.width = const Value.absent(),
+    this.height = const Value.absent(),
+    this.durationInSeconds = const Value.absent(),
+    required String id,
+    this.checksum = const Value.absent(),
+    this.isFavorite = const Value.absent(),
+    this.orientation = const Value.absent(),
+  }) : name = Value(name),
+       type = Value(type),
+       id = Value(id);
+  static Insertable<LocalAssetEntityData> custom({
+    Expression<String>? name,
+    Expression<int>? type,
+    Expression<DateTime>? createdAt,
+    Expression<DateTime>? updatedAt,
+    Expression<int>? width,
+    Expression<int>? height,
+    Expression<int>? durationInSeconds,
+    Expression<String>? id,
+    Expression<String>? checksum,
+    Expression<bool>? isFavorite,
+    Expression<int>? orientation,
+  }) {
+    return RawValuesInsertable({
+      if (name != null) 'name': name,
+      if (type != null) 'type': type,
+      if (createdAt != null) 'created_at': createdAt,
+      if (updatedAt != null) 'updated_at': updatedAt,
+      if (width != null) 'width': width,
+      if (height != null) 'height': height,
+      if (durationInSeconds != null) 'duration_in_seconds': durationInSeconds,
+      if (id != null) 'id': id,
+      if (checksum != null) 'checksum': checksum,
+      if (isFavorite != null) 'is_favorite': isFavorite,
+      if (orientation != null) 'orientation': orientation,
+    });
+  }
+
+  LocalAssetEntityCompanion copyWith({
+    Value<String>? name,
+    Value<int>? type,
+    Value<DateTime>? createdAt,
+    Value<DateTime>? updatedAt,
+    Value<int?>? width,
+    Value<int?>? height,
+    Value<int?>? durationInSeconds,
+    Value<String>? id,
+    Value<String?>? checksum,
+    Value<bool>? isFavorite,
+    Value<int>? orientation,
+  }) {
+    return LocalAssetEntityCompanion(
+      name: name ?? this.name,
+      type: type ?? this.type,
+      createdAt: createdAt ?? this.createdAt,
+      updatedAt: updatedAt ?? this.updatedAt,
+      width: width ?? this.width,
+      height: height ?? this.height,
+      durationInSeconds: durationInSeconds ?? this.durationInSeconds,
+      id: id ?? this.id,
+      checksum: checksum ?? this.checksum,
+      isFavorite: isFavorite ?? this.isFavorite,
+      orientation: orientation ?? this.orientation,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (name.present) {
+      map['name'] = Variable<String>(name.value);
+    }
+    if (type.present) {
+      map['type'] = Variable<int>(type.value);
+    }
+    if (createdAt.present) {
+      map['created_at'] = Variable<DateTime>(createdAt.value);
+    }
+    if (updatedAt.present) {
+      map['updated_at'] = Variable<DateTime>(updatedAt.value);
+    }
+    if (width.present) {
+      map['width'] = Variable<int>(width.value);
+    }
+    if (height.present) {
+      map['height'] = Variable<int>(height.value);
+    }
+    if (durationInSeconds.present) {
+      map['duration_in_seconds'] = Variable<int>(durationInSeconds.value);
+    }
+    if (id.present) {
+      map['id'] = Variable<String>(id.value);
+    }
+    if (checksum.present) {
+      map['checksum'] = Variable<String>(checksum.value);
+    }
+    if (isFavorite.present) {
+      map['is_favorite'] = Variable<bool>(isFavorite.value);
+    }
+    if (orientation.present) {
+      map['orientation'] = Variable<int>(orientation.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('LocalAssetEntityCompanion(')
+          ..write('name: $name, ')
+          ..write('type: $type, ')
+          ..write('createdAt: $createdAt, ')
+          ..write('updatedAt: $updatedAt, ')
+          ..write('width: $width, ')
+          ..write('height: $height, ')
+          ..write('durationInSeconds: $durationInSeconds, ')
+          ..write('id: $id, ')
+          ..write('checksum: $checksum, ')
+          ..write('isFavorite: $isFavorite, ')
+          ..write('orientation: $orientation')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class RemoteAlbumEntity extends Table
+    with TableInfo<RemoteAlbumEntity, RemoteAlbumEntityData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  RemoteAlbumEntity(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<String> id = GeneratedColumn<String>(
+    'id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+  );
+  late final GeneratedColumn<String> name = GeneratedColumn<String>(
+    'name',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+  );
+  late final GeneratedColumn<String> description = GeneratedColumn<String>(
+    'description',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+    defaultValue: const CustomExpression('\'\''),
+  );
+  late final GeneratedColumn<DateTime> createdAt = GeneratedColumn<DateTime>(
+    'created_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.dateTime,
+    requiredDuringInsert: false,
+    defaultValue: const CustomExpression('CURRENT_TIMESTAMP'),
+  );
+  late final GeneratedColumn<DateTime> updatedAt = GeneratedColumn<DateTime>(
+    'updated_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.dateTime,
+    requiredDuringInsert: false,
+    defaultValue: const CustomExpression('CURRENT_TIMESTAMP'),
+  );
+  late final GeneratedColumn<String> ownerId = GeneratedColumn<String>(
+    'owner_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    defaultConstraints: GeneratedColumn.constraintIsAlways(
+      'REFERENCES user_entity (id) ON DELETE CASCADE',
+    ),
+  );
+  late final GeneratedColumn<String> thumbnailAssetId = GeneratedColumn<String>(
+    'thumbnail_asset_id',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+    defaultConstraints: GeneratedColumn.constraintIsAlways(
+      'REFERENCES remote_asset_entity (id) ON DELETE SET NULL',
+    ),
+  );
+  late final GeneratedColumn<bool> isActivityEnabled = GeneratedColumn<bool>(
+    'is_activity_enabled',
+    aliasedName,
+    false,
+    type: DriftSqlType.bool,
+    requiredDuringInsert: false,
+    defaultConstraints: GeneratedColumn.constraintIsAlways(
+      'CHECK ("is_activity_enabled" IN (0, 1))',
+    ),
+    defaultValue: const CustomExpression('1'),
+  );
+  late final GeneratedColumn<int> order = GeneratedColumn<int>(
+    'order',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+  );
+  @override
+  List<GeneratedColumn> get $columns => [
+    id,
+    name,
+    description,
+    createdAt,
+    updatedAt,
+    ownerId,
+    thumbnailAssetId,
+    isActivityEnabled,
+    order,
+  ];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'remote_album_entity';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {id};
+  @override
+  RemoteAlbumEntityData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return RemoteAlbumEntityData(
+      id: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}id'],
+      )!,
+      name: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}name'],
+      )!,
+      description: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}description'],
+      )!,
+      createdAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.dateTime,
+        data['${effectivePrefix}created_at'],
+      )!,
+      updatedAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.dateTime,
+        data['${effectivePrefix}updated_at'],
+      )!,
+      ownerId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}owner_id'],
+      )!,
+      thumbnailAssetId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}thumbnail_asset_id'],
+      ),
+      isActivityEnabled: attachedDatabase.typeMapping.read(
+        DriftSqlType.bool,
+        data['${effectivePrefix}is_activity_enabled'],
+      )!,
+      order: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}order'],
+      )!,
+    );
+  }
+
+  @override
+  RemoteAlbumEntity createAlias(String alias) {
+    return RemoteAlbumEntity(attachedDatabase, alias);
+  }
+
+  @override
+  bool get withoutRowId => true;
+  @override
+  bool get isStrict => true;
+}
+
+class RemoteAlbumEntityData extends DataClass
+    implements Insertable<RemoteAlbumEntityData> {
+  final String id;
+  final String name;
+  final String description;
+  final DateTime createdAt;
+  final DateTime updatedAt;
+  final String ownerId;
+  final String? thumbnailAssetId;
+  final bool isActivityEnabled;
+  final int order;
+  const RemoteAlbumEntityData({
+    required this.id,
+    required this.name,
+    required this.description,
+    required this.createdAt,
+    required this.updatedAt,
+    required this.ownerId,
+    this.thumbnailAssetId,
+    required this.isActivityEnabled,
+    required this.order,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['id'] = Variable<String>(id);
+    map['name'] = Variable<String>(name);
+    map['description'] = Variable<String>(description);
+    map['created_at'] = Variable<DateTime>(createdAt);
+    map['updated_at'] = Variable<DateTime>(updatedAt);
+    map['owner_id'] = Variable<String>(ownerId);
+    if (!nullToAbsent || thumbnailAssetId != null) {
+      map['thumbnail_asset_id'] = Variable<String>(thumbnailAssetId);
+    }
+    map['is_activity_enabled'] = Variable<bool>(isActivityEnabled);
+    map['order'] = Variable<int>(order);
+    return map;
+  }
+
+  factory RemoteAlbumEntityData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return RemoteAlbumEntityData(
+      id: serializer.fromJson<String>(json['id']),
+      name: serializer.fromJson<String>(json['name']),
+      description: serializer.fromJson<String>(json['description']),
+      createdAt: serializer.fromJson<DateTime>(json['createdAt']),
+      updatedAt: serializer.fromJson<DateTime>(json['updatedAt']),
+      ownerId: serializer.fromJson<String>(json['ownerId']),
+      thumbnailAssetId: serializer.fromJson<String?>(json['thumbnailAssetId']),
+      isActivityEnabled: serializer.fromJson<bool>(json['isActivityEnabled']),
+      order: serializer.fromJson<int>(json['order']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'id': serializer.toJson<String>(id),
+      'name': serializer.toJson<String>(name),
+      'description': serializer.toJson<String>(description),
+      'createdAt': serializer.toJson<DateTime>(createdAt),
+      'updatedAt': serializer.toJson<DateTime>(updatedAt),
+      'ownerId': serializer.toJson<String>(ownerId),
+      'thumbnailAssetId': serializer.toJson<String?>(thumbnailAssetId),
+      'isActivityEnabled': serializer.toJson<bool>(isActivityEnabled),
+      'order': serializer.toJson<int>(order),
+    };
+  }
+
+  RemoteAlbumEntityData copyWith({
+    String? id,
+    String? name,
+    String? description,
+    DateTime? createdAt,
+    DateTime? updatedAt,
+    String? ownerId,
+    Value<String?> thumbnailAssetId = const Value.absent(),
+    bool? isActivityEnabled,
+    int? order,
+  }) => RemoteAlbumEntityData(
+    id: id ?? this.id,
+    name: name ?? this.name,
+    description: description ?? this.description,
+    createdAt: createdAt ?? this.createdAt,
+    updatedAt: updatedAt ?? this.updatedAt,
+    ownerId: ownerId ?? this.ownerId,
+    thumbnailAssetId: thumbnailAssetId.present
+        ? thumbnailAssetId.value
+        : this.thumbnailAssetId,
+    isActivityEnabled: isActivityEnabled ?? this.isActivityEnabled,
+    order: order ?? this.order,
+  );
+  RemoteAlbumEntityData copyWithCompanion(RemoteAlbumEntityCompanion data) {
+    return RemoteAlbumEntityData(
+      id: data.id.present ? data.id.value : this.id,
+      name: data.name.present ? data.name.value : this.name,
+      description: data.description.present
+          ? data.description.value
+          : this.description,
+      createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
+      updatedAt: data.updatedAt.present ? data.updatedAt.value : this.updatedAt,
+      ownerId: data.ownerId.present ? data.ownerId.value : this.ownerId,
+      thumbnailAssetId: data.thumbnailAssetId.present
+          ? data.thumbnailAssetId.value
+          : this.thumbnailAssetId,
+      isActivityEnabled: data.isActivityEnabled.present
+          ? data.isActivityEnabled.value
+          : this.isActivityEnabled,
+      order: data.order.present ? data.order.value : this.order,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('RemoteAlbumEntityData(')
+          ..write('id: $id, ')
+          ..write('name: $name, ')
+          ..write('description: $description, ')
+          ..write('createdAt: $createdAt, ')
+          ..write('updatedAt: $updatedAt, ')
+          ..write('ownerId: $ownerId, ')
+          ..write('thumbnailAssetId: $thumbnailAssetId, ')
+          ..write('isActivityEnabled: $isActivityEnabled, ')
+          ..write('order: $order')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(
+    id,
+    name,
+    description,
+    createdAt,
+    updatedAt,
+    ownerId,
+    thumbnailAssetId,
+    isActivityEnabled,
+    order,
+  );
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is RemoteAlbumEntityData &&
+          other.id == this.id &&
+          other.name == this.name &&
+          other.description == this.description &&
+          other.createdAt == this.createdAt &&
+          other.updatedAt == this.updatedAt &&
+          other.ownerId == this.ownerId &&
+          other.thumbnailAssetId == this.thumbnailAssetId &&
+          other.isActivityEnabled == this.isActivityEnabled &&
+          other.order == this.order);
+}
+
+class RemoteAlbumEntityCompanion
+    extends UpdateCompanion<RemoteAlbumEntityData> {
+  final Value<String> id;
+  final Value<String> name;
+  final Value<String> description;
+  final Value<DateTime> createdAt;
+  final Value<DateTime> updatedAt;
+  final Value<String> ownerId;
+  final Value<String?> thumbnailAssetId;
+  final Value<bool> isActivityEnabled;
+  final Value<int> order;
+  const RemoteAlbumEntityCompanion({
+    this.id = const Value.absent(),
+    this.name = const Value.absent(),
+    this.description = const Value.absent(),
+    this.createdAt = const Value.absent(),
+    this.updatedAt = const Value.absent(),
+    this.ownerId = const Value.absent(),
+    this.thumbnailAssetId = const Value.absent(),
+    this.isActivityEnabled = const Value.absent(),
+    this.order = const Value.absent(),
+  });
+  RemoteAlbumEntityCompanion.insert({
+    required String id,
+    required String name,
+    this.description = const Value.absent(),
+    this.createdAt = const Value.absent(),
+    this.updatedAt = const Value.absent(),
+    required String ownerId,
+    this.thumbnailAssetId = const Value.absent(),
+    this.isActivityEnabled = const Value.absent(),
+    required int order,
+  }) : id = Value(id),
+       name = Value(name),
+       ownerId = Value(ownerId),
+       order = Value(order);
+  static Insertable<RemoteAlbumEntityData> custom({
+    Expression<String>? id,
+    Expression<String>? name,
+    Expression<String>? description,
+    Expression<DateTime>? createdAt,
+    Expression<DateTime>? updatedAt,
+    Expression<String>? ownerId,
+    Expression<String>? thumbnailAssetId,
+    Expression<bool>? isActivityEnabled,
+    Expression<int>? order,
+  }) {
+    return RawValuesInsertable({
+      if (id != null) 'id': id,
+      if (name != null) 'name': name,
+      if (description != null) 'description': description,
+      if (createdAt != null) 'created_at': createdAt,
+      if (updatedAt != null) 'updated_at': updatedAt,
+      if (ownerId != null) 'owner_id': ownerId,
+      if (thumbnailAssetId != null) 'thumbnail_asset_id': thumbnailAssetId,
+      if (isActivityEnabled != null) 'is_activity_enabled': isActivityEnabled,
+      if (order != null) 'order': order,
+    });
+  }
+
+  RemoteAlbumEntityCompanion copyWith({
+    Value<String>? id,
+    Value<String>? name,
+    Value<String>? description,
+    Value<DateTime>? createdAt,
+    Value<DateTime>? updatedAt,
+    Value<String>? ownerId,
+    Value<String?>? thumbnailAssetId,
+    Value<bool>? isActivityEnabled,
+    Value<int>? order,
+  }) {
+    return RemoteAlbumEntityCompanion(
+      id: id ?? this.id,
+      name: name ?? this.name,
+      description: description ?? this.description,
+      createdAt: createdAt ?? this.createdAt,
+      updatedAt: updatedAt ?? this.updatedAt,
+      ownerId: ownerId ?? this.ownerId,
+      thumbnailAssetId: thumbnailAssetId ?? this.thumbnailAssetId,
+      isActivityEnabled: isActivityEnabled ?? this.isActivityEnabled,
+      order: order ?? this.order,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (id.present) {
+      map['id'] = Variable<String>(id.value);
+    }
+    if (name.present) {
+      map['name'] = Variable<String>(name.value);
+    }
+    if (description.present) {
+      map['description'] = Variable<String>(description.value);
+    }
+    if (createdAt.present) {
+      map['created_at'] = Variable<DateTime>(createdAt.value);
+    }
+    if (updatedAt.present) {
+      map['updated_at'] = Variable<DateTime>(updatedAt.value);
+    }
+    if (ownerId.present) {
+      map['owner_id'] = Variable<String>(ownerId.value);
+    }
+    if (thumbnailAssetId.present) {
+      map['thumbnail_asset_id'] = Variable<String>(thumbnailAssetId.value);
+    }
+    if (isActivityEnabled.present) {
+      map['is_activity_enabled'] = Variable<bool>(isActivityEnabled.value);
+    }
+    if (order.present) {
+      map['order'] = Variable<int>(order.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('RemoteAlbumEntityCompanion(')
+          ..write('id: $id, ')
+          ..write('name: $name, ')
+          ..write('description: $description, ')
+          ..write('createdAt: $createdAt, ')
+          ..write('updatedAt: $updatedAt, ')
+          ..write('ownerId: $ownerId, ')
+          ..write('thumbnailAssetId: $thumbnailAssetId, ')
+          ..write('isActivityEnabled: $isActivityEnabled, ')
+          ..write('order: $order')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class LocalAlbumEntity extends Table
+    with TableInfo<LocalAlbumEntity, LocalAlbumEntityData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  LocalAlbumEntity(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<String> id = GeneratedColumn<String>(
+    'id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+  );
+  late final GeneratedColumn<String> name = GeneratedColumn<String>(
+    'name',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+  );
+  late final GeneratedColumn<DateTime> updatedAt = GeneratedColumn<DateTime>(
+    'updated_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.dateTime,
+    requiredDuringInsert: false,
+    defaultValue: const CustomExpression('CURRENT_TIMESTAMP'),
+  );
+  late final GeneratedColumn<int> backupSelection = GeneratedColumn<int>(
+    'backup_selection',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+  );
+  late final GeneratedColumn<bool> isIosSharedAlbum = GeneratedColumn<bool>(
+    'is_ios_shared_album',
+    aliasedName,
+    false,
+    type: DriftSqlType.bool,
+    requiredDuringInsert: false,
+    defaultConstraints: GeneratedColumn.constraintIsAlways(
+      'CHECK ("is_ios_shared_album" IN (0, 1))',
+    ),
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<String> linkedRemoteAlbumId =
+      GeneratedColumn<String>(
+        'linked_remote_album_id',
+        aliasedName,
+        true,
+        type: DriftSqlType.string,
+        requiredDuringInsert: false,
+        defaultConstraints: GeneratedColumn.constraintIsAlways(
+          'REFERENCES remote_album_entity (id) ON DELETE SET NULL',
+        ),
+      );
+  late final GeneratedColumn<bool> marker_ = GeneratedColumn<bool>(
+    'marker',
+    aliasedName,
+    true,
+    type: DriftSqlType.bool,
+    requiredDuringInsert: false,
+    defaultConstraints: GeneratedColumn.constraintIsAlways(
+      'CHECK ("marker" IN (0, 1))',
+    ),
+  );
+  @override
+  List<GeneratedColumn> get $columns => [
+    id,
+    name,
+    updatedAt,
+    backupSelection,
+    isIosSharedAlbum,
+    linkedRemoteAlbumId,
+    marker_,
+  ];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'local_album_entity';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {id};
+  @override
+  LocalAlbumEntityData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return LocalAlbumEntityData(
+      id: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}id'],
+      )!,
+      name: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}name'],
+      )!,
+      updatedAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.dateTime,
+        data['${effectivePrefix}updated_at'],
+      )!,
+      backupSelection: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}backup_selection'],
+      )!,
+      isIosSharedAlbum: attachedDatabase.typeMapping.read(
+        DriftSqlType.bool,
+        data['${effectivePrefix}is_ios_shared_album'],
+      )!,
+      linkedRemoteAlbumId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}linked_remote_album_id'],
+      ),
+      marker_: attachedDatabase.typeMapping.read(
+        DriftSqlType.bool,
+        data['${effectivePrefix}marker'],
+      ),
+    );
+  }
+
+  @override
+  LocalAlbumEntity createAlias(String alias) {
+    return LocalAlbumEntity(attachedDatabase, alias);
+  }
+
+  @override
+  bool get withoutRowId => true;
+  @override
+  bool get isStrict => true;
+}
+
+class LocalAlbumEntityData extends DataClass
+    implements Insertable<LocalAlbumEntityData> {
+  final String id;
+  final String name;
+  final DateTime updatedAt;
+  final int backupSelection;
+  final bool isIosSharedAlbum;
+  final String? linkedRemoteAlbumId;
+  final bool? marker_;
+  const LocalAlbumEntityData({
+    required this.id,
+    required this.name,
+    required this.updatedAt,
+    required this.backupSelection,
+    required this.isIosSharedAlbum,
+    this.linkedRemoteAlbumId,
+    this.marker_,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['id'] = Variable<String>(id);
+    map['name'] = Variable<String>(name);
+    map['updated_at'] = Variable<DateTime>(updatedAt);
+    map['backup_selection'] = Variable<int>(backupSelection);
+    map['is_ios_shared_album'] = Variable<bool>(isIosSharedAlbum);
+    if (!nullToAbsent || linkedRemoteAlbumId != null) {
+      map['linked_remote_album_id'] = Variable<String>(linkedRemoteAlbumId);
+    }
+    if (!nullToAbsent || marker_ != null) {
+      map['marker'] = Variable<bool>(marker_);
+    }
+    return map;
+  }
+
+  factory LocalAlbumEntityData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return LocalAlbumEntityData(
+      id: serializer.fromJson<String>(json['id']),
+      name: serializer.fromJson<String>(json['name']),
+      updatedAt: serializer.fromJson<DateTime>(json['updatedAt']),
+      backupSelection: serializer.fromJson<int>(json['backupSelection']),
+      isIosSharedAlbum: serializer.fromJson<bool>(json['isIosSharedAlbum']),
+      linkedRemoteAlbumId: serializer.fromJson<String?>(
+        json['linkedRemoteAlbumId'],
+      ),
+      marker_: serializer.fromJson<bool?>(json['marker_']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'id': serializer.toJson<String>(id),
+      'name': serializer.toJson<String>(name),
+      'updatedAt': serializer.toJson<DateTime>(updatedAt),
+      'backupSelection': serializer.toJson<int>(backupSelection),
+      'isIosSharedAlbum': serializer.toJson<bool>(isIosSharedAlbum),
+      'linkedRemoteAlbumId': serializer.toJson<String?>(linkedRemoteAlbumId),
+      'marker_': serializer.toJson<bool?>(marker_),
+    };
+  }
+
+  LocalAlbumEntityData copyWith({
+    String? id,
+    String? name,
+    DateTime? updatedAt,
+    int? backupSelection,
+    bool? isIosSharedAlbum,
+    Value<String?> linkedRemoteAlbumId = const Value.absent(),
+    Value<bool?> marker_ = const Value.absent(),
+  }) => LocalAlbumEntityData(
+    id: id ?? this.id,
+    name: name ?? this.name,
+    updatedAt: updatedAt ?? this.updatedAt,
+    backupSelection: backupSelection ?? this.backupSelection,
+    isIosSharedAlbum: isIosSharedAlbum ?? this.isIosSharedAlbum,
+    linkedRemoteAlbumId: linkedRemoteAlbumId.present
+        ? linkedRemoteAlbumId.value
+        : this.linkedRemoteAlbumId,
+    marker_: marker_.present ? marker_.value : this.marker_,
+  );
+  LocalAlbumEntityData copyWithCompanion(LocalAlbumEntityCompanion data) {
+    return LocalAlbumEntityData(
+      id: data.id.present ? data.id.value : this.id,
+      name: data.name.present ? data.name.value : this.name,
+      updatedAt: data.updatedAt.present ? data.updatedAt.value : this.updatedAt,
+      backupSelection: data.backupSelection.present
+          ? data.backupSelection.value
+          : this.backupSelection,
+      isIosSharedAlbum: data.isIosSharedAlbum.present
+          ? data.isIosSharedAlbum.value
+          : this.isIosSharedAlbum,
+      linkedRemoteAlbumId: data.linkedRemoteAlbumId.present
+          ? data.linkedRemoteAlbumId.value
+          : this.linkedRemoteAlbumId,
+      marker_: data.marker_.present ? data.marker_.value : this.marker_,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('LocalAlbumEntityData(')
+          ..write('id: $id, ')
+          ..write('name: $name, ')
+          ..write('updatedAt: $updatedAt, ')
+          ..write('backupSelection: $backupSelection, ')
+          ..write('isIosSharedAlbum: $isIosSharedAlbum, ')
+          ..write('linkedRemoteAlbumId: $linkedRemoteAlbumId, ')
+          ..write('marker_: $marker_')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(
+    id,
+    name,
+    updatedAt,
+    backupSelection,
+    isIosSharedAlbum,
+    linkedRemoteAlbumId,
+    marker_,
+  );
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is LocalAlbumEntityData &&
+          other.id == this.id &&
+          other.name == this.name &&
+          other.updatedAt == this.updatedAt &&
+          other.backupSelection == this.backupSelection &&
+          other.isIosSharedAlbum == this.isIosSharedAlbum &&
+          other.linkedRemoteAlbumId == this.linkedRemoteAlbumId &&
+          other.marker_ == this.marker_);
+}
+
+class LocalAlbumEntityCompanion extends UpdateCompanion<LocalAlbumEntityData> {
+  final Value<String> id;
+  final Value<String> name;
+  final Value<DateTime> updatedAt;
+  final Value<int> backupSelection;
+  final Value<bool> isIosSharedAlbum;
+  final Value<String?> linkedRemoteAlbumId;
+  final Value<bool?> marker_;
+  const LocalAlbumEntityCompanion({
+    this.id = const Value.absent(),
+    this.name = const Value.absent(),
+    this.updatedAt = const Value.absent(),
+    this.backupSelection = const Value.absent(),
+    this.isIosSharedAlbum = const Value.absent(),
+    this.linkedRemoteAlbumId = const Value.absent(),
+    this.marker_ = const Value.absent(),
+  });
+  LocalAlbumEntityCompanion.insert({
+    required String id,
+    required String name,
+    this.updatedAt = const Value.absent(),
+    required int backupSelection,
+    this.isIosSharedAlbum = const Value.absent(),
+    this.linkedRemoteAlbumId = const Value.absent(),
+    this.marker_ = const Value.absent(),
+  }) : id = Value(id),
+       name = Value(name),
+       backupSelection = Value(backupSelection);
+  static Insertable<LocalAlbumEntityData> custom({
+    Expression<String>? id,
+    Expression<String>? name,
+    Expression<DateTime>? updatedAt,
+    Expression<int>? backupSelection,
+    Expression<bool>? isIosSharedAlbum,
+    Expression<String>? linkedRemoteAlbumId,
+    Expression<bool>? marker_,
+  }) {
+    return RawValuesInsertable({
+      if (id != null) 'id': id,
+      if (name != null) 'name': name,
+      if (updatedAt != null) 'updated_at': updatedAt,
+      if (backupSelection != null) 'backup_selection': backupSelection,
+      if (isIosSharedAlbum != null) 'is_ios_shared_album': isIosSharedAlbum,
+      if (linkedRemoteAlbumId != null)
+        'linked_remote_album_id': linkedRemoteAlbumId,
+      if (marker_ != null) 'marker': marker_,
+    });
+  }
+
+  LocalAlbumEntityCompanion copyWith({
+    Value<String>? id,
+    Value<String>? name,
+    Value<DateTime>? updatedAt,
+    Value<int>? backupSelection,
+    Value<bool>? isIosSharedAlbum,
+    Value<String?>? linkedRemoteAlbumId,
+    Value<bool?>? marker_,
+  }) {
+    return LocalAlbumEntityCompanion(
+      id: id ?? this.id,
+      name: name ?? this.name,
+      updatedAt: updatedAt ?? this.updatedAt,
+      backupSelection: backupSelection ?? this.backupSelection,
+      isIosSharedAlbum: isIosSharedAlbum ?? this.isIosSharedAlbum,
+      linkedRemoteAlbumId: linkedRemoteAlbumId ?? this.linkedRemoteAlbumId,
+      marker_: marker_ ?? this.marker_,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (id.present) {
+      map['id'] = Variable<String>(id.value);
+    }
+    if (name.present) {
+      map['name'] = Variable<String>(name.value);
+    }
+    if (updatedAt.present) {
+      map['updated_at'] = Variable<DateTime>(updatedAt.value);
+    }
+    if (backupSelection.present) {
+      map['backup_selection'] = Variable<int>(backupSelection.value);
+    }
+    if (isIosSharedAlbum.present) {
+      map['is_ios_shared_album'] = Variable<bool>(isIosSharedAlbum.value);
+    }
+    if (linkedRemoteAlbumId.present) {
+      map['linked_remote_album_id'] = Variable<String>(
+        linkedRemoteAlbumId.value,
+      );
+    }
+    if (marker_.present) {
+      map['marker'] = Variable<bool>(marker_.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('LocalAlbumEntityCompanion(')
+          ..write('id: $id, ')
+          ..write('name: $name, ')
+          ..write('updatedAt: $updatedAt, ')
+          ..write('backupSelection: $backupSelection, ')
+          ..write('isIosSharedAlbum: $isIosSharedAlbum, ')
+          ..write('linkedRemoteAlbumId: $linkedRemoteAlbumId, ')
+          ..write('marker_: $marker_')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class LocalAlbumAssetEntity extends Table
+    with TableInfo<LocalAlbumAssetEntity, LocalAlbumAssetEntityData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  LocalAlbumAssetEntity(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<String> assetId = GeneratedColumn<String>(
+    'asset_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    defaultConstraints: GeneratedColumn.constraintIsAlways(
+      'REFERENCES local_asset_entity (id) ON DELETE CASCADE',
+    ),
+  );
+  late final GeneratedColumn<String> albumId = GeneratedColumn<String>(
+    'album_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    defaultConstraints: GeneratedColumn.constraintIsAlways(
+      'REFERENCES local_album_entity (id) ON DELETE CASCADE',
+    ),
+  );
+  late final GeneratedColumn<bool> marker_ = GeneratedColumn<bool>(
+    'marker',
+    aliasedName,
+    true,
+    type: DriftSqlType.bool,
+    requiredDuringInsert: false,
+    defaultConstraints: GeneratedColumn.constraintIsAlways(
+      'CHECK ("marker" IN (0, 1))',
+    ),
+  );
+  @override
+  List<GeneratedColumn> get $columns => [assetId, albumId, marker_];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'local_album_asset_entity';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {assetId, albumId};
+  @override
+  LocalAlbumAssetEntityData map(
+    Map<String, dynamic> data, {
+    String? tablePrefix,
+  }) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return LocalAlbumAssetEntityData(
+      assetId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}asset_id'],
+      )!,
+      albumId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}album_id'],
+      )!,
+      marker_: attachedDatabase.typeMapping.read(
+        DriftSqlType.bool,
+        data['${effectivePrefix}marker'],
+      ),
+    );
+  }
+
+  @override
+  LocalAlbumAssetEntity createAlias(String alias) {
+    return LocalAlbumAssetEntity(attachedDatabase, alias);
+  }
+
+  @override
+  bool get withoutRowId => true;
+  @override
+  bool get isStrict => true;
+}
+
+class LocalAlbumAssetEntityData extends DataClass
+    implements Insertable<LocalAlbumAssetEntityData> {
+  final String assetId;
+  final String albumId;
+  final bool? marker_;
+  const LocalAlbumAssetEntityData({
+    required this.assetId,
+    required this.albumId,
+    this.marker_,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['asset_id'] = Variable<String>(assetId);
+    map['album_id'] = Variable<String>(albumId);
+    if (!nullToAbsent || marker_ != null) {
+      map['marker'] = Variable<bool>(marker_);
+    }
+    return map;
+  }
+
+  factory LocalAlbumAssetEntityData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return LocalAlbumAssetEntityData(
+      assetId: serializer.fromJson<String>(json['assetId']),
+      albumId: serializer.fromJson<String>(json['albumId']),
+      marker_: serializer.fromJson<bool?>(json['marker_']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'assetId': serializer.toJson<String>(assetId),
+      'albumId': serializer.toJson<String>(albumId),
+      'marker_': serializer.toJson<bool?>(marker_),
+    };
+  }
+
+  LocalAlbumAssetEntityData copyWith({
+    String? assetId,
+    String? albumId,
+    Value<bool?> marker_ = const Value.absent(),
+  }) => LocalAlbumAssetEntityData(
+    assetId: assetId ?? this.assetId,
+    albumId: albumId ?? this.albumId,
+    marker_: marker_.present ? marker_.value : this.marker_,
+  );
+  LocalAlbumAssetEntityData copyWithCompanion(
+    LocalAlbumAssetEntityCompanion data,
+  ) {
+    return LocalAlbumAssetEntityData(
+      assetId: data.assetId.present ? data.assetId.value : this.assetId,
+      albumId: data.albumId.present ? data.albumId.value : this.albumId,
+      marker_: data.marker_.present ? data.marker_.value : this.marker_,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('LocalAlbumAssetEntityData(')
+          ..write('assetId: $assetId, ')
+          ..write('albumId: $albumId, ')
+          ..write('marker_: $marker_')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(assetId, albumId, marker_);
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is LocalAlbumAssetEntityData &&
+          other.assetId == this.assetId &&
+          other.albumId == this.albumId &&
+          other.marker_ == this.marker_);
+}
+
+class LocalAlbumAssetEntityCompanion
+    extends UpdateCompanion<LocalAlbumAssetEntityData> {
+  final Value<String> assetId;
+  final Value<String> albumId;
+  final Value<bool?> marker_;
+  const LocalAlbumAssetEntityCompanion({
+    this.assetId = const Value.absent(),
+    this.albumId = const Value.absent(),
+    this.marker_ = const Value.absent(),
+  });
+  LocalAlbumAssetEntityCompanion.insert({
+    required String assetId,
+    required String albumId,
+    this.marker_ = const Value.absent(),
+  }) : assetId = Value(assetId),
+       albumId = Value(albumId);
+  static Insertable<LocalAlbumAssetEntityData> custom({
+    Expression<String>? assetId,
+    Expression<String>? albumId,
+    Expression<bool>? marker_,
+  }) {
+    return RawValuesInsertable({
+      if (assetId != null) 'asset_id': assetId,
+      if (albumId != null) 'album_id': albumId,
+      if (marker_ != null) 'marker': marker_,
+    });
+  }
+
+  LocalAlbumAssetEntityCompanion copyWith({
+    Value<String>? assetId,
+    Value<String>? albumId,
+    Value<bool?>? marker_,
+  }) {
+    return LocalAlbumAssetEntityCompanion(
+      assetId: assetId ?? this.assetId,
+      albumId: albumId ?? this.albumId,
+      marker_: marker_ ?? this.marker_,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (assetId.present) {
+      map['asset_id'] = Variable<String>(assetId.value);
+    }
+    if (albumId.present) {
+      map['album_id'] = Variable<String>(albumId.value);
+    }
+    if (marker_.present) {
+      map['marker'] = Variable<bool>(marker_.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('LocalAlbumAssetEntityCompanion(')
+          ..write('assetId: $assetId, ')
+          ..write('albumId: $albumId, ')
+          ..write('marker_: $marker_')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class AuthUserEntity extends Table
+    with TableInfo<AuthUserEntity, AuthUserEntityData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  AuthUserEntity(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<String> id = GeneratedColumn<String>(
+    'id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+  );
+  late final GeneratedColumn<String> name = GeneratedColumn<String>(
+    'name',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+  );
+  late final GeneratedColumn<String> email = GeneratedColumn<String>(
+    'email',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+  );
+  late final GeneratedColumn<bool> isAdmin = GeneratedColumn<bool>(
+    'is_admin',
+    aliasedName,
+    false,
+    type: DriftSqlType.bool,
+    requiredDuringInsert: false,
+    defaultConstraints: GeneratedColumn.constraintIsAlways(
+      'CHECK ("is_admin" IN (0, 1))',
+    ),
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<bool> hasProfileImage = GeneratedColumn<bool>(
+    'has_profile_image',
+    aliasedName,
+    false,
+    type: DriftSqlType.bool,
+    requiredDuringInsert: false,
+    defaultConstraints: GeneratedColumn.constraintIsAlways(
+      'CHECK ("has_profile_image" IN (0, 1))',
+    ),
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<DateTime> profileChangedAt =
+      GeneratedColumn<DateTime>(
+        'profile_changed_at',
+        aliasedName,
+        false,
+        type: DriftSqlType.dateTime,
+        requiredDuringInsert: false,
+        defaultValue: const CustomExpression('CURRENT_TIMESTAMP'),
+      );
+  late final GeneratedColumn<int> avatarColor = GeneratedColumn<int>(
+    'avatar_color',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+  );
+  late final GeneratedColumn<int> quotaSizeInBytes = GeneratedColumn<int>(
+    'quota_size_in_bytes',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> quotaUsageInBytes = GeneratedColumn<int>(
+    'quota_usage_in_bytes',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<String> pinCode = GeneratedColumn<String>(
+    'pin_code',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+  );
+  @override
+  List<GeneratedColumn> get $columns => [
+    id,
+    name,
+    email,
+    isAdmin,
+    hasProfileImage,
+    profileChangedAt,
+    avatarColor,
+    quotaSizeInBytes,
+    quotaUsageInBytes,
+    pinCode,
+  ];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'auth_user_entity';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {id};
+  @override
+  AuthUserEntityData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return AuthUserEntityData(
+      id: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}id'],
+      )!,
+      name: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}name'],
+      )!,
+      email: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}email'],
+      )!,
+      isAdmin: attachedDatabase.typeMapping.read(
+        DriftSqlType.bool,
+        data['${effectivePrefix}is_admin'],
+      )!,
+      hasProfileImage: attachedDatabase.typeMapping.read(
+        DriftSqlType.bool,
+        data['${effectivePrefix}has_profile_image'],
+      )!,
+      profileChangedAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.dateTime,
+        data['${effectivePrefix}profile_changed_at'],
+      )!,
+      avatarColor: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}avatar_color'],
+      )!,
+      quotaSizeInBytes: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}quota_size_in_bytes'],
+      )!,
+      quotaUsageInBytes: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}quota_usage_in_bytes'],
+      )!,
+      pinCode: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}pin_code'],
+      ),
+    );
+  }
+
+  @override
+  AuthUserEntity createAlias(String alias) {
+    return AuthUserEntity(attachedDatabase, alias);
+  }
+
+  @override
+  bool get withoutRowId => true;
+  @override
+  bool get isStrict => true;
+}
+
+class AuthUserEntityData extends DataClass
+    implements Insertable<AuthUserEntityData> {
+  final String id;
+  final String name;
+  final String email;
+  final bool isAdmin;
+  final bool hasProfileImage;
+  final DateTime profileChangedAt;
+  final int avatarColor;
+  final int quotaSizeInBytes;
+  final int quotaUsageInBytes;
+  final String? pinCode;
+  const AuthUserEntityData({
+    required this.id,
+    required this.name,
+    required this.email,
+    required this.isAdmin,
+    required this.hasProfileImage,
+    required this.profileChangedAt,
+    required this.avatarColor,
+    required this.quotaSizeInBytes,
+    required this.quotaUsageInBytes,
+    this.pinCode,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['id'] = Variable<String>(id);
+    map['name'] = Variable<String>(name);
+    map['email'] = Variable<String>(email);
+    map['is_admin'] = Variable<bool>(isAdmin);
+    map['has_profile_image'] = Variable<bool>(hasProfileImage);
+    map['profile_changed_at'] = Variable<DateTime>(profileChangedAt);
+    map['avatar_color'] = Variable<int>(avatarColor);
+    map['quota_size_in_bytes'] = Variable<int>(quotaSizeInBytes);
+    map['quota_usage_in_bytes'] = Variable<int>(quotaUsageInBytes);
+    if (!nullToAbsent || pinCode != null) {
+      map['pin_code'] = Variable<String>(pinCode);
+    }
+    return map;
+  }
+
+  factory AuthUserEntityData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return AuthUserEntityData(
+      id: serializer.fromJson<String>(json['id']),
+      name: serializer.fromJson<String>(json['name']),
+      email: serializer.fromJson<String>(json['email']),
+      isAdmin: serializer.fromJson<bool>(json['isAdmin']),
+      hasProfileImage: serializer.fromJson<bool>(json['hasProfileImage']),
+      profileChangedAt: serializer.fromJson<DateTime>(json['profileChangedAt']),
+      avatarColor: serializer.fromJson<int>(json['avatarColor']),
+      quotaSizeInBytes: serializer.fromJson<int>(json['quotaSizeInBytes']),
+      quotaUsageInBytes: serializer.fromJson<int>(json['quotaUsageInBytes']),
+      pinCode: serializer.fromJson<String?>(json['pinCode']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'id': serializer.toJson<String>(id),
+      'name': serializer.toJson<String>(name),
+      'email': serializer.toJson<String>(email),
+      'isAdmin': serializer.toJson<bool>(isAdmin),
+      'hasProfileImage': serializer.toJson<bool>(hasProfileImage),
+      'profileChangedAt': serializer.toJson<DateTime>(profileChangedAt),
+      'avatarColor': serializer.toJson<int>(avatarColor),
+      'quotaSizeInBytes': serializer.toJson<int>(quotaSizeInBytes),
+      'quotaUsageInBytes': serializer.toJson<int>(quotaUsageInBytes),
+      'pinCode': serializer.toJson<String?>(pinCode),
+    };
+  }
+
+  AuthUserEntityData copyWith({
+    String? id,
+    String? name,
+    String? email,
+    bool? isAdmin,
+    bool? hasProfileImage,
+    DateTime? profileChangedAt,
+    int? avatarColor,
+    int? quotaSizeInBytes,
+    int? quotaUsageInBytes,
+    Value<String?> pinCode = const Value.absent(),
+  }) => AuthUserEntityData(
+    id: id ?? this.id,
+    name: name ?? this.name,
+    email: email ?? this.email,
+    isAdmin: isAdmin ?? this.isAdmin,
+    hasProfileImage: hasProfileImage ?? this.hasProfileImage,
+    profileChangedAt: profileChangedAt ?? this.profileChangedAt,
+    avatarColor: avatarColor ?? this.avatarColor,
+    quotaSizeInBytes: quotaSizeInBytes ?? this.quotaSizeInBytes,
+    quotaUsageInBytes: quotaUsageInBytes ?? this.quotaUsageInBytes,
+    pinCode: pinCode.present ? pinCode.value : this.pinCode,
+  );
+  AuthUserEntityData copyWithCompanion(AuthUserEntityCompanion data) {
+    return AuthUserEntityData(
+      id: data.id.present ? data.id.value : this.id,
+      name: data.name.present ? data.name.value : this.name,
+      email: data.email.present ? data.email.value : this.email,
+      isAdmin: data.isAdmin.present ? data.isAdmin.value : this.isAdmin,
+      hasProfileImage: data.hasProfileImage.present
+          ? data.hasProfileImage.value
+          : this.hasProfileImage,
+      profileChangedAt: data.profileChangedAt.present
+          ? data.profileChangedAt.value
+          : this.profileChangedAt,
+      avatarColor: data.avatarColor.present
+          ? data.avatarColor.value
+          : this.avatarColor,
+      quotaSizeInBytes: data.quotaSizeInBytes.present
+          ? data.quotaSizeInBytes.value
+          : this.quotaSizeInBytes,
+      quotaUsageInBytes: data.quotaUsageInBytes.present
+          ? data.quotaUsageInBytes.value
+          : this.quotaUsageInBytes,
+      pinCode: data.pinCode.present ? data.pinCode.value : this.pinCode,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('AuthUserEntityData(')
+          ..write('id: $id, ')
+          ..write('name: $name, ')
+          ..write('email: $email, ')
+          ..write('isAdmin: $isAdmin, ')
+          ..write('hasProfileImage: $hasProfileImage, ')
+          ..write('profileChangedAt: $profileChangedAt, ')
+          ..write('avatarColor: $avatarColor, ')
+          ..write('quotaSizeInBytes: $quotaSizeInBytes, ')
+          ..write('quotaUsageInBytes: $quotaUsageInBytes, ')
+          ..write('pinCode: $pinCode')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(
+    id,
+    name,
+    email,
+    isAdmin,
+    hasProfileImage,
+    profileChangedAt,
+    avatarColor,
+    quotaSizeInBytes,
+    quotaUsageInBytes,
+    pinCode,
+  );
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is AuthUserEntityData &&
+          other.id == this.id &&
+          other.name == this.name &&
+          other.email == this.email &&
+          other.isAdmin == this.isAdmin &&
+          other.hasProfileImage == this.hasProfileImage &&
+          other.profileChangedAt == this.profileChangedAt &&
+          other.avatarColor == this.avatarColor &&
+          other.quotaSizeInBytes == this.quotaSizeInBytes &&
+          other.quotaUsageInBytes == this.quotaUsageInBytes &&
+          other.pinCode == this.pinCode);
+}
+
+class AuthUserEntityCompanion extends UpdateCompanion<AuthUserEntityData> {
+  final Value<String> id;
+  final Value<String> name;
+  final Value<String> email;
+  final Value<bool> isAdmin;
+  final Value<bool> hasProfileImage;
+  final Value<DateTime> profileChangedAt;
+  final Value<int> avatarColor;
+  final Value<int> quotaSizeInBytes;
+  final Value<int> quotaUsageInBytes;
+  final Value<String?> pinCode;
+  const AuthUserEntityCompanion({
+    this.id = const Value.absent(),
+    this.name = const Value.absent(),
+    this.email = const Value.absent(),
+    this.isAdmin = const Value.absent(),
+    this.hasProfileImage = const Value.absent(),
+    this.profileChangedAt = const Value.absent(),
+    this.avatarColor = const Value.absent(),
+    this.quotaSizeInBytes = const Value.absent(),
+    this.quotaUsageInBytes = const Value.absent(),
+    this.pinCode = const Value.absent(),
+  });
+  AuthUserEntityCompanion.insert({
+    required String id,
+    required String name,
+    required String email,
+    this.isAdmin = const Value.absent(),
+    this.hasProfileImage = const Value.absent(),
+    this.profileChangedAt = const Value.absent(),
+    required int avatarColor,
+    this.quotaSizeInBytes = const Value.absent(),
+    this.quotaUsageInBytes = const Value.absent(),
+    this.pinCode = const Value.absent(),
+  }) : id = Value(id),
+       name = Value(name),
+       email = Value(email),
+       avatarColor = Value(avatarColor);
+  static Insertable<AuthUserEntityData> custom({
+    Expression<String>? id,
+    Expression<String>? name,
+    Expression<String>? email,
+    Expression<bool>? isAdmin,
+    Expression<bool>? hasProfileImage,
+    Expression<DateTime>? profileChangedAt,
+    Expression<int>? avatarColor,
+    Expression<int>? quotaSizeInBytes,
+    Expression<int>? quotaUsageInBytes,
+    Expression<String>? pinCode,
+  }) {
+    return RawValuesInsertable({
+      if (id != null) 'id': id,
+      if (name != null) 'name': name,
+      if (email != null) 'email': email,
+      if (isAdmin != null) 'is_admin': isAdmin,
+      if (hasProfileImage != null) 'has_profile_image': hasProfileImage,
+      if (profileChangedAt != null) 'profile_changed_at': profileChangedAt,
+      if (avatarColor != null) 'avatar_color': avatarColor,
+      if (quotaSizeInBytes != null) 'quota_size_in_bytes': quotaSizeInBytes,
+      if (quotaUsageInBytes != null) 'quota_usage_in_bytes': quotaUsageInBytes,
+      if (pinCode != null) 'pin_code': pinCode,
+    });
+  }
+
+  AuthUserEntityCompanion copyWith({
+    Value<String>? id,
+    Value<String>? name,
+    Value<String>? email,
+    Value<bool>? isAdmin,
+    Value<bool>? hasProfileImage,
+    Value<DateTime>? profileChangedAt,
+    Value<int>? avatarColor,
+    Value<int>? quotaSizeInBytes,
+    Value<int>? quotaUsageInBytes,
+    Value<String?>? pinCode,
+  }) {
+    return AuthUserEntityCompanion(
+      id: id ?? this.id,
+      name: name ?? this.name,
+      email: email ?? this.email,
+      isAdmin: isAdmin ?? this.isAdmin,
+      hasProfileImage: hasProfileImage ?? this.hasProfileImage,
+      profileChangedAt: profileChangedAt ?? this.profileChangedAt,
+      avatarColor: avatarColor ?? this.avatarColor,
+      quotaSizeInBytes: quotaSizeInBytes ?? this.quotaSizeInBytes,
+      quotaUsageInBytes: quotaUsageInBytes ?? this.quotaUsageInBytes,
+      pinCode: pinCode ?? this.pinCode,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (id.present) {
+      map['id'] = Variable<String>(id.value);
+    }
+    if (name.present) {
+      map['name'] = Variable<String>(name.value);
+    }
+    if (email.present) {
+      map['email'] = Variable<String>(email.value);
+    }
+    if (isAdmin.present) {
+      map['is_admin'] = Variable<bool>(isAdmin.value);
+    }
+    if (hasProfileImage.present) {
+      map['has_profile_image'] = Variable<bool>(hasProfileImage.value);
+    }
+    if (profileChangedAt.present) {
+      map['profile_changed_at'] = Variable<DateTime>(profileChangedAt.value);
+    }
+    if (avatarColor.present) {
+      map['avatar_color'] = Variable<int>(avatarColor.value);
+    }
+    if (quotaSizeInBytes.present) {
+      map['quota_size_in_bytes'] = Variable<int>(quotaSizeInBytes.value);
+    }
+    if (quotaUsageInBytes.present) {
+      map['quota_usage_in_bytes'] = Variable<int>(quotaUsageInBytes.value);
+    }
+    if (pinCode.present) {
+      map['pin_code'] = Variable<String>(pinCode.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('AuthUserEntityCompanion(')
+          ..write('id: $id, ')
+          ..write('name: $name, ')
+          ..write('email: $email, ')
+          ..write('isAdmin: $isAdmin, ')
+          ..write('hasProfileImage: $hasProfileImage, ')
+          ..write('profileChangedAt: $profileChangedAt, ')
+          ..write('avatarColor: $avatarColor, ')
+          ..write('quotaSizeInBytes: $quotaSizeInBytes, ')
+          ..write('quotaUsageInBytes: $quotaUsageInBytes, ')
+          ..write('pinCode: $pinCode')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class UserMetadataEntity extends Table
+    with TableInfo<UserMetadataEntity, UserMetadataEntityData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  UserMetadataEntity(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<String> userId = GeneratedColumn<String>(
+    'user_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    defaultConstraints: GeneratedColumn.constraintIsAlways(
+      'REFERENCES user_entity (id) ON DELETE CASCADE',
+    ),
+  );
+  late final GeneratedColumn<int> key = GeneratedColumn<int>(
+    'key',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+  );
+  late final GeneratedColumn<Uint8List> value = GeneratedColumn<Uint8List>(
+    'value',
+    aliasedName,
+    false,
+    type: DriftSqlType.blob,
+    requiredDuringInsert: true,
+  );
+  @override
+  List<GeneratedColumn> get $columns => [userId, key, value];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'user_metadata_entity';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {userId, key};
+  @override
+  UserMetadataEntityData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return UserMetadataEntityData(
+      userId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}user_id'],
+      )!,
+      key: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}key'],
+      )!,
+      value: attachedDatabase.typeMapping.read(
+        DriftSqlType.blob,
+        data['${effectivePrefix}value'],
+      )!,
+    );
+  }
+
+  @override
+  UserMetadataEntity createAlias(String alias) {
+    return UserMetadataEntity(attachedDatabase, alias);
+  }
+
+  @override
+  bool get withoutRowId => true;
+  @override
+  bool get isStrict => true;
+}
+
+class UserMetadataEntityData extends DataClass
+    implements Insertable<UserMetadataEntityData> {
+  final String userId;
+  final int key;
+  final Uint8List value;
+  const UserMetadataEntityData({
+    required this.userId,
+    required this.key,
+    required this.value,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['user_id'] = Variable<String>(userId);
+    map['key'] = Variable<int>(key);
+    map['value'] = Variable<Uint8List>(value);
+    return map;
+  }
+
+  factory UserMetadataEntityData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return UserMetadataEntityData(
+      userId: serializer.fromJson<String>(json['userId']),
+      key: serializer.fromJson<int>(json['key']),
+      value: serializer.fromJson<Uint8List>(json['value']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'userId': serializer.toJson<String>(userId),
+      'key': serializer.toJson<int>(key),
+      'value': serializer.toJson<Uint8List>(value),
+    };
+  }
+
+  UserMetadataEntityData copyWith({
+    String? userId,
+    int? key,
+    Uint8List? value,
+  }) => UserMetadataEntityData(
+    userId: userId ?? this.userId,
+    key: key ?? this.key,
+    value: value ?? this.value,
+  );
+  UserMetadataEntityData copyWithCompanion(UserMetadataEntityCompanion data) {
+    return UserMetadataEntityData(
+      userId: data.userId.present ? data.userId.value : this.userId,
+      key: data.key.present ? data.key.value : this.key,
+      value: data.value.present ? data.value.value : this.value,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('UserMetadataEntityData(')
+          ..write('userId: $userId, ')
+          ..write('key: $key, ')
+          ..write('value: $value')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(userId, key, $driftBlobEquality.hash(value));
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is UserMetadataEntityData &&
+          other.userId == this.userId &&
+          other.key == this.key &&
+          $driftBlobEquality.equals(other.value, this.value));
+}
+
+class UserMetadataEntityCompanion
+    extends UpdateCompanion<UserMetadataEntityData> {
+  final Value<String> userId;
+  final Value<int> key;
+  final Value<Uint8List> value;
+  const UserMetadataEntityCompanion({
+    this.userId = const Value.absent(),
+    this.key = const Value.absent(),
+    this.value = const Value.absent(),
+  });
+  UserMetadataEntityCompanion.insert({
+    required String userId,
+    required int key,
+    required Uint8List value,
+  }) : userId = Value(userId),
+       key = Value(key),
+       value = Value(value);
+  static Insertable<UserMetadataEntityData> custom({
+    Expression<String>? userId,
+    Expression<int>? key,
+    Expression<Uint8List>? value,
+  }) {
+    return RawValuesInsertable({
+      if (userId != null) 'user_id': userId,
+      if (key != null) 'key': key,
+      if (value != null) 'value': value,
+    });
+  }
+
+  UserMetadataEntityCompanion copyWith({
+    Value<String>? userId,
+    Value<int>? key,
+    Value<Uint8List>? value,
+  }) {
+    return UserMetadataEntityCompanion(
+      userId: userId ?? this.userId,
+      key: key ?? this.key,
+      value: value ?? this.value,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (userId.present) {
+      map['user_id'] = Variable<String>(userId.value);
+    }
+    if (key.present) {
+      map['key'] = Variable<int>(key.value);
+    }
+    if (value.present) {
+      map['value'] = Variable<Uint8List>(value.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('UserMetadataEntityCompanion(')
+          ..write('userId: $userId, ')
+          ..write('key: $key, ')
+          ..write('value: $value')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class PartnerEntity extends Table
+    with TableInfo<PartnerEntity, PartnerEntityData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  PartnerEntity(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<String> sharedById = GeneratedColumn<String>(
+    'shared_by_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    defaultConstraints: GeneratedColumn.constraintIsAlways(
+      'REFERENCES user_entity (id) ON DELETE CASCADE',
+    ),
+  );
+  late final GeneratedColumn<String> sharedWithId = GeneratedColumn<String>(
+    'shared_with_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    defaultConstraints: GeneratedColumn.constraintIsAlways(
+      'REFERENCES user_entity (id) ON DELETE CASCADE',
+    ),
+  );
+  late final GeneratedColumn<bool> inTimeline = GeneratedColumn<bool>(
+    'in_timeline',
+    aliasedName,
+    false,
+    type: DriftSqlType.bool,
+    requiredDuringInsert: false,
+    defaultConstraints: GeneratedColumn.constraintIsAlways(
+      'CHECK ("in_timeline" IN (0, 1))',
+    ),
+    defaultValue: const CustomExpression('0'),
+  );
+  @override
+  List<GeneratedColumn> get $columns => [sharedById, sharedWithId, inTimeline];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'partner_entity';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {sharedById, sharedWithId};
+  @override
+  PartnerEntityData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return PartnerEntityData(
+      sharedById: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}shared_by_id'],
+      )!,
+      sharedWithId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}shared_with_id'],
+      )!,
+      inTimeline: attachedDatabase.typeMapping.read(
+        DriftSqlType.bool,
+        data['${effectivePrefix}in_timeline'],
+      )!,
+    );
+  }
+
+  @override
+  PartnerEntity createAlias(String alias) {
+    return PartnerEntity(attachedDatabase, alias);
+  }
+
+  @override
+  bool get withoutRowId => true;
+  @override
+  bool get isStrict => true;
+}
+
+class PartnerEntityData extends DataClass
+    implements Insertable<PartnerEntityData> {
+  final String sharedById;
+  final String sharedWithId;
+  final bool inTimeline;
+  const PartnerEntityData({
+    required this.sharedById,
+    required this.sharedWithId,
+    required this.inTimeline,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['shared_by_id'] = Variable<String>(sharedById);
+    map['shared_with_id'] = Variable<String>(sharedWithId);
+    map['in_timeline'] = Variable<bool>(inTimeline);
+    return map;
+  }
+
+  factory PartnerEntityData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return PartnerEntityData(
+      sharedById: serializer.fromJson<String>(json['sharedById']),
+      sharedWithId: serializer.fromJson<String>(json['sharedWithId']),
+      inTimeline: serializer.fromJson<bool>(json['inTimeline']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'sharedById': serializer.toJson<String>(sharedById),
+      'sharedWithId': serializer.toJson<String>(sharedWithId),
+      'inTimeline': serializer.toJson<bool>(inTimeline),
+    };
+  }
+
+  PartnerEntityData copyWith({
+    String? sharedById,
+    String? sharedWithId,
+    bool? inTimeline,
+  }) => PartnerEntityData(
+    sharedById: sharedById ?? this.sharedById,
+    sharedWithId: sharedWithId ?? this.sharedWithId,
+    inTimeline: inTimeline ?? this.inTimeline,
+  );
+  PartnerEntityData copyWithCompanion(PartnerEntityCompanion data) {
+    return PartnerEntityData(
+      sharedById: data.sharedById.present
+          ? data.sharedById.value
+          : this.sharedById,
+      sharedWithId: data.sharedWithId.present
+          ? data.sharedWithId.value
+          : this.sharedWithId,
+      inTimeline: data.inTimeline.present
+          ? data.inTimeline.value
+          : this.inTimeline,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('PartnerEntityData(')
+          ..write('sharedById: $sharedById, ')
+          ..write('sharedWithId: $sharedWithId, ')
+          ..write('inTimeline: $inTimeline')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(sharedById, sharedWithId, inTimeline);
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is PartnerEntityData &&
+          other.sharedById == this.sharedById &&
+          other.sharedWithId == this.sharedWithId &&
+          other.inTimeline == this.inTimeline);
+}
+
+class PartnerEntityCompanion extends UpdateCompanion<PartnerEntityData> {
+  final Value<String> sharedById;
+  final Value<String> sharedWithId;
+  final Value<bool> inTimeline;
+  const PartnerEntityCompanion({
+    this.sharedById = const Value.absent(),
+    this.sharedWithId = const Value.absent(),
+    this.inTimeline = const Value.absent(),
+  });
+  PartnerEntityCompanion.insert({
+    required String sharedById,
+    required String sharedWithId,
+    this.inTimeline = const Value.absent(),
+  }) : sharedById = Value(sharedById),
+       sharedWithId = Value(sharedWithId);
+  static Insertable<PartnerEntityData> custom({
+    Expression<String>? sharedById,
+    Expression<String>? sharedWithId,
+    Expression<bool>? inTimeline,
+  }) {
+    return RawValuesInsertable({
+      if (sharedById != null) 'shared_by_id': sharedById,
+      if (sharedWithId != null) 'shared_with_id': sharedWithId,
+      if (inTimeline != null) 'in_timeline': inTimeline,
+    });
+  }
+
+  PartnerEntityCompanion copyWith({
+    Value<String>? sharedById,
+    Value<String>? sharedWithId,
+    Value<bool>? inTimeline,
+  }) {
+    return PartnerEntityCompanion(
+      sharedById: sharedById ?? this.sharedById,
+      sharedWithId: sharedWithId ?? this.sharedWithId,
+      inTimeline: inTimeline ?? this.inTimeline,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (sharedById.present) {
+      map['shared_by_id'] = Variable<String>(sharedById.value);
+    }
+    if (sharedWithId.present) {
+      map['shared_with_id'] = Variable<String>(sharedWithId.value);
+    }
+    if (inTimeline.present) {
+      map['in_timeline'] = Variable<bool>(inTimeline.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('PartnerEntityCompanion(')
+          ..write('sharedById: $sharedById, ')
+          ..write('sharedWithId: $sharedWithId, ')
+          ..write('inTimeline: $inTimeline')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class RemoteExifEntity extends Table
+    with TableInfo<RemoteExifEntity, RemoteExifEntityData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  RemoteExifEntity(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<String> assetId = GeneratedColumn<String>(
+    'asset_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    defaultConstraints: GeneratedColumn.constraintIsAlways(
+      'REFERENCES remote_asset_entity (id) ON DELETE CASCADE',
+    ),
+  );
+  late final GeneratedColumn<String> city = GeneratedColumn<String>(
+    'city',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+  );
+  late final GeneratedColumn<String> state = GeneratedColumn<String>(
+    'state',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+  );
+  late final GeneratedColumn<String> country = GeneratedColumn<String>(
+    'country',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+  );
+  late final GeneratedColumn<DateTime> dateTimeOriginal =
+      GeneratedColumn<DateTime>(
+        'date_time_original',
+        aliasedName,
+        true,
+        type: DriftSqlType.dateTime,
+        requiredDuringInsert: false,
+      );
+  late final GeneratedColumn<String> description = GeneratedColumn<String>(
+    'description',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+  );
+  late final GeneratedColumn<int> height = GeneratedColumn<int>(
+    'height',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+  );
+  late final GeneratedColumn<int> width = GeneratedColumn<int>(
+    'width',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+  );
+  late final GeneratedColumn<String> exposureTime = GeneratedColumn<String>(
+    'exposure_time',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+  );
+  late final GeneratedColumn<double> fNumber = GeneratedColumn<double>(
+    'f_number',
+    aliasedName,
+    true,
+    type: DriftSqlType.double,
+    requiredDuringInsert: false,
+  );
+  late final GeneratedColumn<int> fileSize = GeneratedColumn<int>(
+    'file_size',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+  );
+  late final GeneratedColumn<double> focalLength = GeneratedColumn<double>(
+    'focal_length',
+    aliasedName,
+    true,
+    type: DriftSqlType.double,
+    requiredDuringInsert: false,
+  );
+  late final GeneratedColumn<double> latitude = GeneratedColumn<double>(
+    'latitude',
+    aliasedName,
+    true,
+    type: DriftSqlType.double,
+    requiredDuringInsert: false,
+  );
+  late final GeneratedColumn<double> longitude = GeneratedColumn<double>(
+    'longitude',
+    aliasedName,
+    true,
+    type: DriftSqlType.double,
+    requiredDuringInsert: false,
+  );
+  late final GeneratedColumn<int> iso = GeneratedColumn<int>(
+    'iso',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+  );
+  late final GeneratedColumn<String> make = GeneratedColumn<String>(
+    'make',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+  );
+  late final GeneratedColumn<String> model = GeneratedColumn<String>(
+    'model',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+  );
+  late final GeneratedColumn<String> lens = GeneratedColumn<String>(
+    'lens',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+  );
+  late final GeneratedColumn<String> orientation = GeneratedColumn<String>(
+    'orientation',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+  );
+  late final GeneratedColumn<String> timeZone = GeneratedColumn<String>(
+    'time_zone',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+  );
+  late final GeneratedColumn<int> rating = GeneratedColumn<int>(
+    'rating',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+  );
+  late final GeneratedColumn<String> projectionType = GeneratedColumn<String>(
+    'projection_type',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+  );
+  @override
+  List<GeneratedColumn> get $columns => [
+    assetId,
+    city,
+    state,
+    country,
+    dateTimeOriginal,
+    description,
+    height,
+    width,
+    exposureTime,
+    fNumber,
+    fileSize,
+    focalLength,
+    latitude,
+    longitude,
+    iso,
+    make,
+    model,
+    lens,
+    orientation,
+    timeZone,
+    rating,
+    projectionType,
+  ];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'remote_exif_entity';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {assetId};
+  @override
+  RemoteExifEntityData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return RemoteExifEntityData(
+      assetId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}asset_id'],
+      )!,
+      city: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}city'],
+      ),
+      state: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}state'],
+      ),
+      country: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}country'],
+      ),
+      dateTimeOriginal: attachedDatabase.typeMapping.read(
+        DriftSqlType.dateTime,
+        data['${effectivePrefix}date_time_original'],
+      ),
+      description: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}description'],
+      ),
+      height: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}height'],
+      ),
+      width: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}width'],
+      ),
+      exposureTime: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}exposure_time'],
+      ),
+      fNumber: attachedDatabase.typeMapping.read(
+        DriftSqlType.double,
+        data['${effectivePrefix}f_number'],
+      ),
+      fileSize: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}file_size'],
+      ),
+      focalLength: attachedDatabase.typeMapping.read(
+        DriftSqlType.double,
+        data['${effectivePrefix}focal_length'],
+      ),
+      latitude: attachedDatabase.typeMapping.read(
+        DriftSqlType.double,
+        data['${effectivePrefix}latitude'],
+      ),
+      longitude: attachedDatabase.typeMapping.read(
+        DriftSqlType.double,
+        data['${effectivePrefix}longitude'],
+      ),
+      iso: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}iso'],
+      ),
+      make: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}make'],
+      ),
+      model: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}model'],
+      ),
+      lens: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}lens'],
+      ),
+      orientation: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}orientation'],
+      ),
+      timeZone: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}time_zone'],
+      ),
+      rating: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}rating'],
+      ),
+      projectionType: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}projection_type'],
+      ),
+    );
+  }
+
+  @override
+  RemoteExifEntity createAlias(String alias) {
+    return RemoteExifEntity(attachedDatabase, alias);
+  }
+
+  @override
+  bool get withoutRowId => true;
+  @override
+  bool get isStrict => true;
+}
+
+class RemoteExifEntityData extends DataClass
+    implements Insertable<RemoteExifEntityData> {
+  final String assetId;
+  final String? city;
+  final String? state;
+  final String? country;
+  final DateTime? dateTimeOriginal;
+  final String? description;
+  final int? height;
+  final int? width;
+  final String? exposureTime;
+  final double? fNumber;
+  final int? fileSize;
+  final double? focalLength;
+  final double? latitude;
+  final double? longitude;
+  final int? iso;
+  final String? make;
+  final String? model;
+  final String? lens;
+  final String? orientation;
+  final String? timeZone;
+  final int? rating;
+  final String? projectionType;
+  const RemoteExifEntityData({
+    required this.assetId,
+    this.city,
+    this.state,
+    this.country,
+    this.dateTimeOriginal,
+    this.description,
+    this.height,
+    this.width,
+    this.exposureTime,
+    this.fNumber,
+    this.fileSize,
+    this.focalLength,
+    this.latitude,
+    this.longitude,
+    this.iso,
+    this.make,
+    this.model,
+    this.lens,
+    this.orientation,
+    this.timeZone,
+    this.rating,
+    this.projectionType,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['asset_id'] = Variable<String>(assetId);
+    if (!nullToAbsent || city != null) {
+      map['city'] = Variable<String>(city);
+    }
+    if (!nullToAbsent || state != null) {
+      map['state'] = Variable<String>(state);
+    }
+    if (!nullToAbsent || country != null) {
+      map['country'] = Variable<String>(country);
+    }
+    if (!nullToAbsent || dateTimeOriginal != null) {
+      map['date_time_original'] = Variable<DateTime>(dateTimeOriginal);
+    }
+    if (!nullToAbsent || description != null) {
+      map['description'] = Variable<String>(description);
+    }
+    if (!nullToAbsent || height != null) {
+      map['height'] = Variable<int>(height);
+    }
+    if (!nullToAbsent || width != null) {
+      map['width'] = Variable<int>(width);
+    }
+    if (!nullToAbsent || exposureTime != null) {
+      map['exposure_time'] = Variable<String>(exposureTime);
+    }
+    if (!nullToAbsent || fNumber != null) {
+      map['f_number'] = Variable<double>(fNumber);
+    }
+    if (!nullToAbsent || fileSize != null) {
+      map['file_size'] = Variable<int>(fileSize);
+    }
+    if (!nullToAbsent || focalLength != null) {
+      map['focal_length'] = Variable<double>(focalLength);
+    }
+    if (!nullToAbsent || latitude != null) {
+      map['latitude'] = Variable<double>(latitude);
+    }
+    if (!nullToAbsent || longitude != null) {
+      map['longitude'] = Variable<double>(longitude);
+    }
+    if (!nullToAbsent || iso != null) {
+      map['iso'] = Variable<int>(iso);
+    }
+    if (!nullToAbsent || make != null) {
+      map['make'] = Variable<String>(make);
+    }
+    if (!nullToAbsent || model != null) {
+      map['model'] = Variable<String>(model);
+    }
+    if (!nullToAbsent || lens != null) {
+      map['lens'] = Variable<String>(lens);
+    }
+    if (!nullToAbsent || orientation != null) {
+      map['orientation'] = Variable<String>(orientation);
+    }
+    if (!nullToAbsent || timeZone != null) {
+      map['time_zone'] = Variable<String>(timeZone);
+    }
+    if (!nullToAbsent || rating != null) {
+      map['rating'] = Variable<int>(rating);
+    }
+    if (!nullToAbsent || projectionType != null) {
+      map['projection_type'] = Variable<String>(projectionType);
+    }
+    return map;
+  }
+
+  factory RemoteExifEntityData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return RemoteExifEntityData(
+      assetId: serializer.fromJson<String>(json['assetId']),
+      city: serializer.fromJson<String?>(json['city']),
+      state: serializer.fromJson<String?>(json['state']),
+      country: serializer.fromJson<String?>(json['country']),
+      dateTimeOriginal: serializer.fromJson<DateTime?>(
+        json['dateTimeOriginal'],
+      ),
+      description: serializer.fromJson<String?>(json['description']),
+      height: serializer.fromJson<int?>(json['height']),
+      width: serializer.fromJson<int?>(json['width']),
+      exposureTime: serializer.fromJson<String?>(json['exposureTime']),
+      fNumber: serializer.fromJson<double?>(json['fNumber']),
+      fileSize: serializer.fromJson<int?>(json['fileSize']),
+      focalLength: serializer.fromJson<double?>(json['focalLength']),
+      latitude: serializer.fromJson<double?>(json['latitude']),
+      longitude: serializer.fromJson<double?>(json['longitude']),
+      iso: serializer.fromJson<int?>(json['iso']),
+      make: serializer.fromJson<String?>(json['make']),
+      model: serializer.fromJson<String?>(json['model']),
+      lens: serializer.fromJson<String?>(json['lens']),
+      orientation: serializer.fromJson<String?>(json['orientation']),
+      timeZone: serializer.fromJson<String?>(json['timeZone']),
+      rating: serializer.fromJson<int?>(json['rating']),
+      projectionType: serializer.fromJson<String?>(json['projectionType']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'assetId': serializer.toJson<String>(assetId),
+      'city': serializer.toJson<String?>(city),
+      'state': serializer.toJson<String?>(state),
+      'country': serializer.toJson<String?>(country),
+      'dateTimeOriginal': serializer.toJson<DateTime?>(dateTimeOriginal),
+      'description': serializer.toJson<String?>(description),
+      'height': serializer.toJson<int?>(height),
+      'width': serializer.toJson<int?>(width),
+      'exposureTime': serializer.toJson<String?>(exposureTime),
+      'fNumber': serializer.toJson<double?>(fNumber),
+      'fileSize': serializer.toJson<int?>(fileSize),
+      'focalLength': serializer.toJson<double?>(focalLength),
+      'latitude': serializer.toJson<double?>(latitude),
+      'longitude': serializer.toJson<double?>(longitude),
+      'iso': serializer.toJson<int?>(iso),
+      'make': serializer.toJson<String?>(make),
+      'model': serializer.toJson<String?>(model),
+      'lens': serializer.toJson<String?>(lens),
+      'orientation': serializer.toJson<String?>(orientation),
+      'timeZone': serializer.toJson<String?>(timeZone),
+      'rating': serializer.toJson<int?>(rating),
+      'projectionType': serializer.toJson<String?>(projectionType),
+    };
+  }
+
+  RemoteExifEntityData copyWith({
+    String? assetId,
+    Value<String?> city = const Value.absent(),
+    Value<String?> state = const Value.absent(),
+    Value<String?> country = const Value.absent(),
+    Value<DateTime?> dateTimeOriginal = const Value.absent(),
+    Value<String?> description = const Value.absent(),
+    Value<int?> height = const Value.absent(),
+    Value<int?> width = const Value.absent(),
+    Value<String?> exposureTime = const Value.absent(),
+    Value<double?> fNumber = const Value.absent(),
+    Value<int?> fileSize = const Value.absent(),
+    Value<double?> focalLength = const Value.absent(),
+    Value<double?> latitude = const Value.absent(),
+    Value<double?> longitude = const Value.absent(),
+    Value<int?> iso = const Value.absent(),
+    Value<String?> make = const Value.absent(),
+    Value<String?> model = const Value.absent(),
+    Value<String?> lens = const Value.absent(),
+    Value<String?> orientation = const Value.absent(),
+    Value<String?> timeZone = const Value.absent(),
+    Value<int?> rating = const Value.absent(),
+    Value<String?> projectionType = const Value.absent(),
+  }) => RemoteExifEntityData(
+    assetId: assetId ?? this.assetId,
+    city: city.present ? city.value : this.city,
+    state: state.present ? state.value : this.state,
+    country: country.present ? country.value : this.country,
+    dateTimeOriginal: dateTimeOriginal.present
+        ? dateTimeOriginal.value
+        : this.dateTimeOriginal,
+    description: description.present ? description.value : this.description,
+    height: height.present ? height.value : this.height,
+    width: width.present ? width.value : this.width,
+    exposureTime: exposureTime.present ? exposureTime.value : this.exposureTime,
+    fNumber: fNumber.present ? fNumber.value : this.fNumber,
+    fileSize: fileSize.present ? fileSize.value : this.fileSize,
+    focalLength: focalLength.present ? focalLength.value : this.focalLength,
+    latitude: latitude.present ? latitude.value : this.latitude,
+    longitude: longitude.present ? longitude.value : this.longitude,
+    iso: iso.present ? iso.value : this.iso,
+    make: make.present ? make.value : this.make,
+    model: model.present ? model.value : this.model,
+    lens: lens.present ? lens.value : this.lens,
+    orientation: orientation.present ? orientation.value : this.orientation,
+    timeZone: timeZone.present ? timeZone.value : this.timeZone,
+    rating: rating.present ? rating.value : this.rating,
+    projectionType: projectionType.present
+        ? projectionType.value
+        : this.projectionType,
+  );
+  RemoteExifEntityData copyWithCompanion(RemoteExifEntityCompanion data) {
+    return RemoteExifEntityData(
+      assetId: data.assetId.present ? data.assetId.value : this.assetId,
+      city: data.city.present ? data.city.value : this.city,
+      state: data.state.present ? data.state.value : this.state,
+      country: data.country.present ? data.country.value : this.country,
+      dateTimeOriginal: data.dateTimeOriginal.present
+          ? data.dateTimeOriginal.value
+          : this.dateTimeOriginal,
+      description: data.description.present
+          ? data.description.value
+          : this.description,
+      height: data.height.present ? data.height.value : this.height,
+      width: data.width.present ? data.width.value : this.width,
+      exposureTime: data.exposureTime.present
+          ? data.exposureTime.value
+          : this.exposureTime,
+      fNumber: data.fNumber.present ? data.fNumber.value : this.fNumber,
+      fileSize: data.fileSize.present ? data.fileSize.value : this.fileSize,
+      focalLength: data.focalLength.present
+          ? data.focalLength.value
+          : this.focalLength,
+      latitude: data.latitude.present ? data.latitude.value : this.latitude,
+      longitude: data.longitude.present ? data.longitude.value : this.longitude,
+      iso: data.iso.present ? data.iso.value : this.iso,
+      make: data.make.present ? data.make.value : this.make,
+      model: data.model.present ? data.model.value : this.model,
+      lens: data.lens.present ? data.lens.value : this.lens,
+      orientation: data.orientation.present
+          ? data.orientation.value
+          : this.orientation,
+      timeZone: data.timeZone.present ? data.timeZone.value : this.timeZone,
+      rating: data.rating.present ? data.rating.value : this.rating,
+      projectionType: data.projectionType.present
+          ? data.projectionType.value
+          : this.projectionType,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('RemoteExifEntityData(')
+          ..write('assetId: $assetId, ')
+          ..write('city: $city, ')
+          ..write('state: $state, ')
+          ..write('country: $country, ')
+          ..write('dateTimeOriginal: $dateTimeOriginal, ')
+          ..write('description: $description, ')
+          ..write('height: $height, ')
+          ..write('width: $width, ')
+          ..write('exposureTime: $exposureTime, ')
+          ..write('fNumber: $fNumber, ')
+          ..write('fileSize: $fileSize, ')
+          ..write('focalLength: $focalLength, ')
+          ..write('latitude: $latitude, ')
+          ..write('longitude: $longitude, ')
+          ..write('iso: $iso, ')
+          ..write('make: $make, ')
+          ..write('model: $model, ')
+          ..write('lens: $lens, ')
+          ..write('orientation: $orientation, ')
+          ..write('timeZone: $timeZone, ')
+          ..write('rating: $rating, ')
+          ..write('projectionType: $projectionType')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hashAll([
+    assetId,
+    city,
+    state,
+    country,
+    dateTimeOriginal,
+    description,
+    height,
+    width,
+    exposureTime,
+    fNumber,
+    fileSize,
+    focalLength,
+    latitude,
+    longitude,
+    iso,
+    make,
+    model,
+    lens,
+    orientation,
+    timeZone,
+    rating,
+    projectionType,
+  ]);
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is RemoteExifEntityData &&
+          other.assetId == this.assetId &&
+          other.city == this.city &&
+          other.state == this.state &&
+          other.country == this.country &&
+          other.dateTimeOriginal == this.dateTimeOriginal &&
+          other.description == this.description &&
+          other.height == this.height &&
+          other.width == this.width &&
+          other.exposureTime == this.exposureTime &&
+          other.fNumber == this.fNumber &&
+          other.fileSize == this.fileSize &&
+          other.focalLength == this.focalLength &&
+          other.latitude == this.latitude &&
+          other.longitude == this.longitude &&
+          other.iso == this.iso &&
+          other.make == this.make &&
+          other.model == this.model &&
+          other.lens == this.lens &&
+          other.orientation == this.orientation &&
+          other.timeZone == this.timeZone &&
+          other.rating == this.rating &&
+          other.projectionType == this.projectionType);
+}
+
+class RemoteExifEntityCompanion extends UpdateCompanion<RemoteExifEntityData> {
+  final Value<String> assetId;
+  final Value<String?> city;
+  final Value<String?> state;
+  final Value<String?> country;
+  final Value<DateTime?> dateTimeOriginal;
+  final Value<String?> description;
+  final Value<int?> height;
+  final Value<int?> width;
+  final Value<String?> exposureTime;
+  final Value<double?> fNumber;
+  final Value<int?> fileSize;
+  final Value<double?> focalLength;
+  final Value<double?> latitude;
+  final Value<double?> longitude;
+  final Value<int?> iso;
+  final Value<String?> make;
+  final Value<String?> model;
+  final Value<String?> lens;
+  final Value<String?> orientation;
+  final Value<String?> timeZone;
+  final Value<int?> rating;
+  final Value<String?> projectionType;
+  const RemoteExifEntityCompanion({
+    this.assetId = const Value.absent(),
+    this.city = const Value.absent(),
+    this.state = const Value.absent(),
+    this.country = const Value.absent(),
+    this.dateTimeOriginal = const Value.absent(),
+    this.description = const Value.absent(),
+    this.height = const Value.absent(),
+    this.width = const Value.absent(),
+    this.exposureTime = const Value.absent(),
+    this.fNumber = const Value.absent(),
+    this.fileSize = const Value.absent(),
+    this.focalLength = const Value.absent(),
+    this.latitude = const Value.absent(),
+    this.longitude = const Value.absent(),
+    this.iso = const Value.absent(),
+    this.make = const Value.absent(),
+    this.model = const Value.absent(),
+    this.lens = const Value.absent(),
+    this.orientation = const Value.absent(),
+    this.timeZone = const Value.absent(),
+    this.rating = const Value.absent(),
+    this.projectionType = const Value.absent(),
+  });
+  RemoteExifEntityCompanion.insert({
+    required String assetId,
+    this.city = const Value.absent(),
+    this.state = const Value.absent(),
+    this.country = const Value.absent(),
+    this.dateTimeOriginal = const Value.absent(),
+    this.description = const Value.absent(),
+    this.height = const Value.absent(),
+    this.width = const Value.absent(),
+    this.exposureTime = const Value.absent(),
+    this.fNumber = const Value.absent(),
+    this.fileSize = const Value.absent(),
+    this.focalLength = const Value.absent(),
+    this.latitude = const Value.absent(),
+    this.longitude = const Value.absent(),
+    this.iso = const Value.absent(),
+    this.make = const Value.absent(),
+    this.model = const Value.absent(),
+    this.lens = const Value.absent(),
+    this.orientation = const Value.absent(),
+    this.timeZone = const Value.absent(),
+    this.rating = const Value.absent(),
+    this.projectionType = const Value.absent(),
+  }) : assetId = Value(assetId);
+  static Insertable<RemoteExifEntityData> custom({
+    Expression<String>? assetId,
+    Expression<String>? city,
+    Expression<String>? state,
+    Expression<String>? country,
+    Expression<DateTime>? dateTimeOriginal,
+    Expression<String>? description,
+    Expression<int>? height,
+    Expression<int>? width,
+    Expression<String>? exposureTime,
+    Expression<double>? fNumber,
+    Expression<int>? fileSize,
+    Expression<double>? focalLength,
+    Expression<double>? latitude,
+    Expression<double>? longitude,
+    Expression<int>? iso,
+    Expression<String>? make,
+    Expression<String>? model,
+    Expression<String>? lens,
+    Expression<String>? orientation,
+    Expression<String>? timeZone,
+    Expression<int>? rating,
+    Expression<String>? projectionType,
+  }) {
+    return RawValuesInsertable({
+      if (assetId != null) 'asset_id': assetId,
+      if (city != null) 'city': city,
+      if (state != null) 'state': state,
+      if (country != null) 'country': country,
+      if (dateTimeOriginal != null) 'date_time_original': dateTimeOriginal,
+      if (description != null) 'description': description,
+      if (height != null) 'height': height,
+      if (width != null) 'width': width,
+      if (exposureTime != null) 'exposure_time': exposureTime,
+      if (fNumber != null) 'f_number': fNumber,
+      if (fileSize != null) 'file_size': fileSize,
+      if (focalLength != null) 'focal_length': focalLength,
+      if (latitude != null) 'latitude': latitude,
+      if (longitude != null) 'longitude': longitude,
+      if (iso != null) 'iso': iso,
+      if (make != null) 'make': make,
+      if (model != null) 'model': model,
+      if (lens != null) 'lens': lens,
+      if (orientation != null) 'orientation': orientation,
+      if (timeZone != null) 'time_zone': timeZone,
+      if (rating != null) 'rating': rating,
+      if (projectionType != null) 'projection_type': projectionType,
+    });
+  }
+
+  RemoteExifEntityCompanion copyWith({
+    Value<String>? assetId,
+    Value<String?>? city,
+    Value<String?>? state,
+    Value<String?>? country,
+    Value<DateTime?>? dateTimeOriginal,
+    Value<String?>? description,
+    Value<int?>? height,
+    Value<int?>? width,
+    Value<String?>? exposureTime,
+    Value<double?>? fNumber,
+    Value<int?>? fileSize,
+    Value<double?>? focalLength,
+    Value<double?>? latitude,
+    Value<double?>? longitude,
+    Value<int?>? iso,
+    Value<String?>? make,
+    Value<String?>? model,
+    Value<String?>? lens,
+    Value<String?>? orientation,
+    Value<String?>? timeZone,
+    Value<int?>? rating,
+    Value<String?>? projectionType,
+  }) {
+    return RemoteExifEntityCompanion(
+      assetId: assetId ?? this.assetId,
+      city: city ?? this.city,
+      state: state ?? this.state,
+      country: country ?? this.country,
+      dateTimeOriginal: dateTimeOriginal ?? this.dateTimeOriginal,
+      description: description ?? this.description,
+      height: height ?? this.height,
+      width: width ?? this.width,
+      exposureTime: exposureTime ?? this.exposureTime,
+      fNumber: fNumber ?? this.fNumber,
+      fileSize: fileSize ?? this.fileSize,
+      focalLength: focalLength ?? this.focalLength,
+      latitude: latitude ?? this.latitude,
+      longitude: longitude ?? this.longitude,
+      iso: iso ?? this.iso,
+      make: make ?? this.make,
+      model: model ?? this.model,
+      lens: lens ?? this.lens,
+      orientation: orientation ?? this.orientation,
+      timeZone: timeZone ?? this.timeZone,
+      rating: rating ?? this.rating,
+      projectionType: projectionType ?? this.projectionType,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (assetId.present) {
+      map['asset_id'] = Variable<String>(assetId.value);
+    }
+    if (city.present) {
+      map['city'] = Variable<String>(city.value);
+    }
+    if (state.present) {
+      map['state'] = Variable<String>(state.value);
+    }
+    if (country.present) {
+      map['country'] = Variable<String>(country.value);
+    }
+    if (dateTimeOriginal.present) {
+      map['date_time_original'] = Variable<DateTime>(dateTimeOriginal.value);
+    }
+    if (description.present) {
+      map['description'] = Variable<String>(description.value);
+    }
+    if (height.present) {
+      map['height'] = Variable<int>(height.value);
+    }
+    if (width.present) {
+      map['width'] = Variable<int>(width.value);
+    }
+    if (exposureTime.present) {
+      map['exposure_time'] = Variable<String>(exposureTime.value);
+    }
+    if (fNumber.present) {
+      map['f_number'] = Variable<double>(fNumber.value);
+    }
+    if (fileSize.present) {
+      map['file_size'] = Variable<int>(fileSize.value);
+    }
+    if (focalLength.present) {
+      map['focal_length'] = Variable<double>(focalLength.value);
+    }
+    if (latitude.present) {
+      map['latitude'] = Variable<double>(latitude.value);
+    }
+    if (longitude.present) {
+      map['longitude'] = Variable<double>(longitude.value);
+    }
+    if (iso.present) {
+      map['iso'] = Variable<int>(iso.value);
+    }
+    if (make.present) {
+      map['make'] = Variable<String>(make.value);
+    }
+    if (model.present) {
+      map['model'] = Variable<String>(model.value);
+    }
+    if (lens.present) {
+      map['lens'] = Variable<String>(lens.value);
+    }
+    if (orientation.present) {
+      map['orientation'] = Variable<String>(orientation.value);
+    }
+    if (timeZone.present) {
+      map['time_zone'] = Variable<String>(timeZone.value);
+    }
+    if (rating.present) {
+      map['rating'] = Variable<int>(rating.value);
+    }
+    if (projectionType.present) {
+      map['projection_type'] = Variable<String>(projectionType.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('RemoteExifEntityCompanion(')
+          ..write('assetId: $assetId, ')
+          ..write('city: $city, ')
+          ..write('state: $state, ')
+          ..write('country: $country, ')
+          ..write('dateTimeOriginal: $dateTimeOriginal, ')
+          ..write('description: $description, ')
+          ..write('height: $height, ')
+          ..write('width: $width, ')
+          ..write('exposureTime: $exposureTime, ')
+          ..write('fNumber: $fNumber, ')
+          ..write('fileSize: $fileSize, ')
+          ..write('focalLength: $focalLength, ')
+          ..write('latitude: $latitude, ')
+          ..write('longitude: $longitude, ')
+          ..write('iso: $iso, ')
+          ..write('make: $make, ')
+          ..write('model: $model, ')
+          ..write('lens: $lens, ')
+          ..write('orientation: $orientation, ')
+          ..write('timeZone: $timeZone, ')
+          ..write('rating: $rating, ')
+          ..write('projectionType: $projectionType')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class RemoteAlbumAssetEntity extends Table
+    with TableInfo<RemoteAlbumAssetEntity, RemoteAlbumAssetEntityData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  RemoteAlbumAssetEntity(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<String> assetId = GeneratedColumn<String>(
+    'asset_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    defaultConstraints: GeneratedColumn.constraintIsAlways(
+      'REFERENCES remote_asset_entity (id) ON DELETE CASCADE',
+    ),
+  );
+  late final GeneratedColumn<String> albumId = GeneratedColumn<String>(
+    'album_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    defaultConstraints: GeneratedColumn.constraintIsAlways(
+      'REFERENCES remote_album_entity (id) ON DELETE CASCADE',
+    ),
+  );
+  @override
+  List<GeneratedColumn> get $columns => [assetId, albumId];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'remote_album_asset_entity';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {assetId, albumId};
+  @override
+  RemoteAlbumAssetEntityData map(
+    Map<String, dynamic> data, {
+    String? tablePrefix,
+  }) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return RemoteAlbumAssetEntityData(
+      assetId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}asset_id'],
+      )!,
+      albumId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}album_id'],
+      )!,
+    );
+  }
+
+  @override
+  RemoteAlbumAssetEntity createAlias(String alias) {
+    return RemoteAlbumAssetEntity(attachedDatabase, alias);
+  }
+
+  @override
+  bool get withoutRowId => true;
+  @override
+  bool get isStrict => true;
+}
+
+class RemoteAlbumAssetEntityData extends DataClass
+    implements Insertable<RemoteAlbumAssetEntityData> {
+  final String assetId;
+  final String albumId;
+  const RemoteAlbumAssetEntityData({
+    required this.assetId,
+    required this.albumId,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['asset_id'] = Variable<String>(assetId);
+    map['album_id'] = Variable<String>(albumId);
+    return map;
+  }
+
+  factory RemoteAlbumAssetEntityData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return RemoteAlbumAssetEntityData(
+      assetId: serializer.fromJson<String>(json['assetId']),
+      albumId: serializer.fromJson<String>(json['albumId']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'assetId': serializer.toJson<String>(assetId),
+      'albumId': serializer.toJson<String>(albumId),
+    };
+  }
+
+  RemoteAlbumAssetEntityData copyWith({String? assetId, String? albumId}) =>
+      RemoteAlbumAssetEntityData(
+        assetId: assetId ?? this.assetId,
+        albumId: albumId ?? this.albumId,
+      );
+  RemoteAlbumAssetEntityData copyWithCompanion(
+    RemoteAlbumAssetEntityCompanion data,
+  ) {
+    return RemoteAlbumAssetEntityData(
+      assetId: data.assetId.present ? data.assetId.value : this.assetId,
+      albumId: data.albumId.present ? data.albumId.value : this.albumId,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('RemoteAlbumAssetEntityData(')
+          ..write('assetId: $assetId, ')
+          ..write('albumId: $albumId')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(assetId, albumId);
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is RemoteAlbumAssetEntityData &&
+          other.assetId == this.assetId &&
+          other.albumId == this.albumId);
+}
+
+class RemoteAlbumAssetEntityCompanion
+    extends UpdateCompanion<RemoteAlbumAssetEntityData> {
+  final Value<String> assetId;
+  final Value<String> albumId;
+  const RemoteAlbumAssetEntityCompanion({
+    this.assetId = const Value.absent(),
+    this.albumId = const Value.absent(),
+  });
+  RemoteAlbumAssetEntityCompanion.insert({
+    required String assetId,
+    required String albumId,
+  }) : assetId = Value(assetId),
+       albumId = Value(albumId);
+  static Insertable<RemoteAlbumAssetEntityData> custom({
+    Expression<String>? assetId,
+    Expression<String>? albumId,
+  }) {
+    return RawValuesInsertable({
+      if (assetId != null) 'asset_id': assetId,
+      if (albumId != null) 'album_id': albumId,
+    });
+  }
+
+  RemoteAlbumAssetEntityCompanion copyWith({
+    Value<String>? assetId,
+    Value<String>? albumId,
+  }) {
+    return RemoteAlbumAssetEntityCompanion(
+      assetId: assetId ?? this.assetId,
+      albumId: albumId ?? this.albumId,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (assetId.present) {
+      map['asset_id'] = Variable<String>(assetId.value);
+    }
+    if (albumId.present) {
+      map['album_id'] = Variable<String>(albumId.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('RemoteAlbumAssetEntityCompanion(')
+          ..write('assetId: $assetId, ')
+          ..write('albumId: $albumId')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class RemoteAlbumUserEntity extends Table
+    with TableInfo<RemoteAlbumUserEntity, RemoteAlbumUserEntityData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  RemoteAlbumUserEntity(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<String> albumId = GeneratedColumn<String>(
+    'album_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    defaultConstraints: GeneratedColumn.constraintIsAlways(
+      'REFERENCES remote_album_entity (id) ON DELETE CASCADE',
+    ),
+  );
+  late final GeneratedColumn<String> userId = GeneratedColumn<String>(
+    'user_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    defaultConstraints: GeneratedColumn.constraintIsAlways(
+      'REFERENCES user_entity (id) ON DELETE CASCADE',
+    ),
+  );
+  late final GeneratedColumn<int> role = GeneratedColumn<int>(
+    'role',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+  );
+  @override
+  List<GeneratedColumn> get $columns => [albumId, userId, role];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'remote_album_user_entity';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {albumId, userId};
+  @override
+  RemoteAlbumUserEntityData map(
+    Map<String, dynamic> data, {
+    String? tablePrefix,
+  }) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return RemoteAlbumUserEntityData(
+      albumId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}album_id'],
+      )!,
+      userId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}user_id'],
+      )!,
+      role: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}role'],
+      )!,
+    );
+  }
+
+  @override
+  RemoteAlbumUserEntity createAlias(String alias) {
+    return RemoteAlbumUserEntity(attachedDatabase, alias);
+  }
+
+  @override
+  bool get withoutRowId => true;
+  @override
+  bool get isStrict => true;
+}
+
+class RemoteAlbumUserEntityData extends DataClass
+    implements Insertable<RemoteAlbumUserEntityData> {
+  final String albumId;
+  final String userId;
+  final int role;
+  const RemoteAlbumUserEntityData({
+    required this.albumId,
+    required this.userId,
+    required this.role,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['album_id'] = Variable<String>(albumId);
+    map['user_id'] = Variable<String>(userId);
+    map['role'] = Variable<int>(role);
+    return map;
+  }
+
+  factory RemoteAlbumUserEntityData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return RemoteAlbumUserEntityData(
+      albumId: serializer.fromJson<String>(json['albumId']),
+      userId: serializer.fromJson<String>(json['userId']),
+      role: serializer.fromJson<int>(json['role']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'albumId': serializer.toJson<String>(albumId),
+      'userId': serializer.toJson<String>(userId),
+      'role': serializer.toJson<int>(role),
+    };
+  }
+
+  RemoteAlbumUserEntityData copyWith({
+    String? albumId,
+    String? userId,
+    int? role,
+  }) => RemoteAlbumUserEntityData(
+    albumId: albumId ?? this.albumId,
+    userId: userId ?? this.userId,
+    role: role ?? this.role,
+  );
+  RemoteAlbumUserEntityData copyWithCompanion(
+    RemoteAlbumUserEntityCompanion data,
+  ) {
+    return RemoteAlbumUserEntityData(
+      albumId: data.albumId.present ? data.albumId.value : this.albumId,
+      userId: data.userId.present ? data.userId.value : this.userId,
+      role: data.role.present ? data.role.value : this.role,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('RemoteAlbumUserEntityData(')
+          ..write('albumId: $albumId, ')
+          ..write('userId: $userId, ')
+          ..write('role: $role')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(albumId, userId, role);
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is RemoteAlbumUserEntityData &&
+          other.albumId == this.albumId &&
+          other.userId == this.userId &&
+          other.role == this.role);
+}
+
+class RemoteAlbumUserEntityCompanion
+    extends UpdateCompanion<RemoteAlbumUserEntityData> {
+  final Value<String> albumId;
+  final Value<String> userId;
+  final Value<int> role;
+  const RemoteAlbumUserEntityCompanion({
+    this.albumId = const Value.absent(),
+    this.userId = const Value.absent(),
+    this.role = const Value.absent(),
+  });
+  RemoteAlbumUserEntityCompanion.insert({
+    required String albumId,
+    required String userId,
+    required int role,
+  }) : albumId = Value(albumId),
+       userId = Value(userId),
+       role = Value(role);
+  static Insertable<RemoteAlbumUserEntityData> custom({
+    Expression<String>? albumId,
+    Expression<String>? userId,
+    Expression<int>? role,
+  }) {
+    return RawValuesInsertable({
+      if (albumId != null) 'album_id': albumId,
+      if (userId != null) 'user_id': userId,
+      if (role != null) 'role': role,
+    });
+  }
+
+  RemoteAlbumUserEntityCompanion copyWith({
+    Value<String>? albumId,
+    Value<String>? userId,
+    Value<int>? role,
+  }) {
+    return RemoteAlbumUserEntityCompanion(
+      albumId: albumId ?? this.albumId,
+      userId: userId ?? this.userId,
+      role: role ?? this.role,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (albumId.present) {
+      map['album_id'] = Variable<String>(albumId.value);
+    }
+    if (userId.present) {
+      map['user_id'] = Variable<String>(userId.value);
+    }
+    if (role.present) {
+      map['role'] = Variable<int>(role.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('RemoteAlbumUserEntityCompanion(')
+          ..write('albumId: $albumId, ')
+          ..write('userId: $userId, ')
+          ..write('role: $role')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class MemoryEntity extends Table
+    with TableInfo<MemoryEntity, MemoryEntityData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  MemoryEntity(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<String> id = GeneratedColumn<String>(
+    'id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+  );
+  late final GeneratedColumn<DateTime> createdAt = GeneratedColumn<DateTime>(
+    'created_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.dateTime,
+    requiredDuringInsert: false,
+    defaultValue: const CustomExpression('CURRENT_TIMESTAMP'),
+  );
+  late final GeneratedColumn<DateTime> updatedAt = GeneratedColumn<DateTime>(
+    'updated_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.dateTime,
+    requiredDuringInsert: false,
+    defaultValue: const CustomExpression('CURRENT_TIMESTAMP'),
+  );
+  late final GeneratedColumn<DateTime> deletedAt = GeneratedColumn<DateTime>(
+    'deleted_at',
+    aliasedName,
+    true,
+    type: DriftSqlType.dateTime,
+    requiredDuringInsert: false,
+  );
+  late final GeneratedColumn<String> ownerId = GeneratedColumn<String>(
+    'owner_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    defaultConstraints: GeneratedColumn.constraintIsAlways(
+      'REFERENCES user_entity (id) ON DELETE CASCADE',
+    ),
+  );
+  late final GeneratedColumn<int> type = GeneratedColumn<int>(
+    'type',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+  );
+  late final GeneratedColumn<String> data = GeneratedColumn<String>(
+    'data',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+  );
+  late final GeneratedColumn<bool> isSaved = GeneratedColumn<bool>(
+    'is_saved',
+    aliasedName,
+    false,
+    type: DriftSqlType.bool,
+    requiredDuringInsert: false,
+    defaultConstraints: GeneratedColumn.constraintIsAlways(
+      'CHECK ("is_saved" IN (0, 1))',
+    ),
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<DateTime> memoryAt = GeneratedColumn<DateTime>(
+    'memory_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.dateTime,
+    requiredDuringInsert: true,
+  );
+  late final GeneratedColumn<DateTime> seenAt = GeneratedColumn<DateTime>(
+    'seen_at',
+    aliasedName,
+    true,
+    type: DriftSqlType.dateTime,
+    requiredDuringInsert: false,
+  );
+  late final GeneratedColumn<DateTime> showAt = GeneratedColumn<DateTime>(
+    'show_at',
+    aliasedName,
+    true,
+    type: DriftSqlType.dateTime,
+    requiredDuringInsert: false,
+  );
+  late final GeneratedColumn<DateTime> hideAt = GeneratedColumn<DateTime>(
+    'hide_at',
+    aliasedName,
+    true,
+    type: DriftSqlType.dateTime,
+    requiredDuringInsert: false,
+  );
+  @override
+  List<GeneratedColumn> get $columns => [
+    id,
+    createdAt,
+    updatedAt,
+    deletedAt,
+    ownerId,
+    type,
+    data,
+    isSaved,
+    memoryAt,
+    seenAt,
+    showAt,
+    hideAt,
+  ];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'memory_entity';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {id};
+  @override
+  MemoryEntityData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return MemoryEntityData(
+      id: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}id'],
+      )!,
+      createdAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.dateTime,
+        data['${effectivePrefix}created_at'],
+      )!,
+      updatedAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.dateTime,
+        data['${effectivePrefix}updated_at'],
+      )!,
+      deletedAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.dateTime,
+        data['${effectivePrefix}deleted_at'],
+      ),
+      ownerId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}owner_id'],
+      )!,
+      type: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}type'],
+      )!,
+      data: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}data'],
+      )!,
+      isSaved: attachedDatabase.typeMapping.read(
+        DriftSqlType.bool,
+        data['${effectivePrefix}is_saved'],
+      )!,
+      memoryAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.dateTime,
+        data['${effectivePrefix}memory_at'],
+      )!,
+      seenAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.dateTime,
+        data['${effectivePrefix}seen_at'],
+      ),
+      showAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.dateTime,
+        data['${effectivePrefix}show_at'],
+      ),
+      hideAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.dateTime,
+        data['${effectivePrefix}hide_at'],
+      ),
+    );
+  }
+
+  @override
+  MemoryEntity createAlias(String alias) {
+    return MemoryEntity(attachedDatabase, alias);
+  }
+
+  @override
+  bool get withoutRowId => true;
+  @override
+  bool get isStrict => true;
+}
+
+class MemoryEntityData extends DataClass
+    implements Insertable<MemoryEntityData> {
+  final String id;
+  final DateTime createdAt;
+  final DateTime updatedAt;
+  final DateTime? deletedAt;
+  final String ownerId;
+  final int type;
+  final String data;
+  final bool isSaved;
+  final DateTime memoryAt;
+  final DateTime? seenAt;
+  final DateTime? showAt;
+  final DateTime? hideAt;
+  const MemoryEntityData({
+    required this.id,
+    required this.createdAt,
+    required this.updatedAt,
+    this.deletedAt,
+    required this.ownerId,
+    required this.type,
+    required this.data,
+    required this.isSaved,
+    required this.memoryAt,
+    this.seenAt,
+    this.showAt,
+    this.hideAt,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['id'] = Variable<String>(id);
+    map['created_at'] = Variable<DateTime>(createdAt);
+    map['updated_at'] = Variable<DateTime>(updatedAt);
+    if (!nullToAbsent || deletedAt != null) {
+      map['deleted_at'] = Variable<DateTime>(deletedAt);
+    }
+    map['owner_id'] = Variable<String>(ownerId);
+    map['type'] = Variable<int>(type);
+    map['data'] = Variable<String>(data);
+    map['is_saved'] = Variable<bool>(isSaved);
+    map['memory_at'] = Variable<DateTime>(memoryAt);
+    if (!nullToAbsent || seenAt != null) {
+      map['seen_at'] = Variable<DateTime>(seenAt);
+    }
+    if (!nullToAbsent || showAt != null) {
+      map['show_at'] = Variable<DateTime>(showAt);
+    }
+    if (!nullToAbsent || hideAt != null) {
+      map['hide_at'] = Variable<DateTime>(hideAt);
+    }
+    return map;
+  }
+
+  factory MemoryEntityData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return MemoryEntityData(
+      id: serializer.fromJson<String>(json['id']),
+      createdAt: serializer.fromJson<DateTime>(json['createdAt']),
+      updatedAt: serializer.fromJson<DateTime>(json['updatedAt']),
+      deletedAt: serializer.fromJson<DateTime?>(json['deletedAt']),
+      ownerId: serializer.fromJson<String>(json['ownerId']),
+      type: serializer.fromJson<int>(json['type']),
+      data: serializer.fromJson<String>(json['data']),
+      isSaved: serializer.fromJson<bool>(json['isSaved']),
+      memoryAt: serializer.fromJson<DateTime>(json['memoryAt']),
+      seenAt: serializer.fromJson<DateTime?>(json['seenAt']),
+      showAt: serializer.fromJson<DateTime?>(json['showAt']),
+      hideAt: serializer.fromJson<DateTime?>(json['hideAt']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'id': serializer.toJson<String>(id),
+      'createdAt': serializer.toJson<DateTime>(createdAt),
+      'updatedAt': serializer.toJson<DateTime>(updatedAt),
+      'deletedAt': serializer.toJson<DateTime?>(deletedAt),
+      'ownerId': serializer.toJson<String>(ownerId),
+      'type': serializer.toJson<int>(type),
+      'data': serializer.toJson<String>(data),
+      'isSaved': serializer.toJson<bool>(isSaved),
+      'memoryAt': serializer.toJson<DateTime>(memoryAt),
+      'seenAt': serializer.toJson<DateTime?>(seenAt),
+      'showAt': serializer.toJson<DateTime?>(showAt),
+      'hideAt': serializer.toJson<DateTime?>(hideAt),
+    };
+  }
+
+  MemoryEntityData copyWith({
+    String? id,
+    DateTime? createdAt,
+    DateTime? updatedAt,
+    Value<DateTime?> deletedAt = const Value.absent(),
+    String? ownerId,
+    int? type,
+    String? data,
+    bool? isSaved,
+    DateTime? memoryAt,
+    Value<DateTime?> seenAt = const Value.absent(),
+    Value<DateTime?> showAt = const Value.absent(),
+    Value<DateTime?> hideAt = const Value.absent(),
+  }) => MemoryEntityData(
+    id: id ?? this.id,
+    createdAt: createdAt ?? this.createdAt,
+    updatedAt: updatedAt ?? this.updatedAt,
+    deletedAt: deletedAt.present ? deletedAt.value : this.deletedAt,
+    ownerId: ownerId ?? this.ownerId,
+    type: type ?? this.type,
+    data: data ?? this.data,
+    isSaved: isSaved ?? this.isSaved,
+    memoryAt: memoryAt ?? this.memoryAt,
+    seenAt: seenAt.present ? seenAt.value : this.seenAt,
+    showAt: showAt.present ? showAt.value : this.showAt,
+    hideAt: hideAt.present ? hideAt.value : this.hideAt,
+  );
+  MemoryEntityData copyWithCompanion(MemoryEntityCompanion data) {
+    return MemoryEntityData(
+      id: data.id.present ? data.id.value : this.id,
+      createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
+      updatedAt: data.updatedAt.present ? data.updatedAt.value : this.updatedAt,
+      deletedAt: data.deletedAt.present ? data.deletedAt.value : this.deletedAt,
+      ownerId: data.ownerId.present ? data.ownerId.value : this.ownerId,
+      type: data.type.present ? data.type.value : this.type,
+      data: data.data.present ? data.data.value : this.data,
+      isSaved: data.isSaved.present ? data.isSaved.value : this.isSaved,
+      memoryAt: data.memoryAt.present ? data.memoryAt.value : this.memoryAt,
+      seenAt: data.seenAt.present ? data.seenAt.value : this.seenAt,
+      showAt: data.showAt.present ? data.showAt.value : this.showAt,
+      hideAt: data.hideAt.present ? data.hideAt.value : this.hideAt,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('MemoryEntityData(')
+          ..write('id: $id, ')
+          ..write('createdAt: $createdAt, ')
+          ..write('updatedAt: $updatedAt, ')
+          ..write('deletedAt: $deletedAt, ')
+          ..write('ownerId: $ownerId, ')
+          ..write('type: $type, ')
+          ..write('data: $data, ')
+          ..write('isSaved: $isSaved, ')
+          ..write('memoryAt: $memoryAt, ')
+          ..write('seenAt: $seenAt, ')
+          ..write('showAt: $showAt, ')
+          ..write('hideAt: $hideAt')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(
+    id,
+    createdAt,
+    updatedAt,
+    deletedAt,
+    ownerId,
+    type,
+    data,
+    isSaved,
+    memoryAt,
+    seenAt,
+    showAt,
+    hideAt,
+  );
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is MemoryEntityData &&
+          other.id == this.id &&
+          other.createdAt == this.createdAt &&
+          other.updatedAt == this.updatedAt &&
+          other.deletedAt == this.deletedAt &&
+          other.ownerId == this.ownerId &&
+          other.type == this.type &&
+          other.data == this.data &&
+          other.isSaved == this.isSaved &&
+          other.memoryAt == this.memoryAt &&
+          other.seenAt == this.seenAt &&
+          other.showAt == this.showAt &&
+          other.hideAt == this.hideAt);
+}
+
+class MemoryEntityCompanion extends UpdateCompanion<MemoryEntityData> {
+  final Value<String> id;
+  final Value<DateTime> createdAt;
+  final Value<DateTime> updatedAt;
+  final Value<DateTime?> deletedAt;
+  final Value<String> ownerId;
+  final Value<int> type;
+  final Value<String> data;
+  final Value<bool> isSaved;
+  final Value<DateTime> memoryAt;
+  final Value<DateTime?> seenAt;
+  final Value<DateTime?> showAt;
+  final Value<DateTime?> hideAt;
+  const MemoryEntityCompanion({
+    this.id = const Value.absent(),
+    this.createdAt = const Value.absent(),
+    this.updatedAt = const Value.absent(),
+    this.deletedAt = const Value.absent(),
+    this.ownerId = const Value.absent(),
+    this.type = const Value.absent(),
+    this.data = const Value.absent(),
+    this.isSaved = const Value.absent(),
+    this.memoryAt = const Value.absent(),
+    this.seenAt = const Value.absent(),
+    this.showAt = const Value.absent(),
+    this.hideAt = const Value.absent(),
+  });
+  MemoryEntityCompanion.insert({
+    required String id,
+    this.createdAt = const Value.absent(),
+    this.updatedAt = const Value.absent(),
+    this.deletedAt = const Value.absent(),
+    required String ownerId,
+    required int type,
+    required String data,
+    this.isSaved = const Value.absent(),
+    required DateTime memoryAt,
+    this.seenAt = const Value.absent(),
+    this.showAt = const Value.absent(),
+    this.hideAt = const Value.absent(),
+  }) : id = Value(id),
+       ownerId = Value(ownerId),
+       type = Value(type),
+       data = Value(data),
+       memoryAt = Value(memoryAt);
+  static Insertable<MemoryEntityData> custom({
+    Expression<String>? id,
+    Expression<DateTime>? createdAt,
+    Expression<DateTime>? updatedAt,
+    Expression<DateTime>? deletedAt,
+    Expression<String>? ownerId,
+    Expression<int>? type,
+    Expression<String>? data,
+    Expression<bool>? isSaved,
+    Expression<DateTime>? memoryAt,
+    Expression<DateTime>? seenAt,
+    Expression<DateTime>? showAt,
+    Expression<DateTime>? hideAt,
+  }) {
+    return RawValuesInsertable({
+      if (id != null) 'id': id,
+      if (createdAt != null) 'created_at': createdAt,
+      if (updatedAt != null) 'updated_at': updatedAt,
+      if (deletedAt != null) 'deleted_at': deletedAt,
+      if (ownerId != null) 'owner_id': ownerId,
+      if (type != null) 'type': type,
+      if (data != null) 'data': data,
+      if (isSaved != null) 'is_saved': isSaved,
+      if (memoryAt != null) 'memory_at': memoryAt,
+      if (seenAt != null) 'seen_at': seenAt,
+      if (showAt != null) 'show_at': showAt,
+      if (hideAt != null) 'hide_at': hideAt,
+    });
+  }
+
+  MemoryEntityCompanion copyWith({
+    Value<String>? id,
+    Value<DateTime>? createdAt,
+    Value<DateTime>? updatedAt,
+    Value<DateTime?>? deletedAt,
+    Value<String>? ownerId,
+    Value<int>? type,
+    Value<String>? data,
+    Value<bool>? isSaved,
+    Value<DateTime>? memoryAt,
+    Value<DateTime?>? seenAt,
+    Value<DateTime?>? showAt,
+    Value<DateTime?>? hideAt,
+  }) {
+    return MemoryEntityCompanion(
+      id: id ?? this.id,
+      createdAt: createdAt ?? this.createdAt,
+      updatedAt: updatedAt ?? this.updatedAt,
+      deletedAt: deletedAt ?? this.deletedAt,
+      ownerId: ownerId ?? this.ownerId,
+      type: type ?? this.type,
+      data: data ?? this.data,
+      isSaved: isSaved ?? this.isSaved,
+      memoryAt: memoryAt ?? this.memoryAt,
+      seenAt: seenAt ?? this.seenAt,
+      showAt: showAt ?? this.showAt,
+      hideAt: hideAt ?? this.hideAt,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (id.present) {
+      map['id'] = Variable<String>(id.value);
+    }
+    if (createdAt.present) {
+      map['created_at'] = Variable<DateTime>(createdAt.value);
+    }
+    if (updatedAt.present) {
+      map['updated_at'] = Variable<DateTime>(updatedAt.value);
+    }
+    if (deletedAt.present) {
+      map['deleted_at'] = Variable<DateTime>(deletedAt.value);
+    }
+    if (ownerId.present) {
+      map['owner_id'] = Variable<String>(ownerId.value);
+    }
+    if (type.present) {
+      map['type'] = Variable<int>(type.value);
+    }
+    if (data.present) {
+      map['data'] = Variable<String>(data.value);
+    }
+    if (isSaved.present) {
+      map['is_saved'] = Variable<bool>(isSaved.value);
+    }
+    if (memoryAt.present) {
+      map['memory_at'] = Variable<DateTime>(memoryAt.value);
+    }
+    if (seenAt.present) {
+      map['seen_at'] = Variable<DateTime>(seenAt.value);
+    }
+    if (showAt.present) {
+      map['show_at'] = Variable<DateTime>(showAt.value);
+    }
+    if (hideAt.present) {
+      map['hide_at'] = Variable<DateTime>(hideAt.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('MemoryEntityCompanion(')
+          ..write('id: $id, ')
+          ..write('createdAt: $createdAt, ')
+          ..write('updatedAt: $updatedAt, ')
+          ..write('deletedAt: $deletedAt, ')
+          ..write('ownerId: $ownerId, ')
+          ..write('type: $type, ')
+          ..write('data: $data, ')
+          ..write('isSaved: $isSaved, ')
+          ..write('memoryAt: $memoryAt, ')
+          ..write('seenAt: $seenAt, ')
+          ..write('showAt: $showAt, ')
+          ..write('hideAt: $hideAt')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class MemoryAssetEntity extends Table
+    with TableInfo<MemoryAssetEntity, MemoryAssetEntityData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  MemoryAssetEntity(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<String> assetId = GeneratedColumn<String>(
+    'asset_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    defaultConstraints: GeneratedColumn.constraintIsAlways(
+      'REFERENCES remote_asset_entity (id) ON DELETE CASCADE',
+    ),
+  );
+  late final GeneratedColumn<String> memoryId = GeneratedColumn<String>(
+    'memory_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    defaultConstraints: GeneratedColumn.constraintIsAlways(
+      'REFERENCES memory_entity (id) ON DELETE CASCADE',
+    ),
+  );
+  @override
+  List<GeneratedColumn> get $columns => [assetId, memoryId];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'memory_asset_entity';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {assetId, memoryId};
+  @override
+  MemoryAssetEntityData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return MemoryAssetEntityData(
+      assetId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}asset_id'],
+      )!,
+      memoryId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}memory_id'],
+      )!,
+    );
+  }
+
+  @override
+  MemoryAssetEntity createAlias(String alias) {
+    return MemoryAssetEntity(attachedDatabase, alias);
+  }
+
+  @override
+  bool get withoutRowId => true;
+  @override
+  bool get isStrict => true;
+}
+
+class MemoryAssetEntityData extends DataClass
+    implements Insertable<MemoryAssetEntityData> {
+  final String assetId;
+  final String memoryId;
+  const MemoryAssetEntityData({required this.assetId, required this.memoryId});
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['asset_id'] = Variable<String>(assetId);
+    map['memory_id'] = Variable<String>(memoryId);
+    return map;
+  }
+
+  factory MemoryAssetEntityData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return MemoryAssetEntityData(
+      assetId: serializer.fromJson<String>(json['assetId']),
+      memoryId: serializer.fromJson<String>(json['memoryId']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'assetId': serializer.toJson<String>(assetId),
+      'memoryId': serializer.toJson<String>(memoryId),
+    };
+  }
+
+  MemoryAssetEntityData copyWith({String? assetId, String? memoryId}) =>
+      MemoryAssetEntityData(
+        assetId: assetId ?? this.assetId,
+        memoryId: memoryId ?? this.memoryId,
+      );
+  MemoryAssetEntityData copyWithCompanion(MemoryAssetEntityCompanion data) {
+    return MemoryAssetEntityData(
+      assetId: data.assetId.present ? data.assetId.value : this.assetId,
+      memoryId: data.memoryId.present ? data.memoryId.value : this.memoryId,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('MemoryAssetEntityData(')
+          ..write('assetId: $assetId, ')
+          ..write('memoryId: $memoryId')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(assetId, memoryId);
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is MemoryAssetEntityData &&
+          other.assetId == this.assetId &&
+          other.memoryId == this.memoryId);
+}
+
+class MemoryAssetEntityCompanion
+    extends UpdateCompanion<MemoryAssetEntityData> {
+  final Value<String> assetId;
+  final Value<String> memoryId;
+  const MemoryAssetEntityCompanion({
+    this.assetId = const Value.absent(),
+    this.memoryId = const Value.absent(),
+  });
+  MemoryAssetEntityCompanion.insert({
+    required String assetId,
+    required String memoryId,
+  }) : assetId = Value(assetId),
+       memoryId = Value(memoryId);
+  static Insertable<MemoryAssetEntityData> custom({
+    Expression<String>? assetId,
+    Expression<String>? memoryId,
+  }) {
+    return RawValuesInsertable({
+      if (assetId != null) 'asset_id': assetId,
+      if (memoryId != null) 'memory_id': memoryId,
+    });
+  }
+
+  MemoryAssetEntityCompanion copyWith({
+    Value<String>? assetId,
+    Value<String>? memoryId,
+  }) {
+    return MemoryAssetEntityCompanion(
+      assetId: assetId ?? this.assetId,
+      memoryId: memoryId ?? this.memoryId,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (assetId.present) {
+      map['asset_id'] = Variable<String>(assetId.value);
+    }
+    if (memoryId.present) {
+      map['memory_id'] = Variable<String>(memoryId.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('MemoryAssetEntityCompanion(')
+          ..write('assetId: $assetId, ')
+          ..write('memoryId: $memoryId')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class PersonEntity extends Table
+    with TableInfo<PersonEntity, PersonEntityData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  PersonEntity(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<String> id = GeneratedColumn<String>(
+    'id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+  );
+  late final GeneratedColumn<DateTime> createdAt = GeneratedColumn<DateTime>(
+    'created_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.dateTime,
+    requiredDuringInsert: false,
+    defaultValue: const CustomExpression('CURRENT_TIMESTAMP'),
+  );
+  late final GeneratedColumn<DateTime> updatedAt = GeneratedColumn<DateTime>(
+    'updated_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.dateTime,
+    requiredDuringInsert: false,
+    defaultValue: const CustomExpression('CURRENT_TIMESTAMP'),
+  );
+  late final GeneratedColumn<String> ownerId = GeneratedColumn<String>(
+    'owner_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    defaultConstraints: GeneratedColumn.constraintIsAlways(
+      'REFERENCES user_entity (id) ON DELETE CASCADE',
+    ),
+  );
+  late final GeneratedColumn<String> name = GeneratedColumn<String>(
+    'name',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+  );
+  late final GeneratedColumn<String> faceAssetId = GeneratedColumn<String>(
+    'face_asset_id',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+  );
+  late final GeneratedColumn<bool> isFavorite = GeneratedColumn<bool>(
+    'is_favorite',
+    aliasedName,
+    false,
+    type: DriftSqlType.bool,
+    requiredDuringInsert: true,
+    defaultConstraints: GeneratedColumn.constraintIsAlways(
+      'CHECK ("is_favorite" IN (0, 1))',
+    ),
+  );
+  late final GeneratedColumn<bool> isHidden = GeneratedColumn<bool>(
+    'is_hidden',
+    aliasedName,
+    false,
+    type: DriftSqlType.bool,
+    requiredDuringInsert: true,
+    defaultConstraints: GeneratedColumn.constraintIsAlways(
+      'CHECK ("is_hidden" IN (0, 1))',
+    ),
+  );
+  late final GeneratedColumn<String> color = GeneratedColumn<String>(
+    'color',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+  );
+  late final GeneratedColumn<DateTime> birthDate = GeneratedColumn<DateTime>(
+    'birth_date',
+    aliasedName,
+    true,
+    type: DriftSqlType.dateTime,
+    requiredDuringInsert: false,
+  );
+  @override
+  List<GeneratedColumn> get $columns => [
+    id,
+    createdAt,
+    updatedAt,
+    ownerId,
+    name,
+    faceAssetId,
+    isFavorite,
+    isHidden,
+    color,
+    birthDate,
+  ];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'person_entity';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {id};
+  @override
+  PersonEntityData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return PersonEntityData(
+      id: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}id'],
+      )!,
+      createdAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.dateTime,
+        data['${effectivePrefix}created_at'],
+      )!,
+      updatedAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.dateTime,
+        data['${effectivePrefix}updated_at'],
+      )!,
+      ownerId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}owner_id'],
+      )!,
+      name: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}name'],
+      )!,
+      faceAssetId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}face_asset_id'],
+      ),
+      isFavorite: attachedDatabase.typeMapping.read(
+        DriftSqlType.bool,
+        data['${effectivePrefix}is_favorite'],
+      )!,
+      isHidden: attachedDatabase.typeMapping.read(
+        DriftSqlType.bool,
+        data['${effectivePrefix}is_hidden'],
+      )!,
+      color: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}color'],
+      ),
+      birthDate: attachedDatabase.typeMapping.read(
+        DriftSqlType.dateTime,
+        data['${effectivePrefix}birth_date'],
+      ),
+    );
+  }
+
+  @override
+  PersonEntity createAlias(String alias) {
+    return PersonEntity(attachedDatabase, alias);
+  }
+
+  @override
+  bool get withoutRowId => true;
+  @override
+  bool get isStrict => true;
+}
+
+class PersonEntityData extends DataClass
+    implements Insertable<PersonEntityData> {
+  final String id;
+  final DateTime createdAt;
+  final DateTime updatedAt;
+  final String ownerId;
+  final String name;
+  final String? faceAssetId;
+  final bool isFavorite;
+  final bool isHidden;
+  final String? color;
+  final DateTime? birthDate;
+  const PersonEntityData({
+    required this.id,
+    required this.createdAt,
+    required this.updatedAt,
+    required this.ownerId,
+    required this.name,
+    this.faceAssetId,
+    required this.isFavorite,
+    required this.isHidden,
+    this.color,
+    this.birthDate,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['id'] = Variable<String>(id);
+    map['created_at'] = Variable<DateTime>(createdAt);
+    map['updated_at'] = Variable<DateTime>(updatedAt);
+    map['owner_id'] = Variable<String>(ownerId);
+    map['name'] = Variable<String>(name);
+    if (!nullToAbsent || faceAssetId != null) {
+      map['face_asset_id'] = Variable<String>(faceAssetId);
+    }
+    map['is_favorite'] = Variable<bool>(isFavorite);
+    map['is_hidden'] = Variable<bool>(isHidden);
+    if (!nullToAbsent || color != null) {
+      map['color'] = Variable<String>(color);
+    }
+    if (!nullToAbsent || birthDate != null) {
+      map['birth_date'] = Variable<DateTime>(birthDate);
+    }
+    return map;
+  }
+
+  factory PersonEntityData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return PersonEntityData(
+      id: serializer.fromJson<String>(json['id']),
+      createdAt: serializer.fromJson<DateTime>(json['createdAt']),
+      updatedAt: serializer.fromJson<DateTime>(json['updatedAt']),
+      ownerId: serializer.fromJson<String>(json['ownerId']),
+      name: serializer.fromJson<String>(json['name']),
+      faceAssetId: serializer.fromJson<String?>(json['faceAssetId']),
+      isFavorite: serializer.fromJson<bool>(json['isFavorite']),
+      isHidden: serializer.fromJson<bool>(json['isHidden']),
+      color: serializer.fromJson<String?>(json['color']),
+      birthDate: serializer.fromJson<DateTime?>(json['birthDate']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'id': serializer.toJson<String>(id),
+      'createdAt': serializer.toJson<DateTime>(createdAt),
+      'updatedAt': serializer.toJson<DateTime>(updatedAt),
+      'ownerId': serializer.toJson<String>(ownerId),
+      'name': serializer.toJson<String>(name),
+      'faceAssetId': serializer.toJson<String?>(faceAssetId),
+      'isFavorite': serializer.toJson<bool>(isFavorite),
+      'isHidden': serializer.toJson<bool>(isHidden),
+      'color': serializer.toJson<String?>(color),
+      'birthDate': serializer.toJson<DateTime?>(birthDate),
+    };
+  }
+
+  PersonEntityData copyWith({
+    String? id,
+    DateTime? createdAt,
+    DateTime? updatedAt,
+    String? ownerId,
+    String? name,
+    Value<String?> faceAssetId = const Value.absent(),
+    bool? isFavorite,
+    bool? isHidden,
+    Value<String?> color = const Value.absent(),
+    Value<DateTime?> birthDate = const Value.absent(),
+  }) => PersonEntityData(
+    id: id ?? this.id,
+    createdAt: createdAt ?? this.createdAt,
+    updatedAt: updatedAt ?? this.updatedAt,
+    ownerId: ownerId ?? this.ownerId,
+    name: name ?? this.name,
+    faceAssetId: faceAssetId.present ? faceAssetId.value : this.faceAssetId,
+    isFavorite: isFavorite ?? this.isFavorite,
+    isHidden: isHidden ?? this.isHidden,
+    color: color.present ? color.value : this.color,
+    birthDate: birthDate.present ? birthDate.value : this.birthDate,
+  );
+  PersonEntityData copyWithCompanion(PersonEntityCompanion data) {
+    return PersonEntityData(
+      id: data.id.present ? data.id.value : this.id,
+      createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
+      updatedAt: data.updatedAt.present ? data.updatedAt.value : this.updatedAt,
+      ownerId: data.ownerId.present ? data.ownerId.value : this.ownerId,
+      name: data.name.present ? data.name.value : this.name,
+      faceAssetId: data.faceAssetId.present
+          ? data.faceAssetId.value
+          : this.faceAssetId,
+      isFavorite: data.isFavorite.present
+          ? data.isFavorite.value
+          : this.isFavorite,
+      isHidden: data.isHidden.present ? data.isHidden.value : this.isHidden,
+      color: data.color.present ? data.color.value : this.color,
+      birthDate: data.birthDate.present ? data.birthDate.value : this.birthDate,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('PersonEntityData(')
+          ..write('id: $id, ')
+          ..write('createdAt: $createdAt, ')
+          ..write('updatedAt: $updatedAt, ')
+          ..write('ownerId: $ownerId, ')
+          ..write('name: $name, ')
+          ..write('faceAssetId: $faceAssetId, ')
+          ..write('isFavorite: $isFavorite, ')
+          ..write('isHidden: $isHidden, ')
+          ..write('color: $color, ')
+          ..write('birthDate: $birthDate')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(
+    id,
+    createdAt,
+    updatedAt,
+    ownerId,
+    name,
+    faceAssetId,
+    isFavorite,
+    isHidden,
+    color,
+    birthDate,
+  );
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is PersonEntityData &&
+          other.id == this.id &&
+          other.createdAt == this.createdAt &&
+          other.updatedAt == this.updatedAt &&
+          other.ownerId == this.ownerId &&
+          other.name == this.name &&
+          other.faceAssetId == this.faceAssetId &&
+          other.isFavorite == this.isFavorite &&
+          other.isHidden == this.isHidden &&
+          other.color == this.color &&
+          other.birthDate == this.birthDate);
+}
+
+class PersonEntityCompanion extends UpdateCompanion<PersonEntityData> {
+  final Value<String> id;
+  final Value<DateTime> createdAt;
+  final Value<DateTime> updatedAt;
+  final Value<String> ownerId;
+  final Value<String> name;
+  final Value<String?> faceAssetId;
+  final Value<bool> isFavorite;
+  final Value<bool> isHidden;
+  final Value<String?> color;
+  final Value<DateTime?> birthDate;
+  const PersonEntityCompanion({
+    this.id = const Value.absent(),
+    this.createdAt = const Value.absent(),
+    this.updatedAt = const Value.absent(),
+    this.ownerId = const Value.absent(),
+    this.name = const Value.absent(),
+    this.faceAssetId = const Value.absent(),
+    this.isFavorite = const Value.absent(),
+    this.isHidden = const Value.absent(),
+    this.color = const Value.absent(),
+    this.birthDate = const Value.absent(),
+  });
+  PersonEntityCompanion.insert({
+    required String id,
+    this.createdAt = const Value.absent(),
+    this.updatedAt = const Value.absent(),
+    required String ownerId,
+    required String name,
+    this.faceAssetId = const Value.absent(),
+    required bool isFavorite,
+    required bool isHidden,
+    this.color = const Value.absent(),
+    this.birthDate = const Value.absent(),
+  }) : id = Value(id),
+       ownerId = Value(ownerId),
+       name = Value(name),
+       isFavorite = Value(isFavorite),
+       isHidden = Value(isHidden);
+  static Insertable<PersonEntityData> custom({
+    Expression<String>? id,
+    Expression<DateTime>? createdAt,
+    Expression<DateTime>? updatedAt,
+    Expression<String>? ownerId,
+    Expression<String>? name,
+    Expression<String>? faceAssetId,
+    Expression<bool>? isFavorite,
+    Expression<bool>? isHidden,
+    Expression<String>? color,
+    Expression<DateTime>? birthDate,
+  }) {
+    return RawValuesInsertable({
+      if (id != null) 'id': id,
+      if (createdAt != null) 'created_at': createdAt,
+      if (updatedAt != null) 'updated_at': updatedAt,
+      if (ownerId != null) 'owner_id': ownerId,
+      if (name != null) 'name': name,
+      if (faceAssetId != null) 'face_asset_id': faceAssetId,
+      if (isFavorite != null) 'is_favorite': isFavorite,
+      if (isHidden != null) 'is_hidden': isHidden,
+      if (color != null) 'color': color,
+      if (birthDate != null) 'birth_date': birthDate,
+    });
+  }
+
+  PersonEntityCompanion copyWith({
+    Value<String>? id,
+    Value<DateTime>? createdAt,
+    Value<DateTime>? updatedAt,
+    Value<String>? ownerId,
+    Value<String>? name,
+    Value<String?>? faceAssetId,
+    Value<bool>? isFavorite,
+    Value<bool>? isHidden,
+    Value<String?>? color,
+    Value<DateTime?>? birthDate,
+  }) {
+    return PersonEntityCompanion(
+      id: id ?? this.id,
+      createdAt: createdAt ?? this.createdAt,
+      updatedAt: updatedAt ?? this.updatedAt,
+      ownerId: ownerId ?? this.ownerId,
+      name: name ?? this.name,
+      faceAssetId: faceAssetId ?? this.faceAssetId,
+      isFavorite: isFavorite ?? this.isFavorite,
+      isHidden: isHidden ?? this.isHidden,
+      color: color ?? this.color,
+      birthDate: birthDate ?? this.birthDate,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (id.present) {
+      map['id'] = Variable<String>(id.value);
+    }
+    if (createdAt.present) {
+      map['created_at'] = Variable<DateTime>(createdAt.value);
+    }
+    if (updatedAt.present) {
+      map['updated_at'] = Variable<DateTime>(updatedAt.value);
+    }
+    if (ownerId.present) {
+      map['owner_id'] = Variable<String>(ownerId.value);
+    }
+    if (name.present) {
+      map['name'] = Variable<String>(name.value);
+    }
+    if (faceAssetId.present) {
+      map['face_asset_id'] = Variable<String>(faceAssetId.value);
+    }
+    if (isFavorite.present) {
+      map['is_favorite'] = Variable<bool>(isFavorite.value);
+    }
+    if (isHidden.present) {
+      map['is_hidden'] = Variable<bool>(isHidden.value);
+    }
+    if (color.present) {
+      map['color'] = Variable<String>(color.value);
+    }
+    if (birthDate.present) {
+      map['birth_date'] = Variable<DateTime>(birthDate.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('PersonEntityCompanion(')
+          ..write('id: $id, ')
+          ..write('createdAt: $createdAt, ')
+          ..write('updatedAt: $updatedAt, ')
+          ..write('ownerId: $ownerId, ')
+          ..write('name: $name, ')
+          ..write('faceAssetId: $faceAssetId, ')
+          ..write('isFavorite: $isFavorite, ')
+          ..write('isHidden: $isHidden, ')
+          ..write('color: $color, ')
+          ..write('birthDate: $birthDate')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class AssetFaceEntity extends Table
+    with TableInfo<AssetFaceEntity, AssetFaceEntityData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  AssetFaceEntity(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<String> id = GeneratedColumn<String>(
+    'id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+  );
+  late final GeneratedColumn<String> assetId = GeneratedColumn<String>(
+    'asset_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+    defaultConstraints: GeneratedColumn.constraintIsAlways(
+      'REFERENCES remote_asset_entity (id) ON DELETE CASCADE',
+    ),
+  );
+  late final GeneratedColumn<String> personId = GeneratedColumn<String>(
+    'person_id',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+    defaultConstraints: GeneratedColumn.constraintIsAlways(
+      'REFERENCES person_entity (id) ON DELETE SET NULL',
+    ),
+  );
+  late final GeneratedColumn<int> imageWidth = GeneratedColumn<int>(
+    'image_width',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+  );
+  late final GeneratedColumn<int> imageHeight = GeneratedColumn<int>(
+    'image_height',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+  );
+  late final GeneratedColumn<int> boundingBoxX1 = GeneratedColumn<int>(
+    'bounding_box_x1',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+  );
+  late final GeneratedColumn<int> boundingBoxY1 = GeneratedColumn<int>(
+    'bounding_box_y1',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+  );
+  late final GeneratedColumn<int> boundingBoxX2 = GeneratedColumn<int>(
+    'bounding_box_x2',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+  );
+  late final GeneratedColumn<int> boundingBoxY2 = GeneratedColumn<int>(
+    'bounding_box_y2',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+  );
+  late final GeneratedColumn<String> sourceType = GeneratedColumn<String>(
+    'source_type',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+  );
+  @override
+  List<GeneratedColumn> get $columns => [
+    id,
+    assetId,
+    personId,
+    imageWidth,
+    imageHeight,
+    boundingBoxX1,
+    boundingBoxY1,
+    boundingBoxX2,
+    boundingBoxY2,
+    sourceType,
+  ];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'asset_face_entity';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {id};
+  @override
+  AssetFaceEntityData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return AssetFaceEntityData(
+      id: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}id'],
+      )!,
+      assetId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}asset_id'],
+      )!,
+      personId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}person_id'],
+      ),
+      imageWidth: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}image_width'],
+      )!,
+      imageHeight: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}image_height'],
+      )!,
+      boundingBoxX1: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}bounding_box_x1'],
+      )!,
+      boundingBoxY1: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}bounding_box_y1'],
+      )!,
+      boundingBoxX2: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}bounding_box_x2'],
+      )!,
+      boundingBoxY2: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}bounding_box_y2'],
+      )!,
+      sourceType: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}source_type'],
+      )!,
+    );
+  }
+
+  @override
+  AssetFaceEntity createAlias(String alias) {
+    return AssetFaceEntity(attachedDatabase, alias);
+  }
+
+  @override
+  bool get withoutRowId => true;
+  @override
+  bool get isStrict => true;
+}
+
+class AssetFaceEntityData extends DataClass
+    implements Insertable<AssetFaceEntityData> {
+  final String id;
+  final String assetId;
+  final String? personId;
+  final int imageWidth;
+  final int imageHeight;
+  final int boundingBoxX1;
+  final int boundingBoxY1;
+  final int boundingBoxX2;
+  final int boundingBoxY2;
+  final String sourceType;
+  const AssetFaceEntityData({
+    required this.id,
+    required this.assetId,
+    this.personId,
+    required this.imageWidth,
+    required this.imageHeight,
+    required this.boundingBoxX1,
+    required this.boundingBoxY1,
+    required this.boundingBoxX2,
+    required this.boundingBoxY2,
+    required this.sourceType,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['id'] = Variable<String>(id);
+    map['asset_id'] = Variable<String>(assetId);
+    if (!nullToAbsent || personId != null) {
+      map['person_id'] = Variable<String>(personId);
+    }
+    map['image_width'] = Variable<int>(imageWidth);
+    map['image_height'] = Variable<int>(imageHeight);
+    map['bounding_box_x1'] = Variable<int>(boundingBoxX1);
+    map['bounding_box_y1'] = Variable<int>(boundingBoxY1);
+    map['bounding_box_x2'] = Variable<int>(boundingBoxX2);
+    map['bounding_box_y2'] = Variable<int>(boundingBoxY2);
+    map['source_type'] = Variable<String>(sourceType);
+    return map;
+  }
+
+  factory AssetFaceEntityData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return AssetFaceEntityData(
+      id: serializer.fromJson<String>(json['id']),
+      assetId: serializer.fromJson<String>(json['assetId']),
+      personId: serializer.fromJson<String?>(json['personId']),
+      imageWidth: serializer.fromJson<int>(json['imageWidth']),
+      imageHeight: serializer.fromJson<int>(json['imageHeight']),
+      boundingBoxX1: serializer.fromJson<int>(json['boundingBoxX1']),
+      boundingBoxY1: serializer.fromJson<int>(json['boundingBoxY1']),
+      boundingBoxX2: serializer.fromJson<int>(json['boundingBoxX2']),
+      boundingBoxY2: serializer.fromJson<int>(json['boundingBoxY2']),
+      sourceType: serializer.fromJson<String>(json['sourceType']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'id': serializer.toJson<String>(id),
+      'assetId': serializer.toJson<String>(assetId),
+      'personId': serializer.toJson<String?>(personId),
+      'imageWidth': serializer.toJson<int>(imageWidth),
+      'imageHeight': serializer.toJson<int>(imageHeight),
+      'boundingBoxX1': serializer.toJson<int>(boundingBoxX1),
+      'boundingBoxY1': serializer.toJson<int>(boundingBoxY1),
+      'boundingBoxX2': serializer.toJson<int>(boundingBoxX2),
+      'boundingBoxY2': serializer.toJson<int>(boundingBoxY2),
+      'sourceType': serializer.toJson<String>(sourceType),
+    };
+  }
+
+  AssetFaceEntityData copyWith({
+    String? id,
+    String? assetId,
+    Value<String?> personId = const Value.absent(),
+    int? imageWidth,
+    int? imageHeight,
+    int? boundingBoxX1,
+    int? boundingBoxY1,
+    int? boundingBoxX2,
+    int? boundingBoxY2,
+    String? sourceType,
+  }) => AssetFaceEntityData(
+    id: id ?? this.id,
+    assetId: assetId ?? this.assetId,
+    personId: personId.present ? personId.value : this.personId,
+    imageWidth: imageWidth ?? this.imageWidth,
+    imageHeight: imageHeight ?? this.imageHeight,
+    boundingBoxX1: boundingBoxX1 ?? this.boundingBoxX1,
+    boundingBoxY1: boundingBoxY1 ?? this.boundingBoxY1,
+    boundingBoxX2: boundingBoxX2 ?? this.boundingBoxX2,
+    boundingBoxY2: boundingBoxY2 ?? this.boundingBoxY2,
+    sourceType: sourceType ?? this.sourceType,
+  );
+  AssetFaceEntityData copyWithCompanion(AssetFaceEntityCompanion data) {
+    return AssetFaceEntityData(
+      id: data.id.present ? data.id.value : this.id,
+      assetId: data.assetId.present ? data.assetId.value : this.assetId,
+      personId: data.personId.present ? data.personId.value : this.personId,
+      imageWidth: data.imageWidth.present
+          ? data.imageWidth.value
+          : this.imageWidth,
+      imageHeight: data.imageHeight.present
+          ? data.imageHeight.value
+          : this.imageHeight,
+      boundingBoxX1: data.boundingBoxX1.present
+          ? data.boundingBoxX1.value
+          : this.boundingBoxX1,
+      boundingBoxY1: data.boundingBoxY1.present
+          ? data.boundingBoxY1.value
+          : this.boundingBoxY1,
+      boundingBoxX2: data.boundingBoxX2.present
+          ? data.boundingBoxX2.value
+          : this.boundingBoxX2,
+      boundingBoxY2: data.boundingBoxY2.present
+          ? data.boundingBoxY2.value
+          : this.boundingBoxY2,
+      sourceType: data.sourceType.present
+          ? data.sourceType.value
+          : this.sourceType,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('AssetFaceEntityData(')
+          ..write('id: $id, ')
+          ..write('assetId: $assetId, ')
+          ..write('personId: $personId, ')
+          ..write('imageWidth: $imageWidth, ')
+          ..write('imageHeight: $imageHeight, ')
+          ..write('boundingBoxX1: $boundingBoxX1, ')
+          ..write('boundingBoxY1: $boundingBoxY1, ')
+          ..write('boundingBoxX2: $boundingBoxX2, ')
+          ..write('boundingBoxY2: $boundingBoxY2, ')
+          ..write('sourceType: $sourceType')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(
+    id,
+    assetId,
+    personId,
+    imageWidth,
+    imageHeight,
+    boundingBoxX1,
+    boundingBoxY1,
+    boundingBoxX2,
+    boundingBoxY2,
+    sourceType,
+  );
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is AssetFaceEntityData &&
+          other.id == this.id &&
+          other.assetId == this.assetId &&
+          other.personId == this.personId &&
+          other.imageWidth == this.imageWidth &&
+          other.imageHeight == this.imageHeight &&
+          other.boundingBoxX1 == this.boundingBoxX1 &&
+          other.boundingBoxY1 == this.boundingBoxY1 &&
+          other.boundingBoxX2 == this.boundingBoxX2 &&
+          other.boundingBoxY2 == this.boundingBoxY2 &&
+          other.sourceType == this.sourceType);
+}
+
+class AssetFaceEntityCompanion extends UpdateCompanion<AssetFaceEntityData> {
+  final Value<String> id;
+  final Value<String> assetId;
+  final Value<String?> personId;
+  final Value<int> imageWidth;
+  final Value<int> imageHeight;
+  final Value<int> boundingBoxX1;
+  final Value<int> boundingBoxY1;
+  final Value<int> boundingBoxX2;
+  final Value<int> boundingBoxY2;
+  final Value<String> sourceType;
+  const AssetFaceEntityCompanion({
+    this.id = const Value.absent(),
+    this.assetId = const Value.absent(),
+    this.personId = const Value.absent(),
+    this.imageWidth = const Value.absent(),
+    this.imageHeight = const Value.absent(),
+    this.boundingBoxX1 = const Value.absent(),
+    this.boundingBoxY1 = const Value.absent(),
+    this.boundingBoxX2 = const Value.absent(),
+    this.boundingBoxY2 = const Value.absent(),
+    this.sourceType = const Value.absent(),
+  });
+  AssetFaceEntityCompanion.insert({
+    required String id,
+    required String assetId,
+    this.personId = const Value.absent(),
+    required int imageWidth,
+    required int imageHeight,
+    required int boundingBoxX1,
+    required int boundingBoxY1,
+    required int boundingBoxX2,
+    required int boundingBoxY2,
+    required String sourceType,
+  }) : id = Value(id),
+       assetId = Value(assetId),
+       imageWidth = Value(imageWidth),
+       imageHeight = Value(imageHeight),
+       boundingBoxX1 = Value(boundingBoxX1),
+       boundingBoxY1 = Value(boundingBoxY1),
+       boundingBoxX2 = Value(boundingBoxX2),
+       boundingBoxY2 = Value(boundingBoxY2),
+       sourceType = Value(sourceType);
+  static Insertable<AssetFaceEntityData> custom({
+    Expression<String>? id,
+    Expression<String>? assetId,
+    Expression<String>? personId,
+    Expression<int>? imageWidth,
+    Expression<int>? imageHeight,
+    Expression<int>? boundingBoxX1,
+    Expression<int>? boundingBoxY1,
+    Expression<int>? boundingBoxX2,
+    Expression<int>? boundingBoxY2,
+    Expression<String>? sourceType,
+  }) {
+    return RawValuesInsertable({
+      if (id != null) 'id': id,
+      if (assetId != null) 'asset_id': assetId,
+      if (personId != null) 'person_id': personId,
+      if (imageWidth != null) 'image_width': imageWidth,
+      if (imageHeight != null) 'image_height': imageHeight,
+      if (boundingBoxX1 != null) 'bounding_box_x1': boundingBoxX1,
+      if (boundingBoxY1 != null) 'bounding_box_y1': boundingBoxY1,
+      if (boundingBoxX2 != null) 'bounding_box_x2': boundingBoxX2,
+      if (boundingBoxY2 != null) 'bounding_box_y2': boundingBoxY2,
+      if (sourceType != null) 'source_type': sourceType,
+    });
+  }
+
+  AssetFaceEntityCompanion copyWith({
+    Value<String>? id,
+    Value<String>? assetId,
+    Value<String?>? personId,
+    Value<int>? imageWidth,
+    Value<int>? imageHeight,
+    Value<int>? boundingBoxX1,
+    Value<int>? boundingBoxY1,
+    Value<int>? boundingBoxX2,
+    Value<int>? boundingBoxY2,
+    Value<String>? sourceType,
+  }) {
+    return AssetFaceEntityCompanion(
+      id: id ?? this.id,
+      assetId: assetId ?? this.assetId,
+      personId: personId ?? this.personId,
+      imageWidth: imageWidth ?? this.imageWidth,
+      imageHeight: imageHeight ?? this.imageHeight,
+      boundingBoxX1: boundingBoxX1 ?? this.boundingBoxX1,
+      boundingBoxY1: boundingBoxY1 ?? this.boundingBoxY1,
+      boundingBoxX2: boundingBoxX2 ?? this.boundingBoxX2,
+      boundingBoxY2: boundingBoxY2 ?? this.boundingBoxY2,
+      sourceType: sourceType ?? this.sourceType,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (id.present) {
+      map['id'] = Variable<String>(id.value);
+    }
+    if (assetId.present) {
+      map['asset_id'] = Variable<String>(assetId.value);
+    }
+    if (personId.present) {
+      map['person_id'] = Variable<String>(personId.value);
+    }
+    if (imageWidth.present) {
+      map['image_width'] = Variable<int>(imageWidth.value);
+    }
+    if (imageHeight.present) {
+      map['image_height'] = Variable<int>(imageHeight.value);
+    }
+    if (boundingBoxX1.present) {
+      map['bounding_box_x1'] = Variable<int>(boundingBoxX1.value);
+    }
+    if (boundingBoxY1.present) {
+      map['bounding_box_y1'] = Variable<int>(boundingBoxY1.value);
+    }
+    if (boundingBoxX2.present) {
+      map['bounding_box_x2'] = Variable<int>(boundingBoxX2.value);
+    }
+    if (boundingBoxY2.present) {
+      map['bounding_box_y2'] = Variable<int>(boundingBoxY2.value);
+    }
+    if (sourceType.present) {
+      map['source_type'] = Variable<String>(sourceType.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('AssetFaceEntityCompanion(')
+          ..write('id: $id, ')
+          ..write('assetId: $assetId, ')
+          ..write('personId: $personId, ')
+          ..write('imageWidth: $imageWidth, ')
+          ..write('imageHeight: $imageHeight, ')
+          ..write('boundingBoxX1: $boundingBoxX1, ')
+          ..write('boundingBoxY1: $boundingBoxY1, ')
+          ..write('boundingBoxX2: $boundingBoxX2, ')
+          ..write('boundingBoxY2: $boundingBoxY2, ')
+          ..write('sourceType: $sourceType')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class StoreEntity extends Table with TableInfo<StoreEntity, StoreEntityData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  StoreEntity(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<int> id = GeneratedColumn<int>(
+    'id',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+  );
+  late final GeneratedColumn<String> stringValue = GeneratedColumn<String>(
+    'string_value',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+  );
+  late final GeneratedColumn<int> intValue = GeneratedColumn<int>(
+    'int_value',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+  );
+  @override
+  List<GeneratedColumn> get $columns => [id, stringValue, intValue];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'store_entity';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {id};
+  @override
+  StoreEntityData map(Map<String, dynamic> data, {String? tablePrefix}) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return StoreEntityData(
+      id: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}id'],
+      )!,
+      stringValue: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}string_value'],
+      ),
+      intValue: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}int_value'],
+      ),
+    );
+  }
+
+  @override
+  StoreEntity createAlias(String alias) {
+    return StoreEntity(attachedDatabase, alias);
+  }
+
+  @override
+  bool get withoutRowId => true;
+  @override
+  bool get isStrict => true;
+}
+
+class StoreEntityData extends DataClass implements Insertable<StoreEntityData> {
+  final int id;
+  final String? stringValue;
+  final int? intValue;
+  const StoreEntityData({required this.id, this.stringValue, this.intValue});
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['id'] = Variable<int>(id);
+    if (!nullToAbsent || stringValue != null) {
+      map['string_value'] = Variable<String>(stringValue);
+    }
+    if (!nullToAbsent || intValue != null) {
+      map['int_value'] = Variable<int>(intValue);
+    }
+    return map;
+  }
+
+  factory StoreEntityData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return StoreEntityData(
+      id: serializer.fromJson<int>(json['id']),
+      stringValue: serializer.fromJson<String?>(json['stringValue']),
+      intValue: serializer.fromJson<int?>(json['intValue']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'id': serializer.toJson<int>(id),
+      'stringValue': serializer.toJson<String?>(stringValue),
+      'intValue': serializer.toJson<int?>(intValue),
+    };
+  }
+
+  StoreEntityData copyWith({
+    int? id,
+    Value<String?> stringValue = const Value.absent(),
+    Value<int?> intValue = const Value.absent(),
+  }) => StoreEntityData(
+    id: id ?? this.id,
+    stringValue: stringValue.present ? stringValue.value : this.stringValue,
+    intValue: intValue.present ? intValue.value : this.intValue,
+  );
+  StoreEntityData copyWithCompanion(StoreEntityCompanion data) {
+    return StoreEntityData(
+      id: data.id.present ? data.id.value : this.id,
+      stringValue: data.stringValue.present
+          ? data.stringValue.value
+          : this.stringValue,
+      intValue: data.intValue.present ? data.intValue.value : this.intValue,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('StoreEntityData(')
+          ..write('id: $id, ')
+          ..write('stringValue: $stringValue, ')
+          ..write('intValue: $intValue')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(id, stringValue, intValue);
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is StoreEntityData &&
+          other.id == this.id &&
+          other.stringValue == this.stringValue &&
+          other.intValue == this.intValue);
+}
+
+class StoreEntityCompanion extends UpdateCompanion<StoreEntityData> {
+  final Value<int> id;
+  final Value<String?> stringValue;
+  final Value<int?> intValue;
+  const StoreEntityCompanion({
+    this.id = const Value.absent(),
+    this.stringValue = const Value.absent(),
+    this.intValue = const Value.absent(),
+  });
+  StoreEntityCompanion.insert({
+    required int id,
+    this.stringValue = const Value.absent(),
+    this.intValue = const Value.absent(),
+  }) : id = Value(id);
+  static Insertable<StoreEntityData> custom({
+    Expression<int>? id,
+    Expression<String>? stringValue,
+    Expression<int>? intValue,
+  }) {
+    return RawValuesInsertable({
+      if (id != null) 'id': id,
+      if (stringValue != null) 'string_value': stringValue,
+      if (intValue != null) 'int_value': intValue,
+    });
+  }
+
+  StoreEntityCompanion copyWith({
+    Value<int>? id,
+    Value<String?>? stringValue,
+    Value<int?>? intValue,
+  }) {
+    return StoreEntityCompanion(
+      id: id ?? this.id,
+      stringValue: stringValue ?? this.stringValue,
+      intValue: intValue ?? this.intValue,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (id.present) {
+      map['id'] = Variable<int>(id.value);
+    }
+    if (stringValue.present) {
+      map['string_value'] = Variable<String>(stringValue.value);
+    }
+    if (intValue.present) {
+      map['int_value'] = Variable<int>(intValue.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('StoreEntityCompanion(')
+          ..write('id: $id, ')
+          ..write('stringValue: $stringValue, ')
+          ..write('intValue: $intValue')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class TrashedLocalAssetEntity extends Table
+    with TableInfo<TrashedLocalAssetEntity, TrashedLocalAssetEntityData> {
+  @override
+  final GeneratedDatabase attachedDatabase;
+  final String? _alias;
+  TrashedLocalAssetEntity(this.attachedDatabase, [this._alias]);
+  late final GeneratedColumn<String> name = GeneratedColumn<String>(
+    'name',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+  );
+  late final GeneratedColumn<int> type = GeneratedColumn<int>(
+    'type',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: true,
+  );
+  late final GeneratedColumn<DateTime> createdAt = GeneratedColumn<DateTime>(
+    'created_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.dateTime,
+    requiredDuringInsert: false,
+    defaultValue: const CustomExpression('CURRENT_TIMESTAMP'),
+  );
+  late final GeneratedColumn<DateTime> updatedAt = GeneratedColumn<DateTime>(
+    'updated_at',
+    aliasedName,
+    false,
+    type: DriftSqlType.dateTime,
+    requiredDuringInsert: false,
+    defaultValue: const CustomExpression('CURRENT_TIMESTAMP'),
+  );
+  late final GeneratedColumn<int> width = GeneratedColumn<int>(
+    'width',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+  );
+  late final GeneratedColumn<int> height = GeneratedColumn<int>(
+    'height',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+  );
+  late final GeneratedColumn<int> durationInSeconds = GeneratedColumn<int>(
+    'duration_in_seconds',
+    aliasedName,
+    true,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+  );
+  late final GeneratedColumn<String> id = GeneratedColumn<String>(
+    'id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+  );
+  late final GeneratedColumn<String> albumId = GeneratedColumn<String>(
+    'album_id',
+    aliasedName,
+    false,
+    type: DriftSqlType.string,
+    requiredDuringInsert: true,
+  );
+  late final GeneratedColumn<String> checksum = GeneratedColumn<String>(
+    'checksum',
+    aliasedName,
+    true,
+    type: DriftSqlType.string,
+    requiredDuringInsert: false,
+  );
+  late final GeneratedColumn<bool> isFavorite = GeneratedColumn<bool>(
+    'is_favorite',
+    aliasedName,
+    false,
+    type: DriftSqlType.bool,
+    requiredDuringInsert: false,
+    defaultConstraints: GeneratedColumn.constraintIsAlways(
+      'CHECK ("is_favorite" IN (0, 1))',
+    ),
+    defaultValue: const CustomExpression('0'),
+  );
+  late final GeneratedColumn<int> orientation = GeneratedColumn<int>(
+    'orientation',
+    aliasedName,
+    false,
+    type: DriftSqlType.int,
+    requiredDuringInsert: false,
+    defaultValue: const CustomExpression('0'),
+  );
+  @override
+  List<GeneratedColumn> get $columns => [
+    name,
+    type,
+    createdAt,
+    updatedAt,
+    width,
+    height,
+    durationInSeconds,
+    id,
+    albumId,
+    checksum,
+    isFavorite,
+    orientation,
+  ];
+  @override
+  String get aliasedName => _alias ?? actualTableName;
+  @override
+  String get actualTableName => $name;
+  static const String $name = 'trashed_local_asset_entity';
+  @override
+  Set<GeneratedColumn> get $primaryKey => {id, albumId};
+  @override
+  TrashedLocalAssetEntityData map(
+    Map<String, dynamic> data, {
+    String? tablePrefix,
+  }) {
+    final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : '';
+    return TrashedLocalAssetEntityData(
+      name: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}name'],
+      )!,
+      type: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}type'],
+      )!,
+      createdAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.dateTime,
+        data['${effectivePrefix}created_at'],
+      )!,
+      updatedAt: attachedDatabase.typeMapping.read(
+        DriftSqlType.dateTime,
+        data['${effectivePrefix}updated_at'],
+      )!,
+      width: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}width'],
+      ),
+      height: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}height'],
+      ),
+      durationInSeconds: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}duration_in_seconds'],
+      ),
+      id: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}id'],
+      )!,
+      albumId: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}album_id'],
+      )!,
+      checksum: attachedDatabase.typeMapping.read(
+        DriftSqlType.string,
+        data['${effectivePrefix}checksum'],
+      ),
+      isFavorite: attachedDatabase.typeMapping.read(
+        DriftSqlType.bool,
+        data['${effectivePrefix}is_favorite'],
+      )!,
+      orientation: attachedDatabase.typeMapping.read(
+        DriftSqlType.int,
+        data['${effectivePrefix}orientation'],
+      )!,
+    );
+  }
+
+  @override
+  TrashedLocalAssetEntity createAlias(String alias) {
+    return TrashedLocalAssetEntity(attachedDatabase, alias);
+  }
+
+  @override
+  bool get withoutRowId => true;
+  @override
+  bool get isStrict => true;
+}
+
+class TrashedLocalAssetEntityData extends DataClass
+    implements Insertable<TrashedLocalAssetEntityData> {
+  final String name;
+  final int type;
+  final DateTime createdAt;
+  final DateTime updatedAt;
+  final int? width;
+  final int? height;
+  final int? durationInSeconds;
+  final String id;
+  final String albumId;
+  final String? checksum;
+  final bool isFavorite;
+  final int orientation;
+  const TrashedLocalAssetEntityData({
+    required this.name,
+    required this.type,
+    required this.createdAt,
+    required this.updatedAt,
+    this.width,
+    this.height,
+    this.durationInSeconds,
+    required this.id,
+    required this.albumId,
+    this.checksum,
+    required this.isFavorite,
+    required this.orientation,
+  });
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    map['name'] = Variable<String>(name);
+    map['type'] = Variable<int>(type);
+    map['created_at'] = Variable<DateTime>(createdAt);
+    map['updated_at'] = Variable<DateTime>(updatedAt);
+    if (!nullToAbsent || width != null) {
+      map['width'] = Variable<int>(width);
+    }
+    if (!nullToAbsent || height != null) {
+      map['height'] = Variable<int>(height);
+    }
+    if (!nullToAbsent || durationInSeconds != null) {
+      map['duration_in_seconds'] = Variable<int>(durationInSeconds);
+    }
+    map['id'] = Variable<String>(id);
+    map['album_id'] = Variable<String>(albumId);
+    if (!nullToAbsent || checksum != null) {
+      map['checksum'] = Variable<String>(checksum);
+    }
+    map['is_favorite'] = Variable<bool>(isFavorite);
+    map['orientation'] = Variable<int>(orientation);
+    return map;
+  }
+
+  factory TrashedLocalAssetEntityData.fromJson(
+    Map<String, dynamic> json, {
+    ValueSerializer? serializer,
+  }) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return TrashedLocalAssetEntityData(
+      name: serializer.fromJson<String>(json['name']),
+      type: serializer.fromJson<int>(json['type']),
+      createdAt: serializer.fromJson<DateTime>(json['createdAt']),
+      updatedAt: serializer.fromJson<DateTime>(json['updatedAt']),
+      width: serializer.fromJson<int?>(json['width']),
+      height: serializer.fromJson<int?>(json['height']),
+      durationInSeconds: serializer.fromJson<int?>(json['durationInSeconds']),
+      id: serializer.fromJson<String>(json['id']),
+      albumId: serializer.fromJson<String>(json['albumId']),
+      checksum: serializer.fromJson<String?>(json['checksum']),
+      isFavorite: serializer.fromJson<bool>(json['isFavorite']),
+      orientation: serializer.fromJson<int>(json['orientation']),
+    );
+  }
+  @override
+  Map<String, dynamic> toJson({ValueSerializer? serializer}) {
+    serializer ??= driftRuntimeOptions.defaultSerializer;
+    return <String, dynamic>{
+      'name': serializer.toJson<String>(name),
+      'type': serializer.toJson<int>(type),
+      'createdAt': serializer.toJson<DateTime>(createdAt),
+      'updatedAt': serializer.toJson<DateTime>(updatedAt),
+      'width': serializer.toJson<int?>(width),
+      'height': serializer.toJson<int?>(height),
+      'durationInSeconds': serializer.toJson<int?>(durationInSeconds),
+      'id': serializer.toJson<String>(id),
+      'albumId': serializer.toJson<String>(albumId),
+      'checksum': serializer.toJson<String?>(checksum),
+      'isFavorite': serializer.toJson<bool>(isFavorite),
+      'orientation': serializer.toJson<int>(orientation),
+    };
+  }
+
+  TrashedLocalAssetEntityData copyWith({
+    String? name,
+    int? type,
+    DateTime? createdAt,
+    DateTime? updatedAt,
+    Value<int?> width = const Value.absent(),
+    Value<int?> height = const Value.absent(),
+    Value<int?> durationInSeconds = const Value.absent(),
+    String? id,
+    String? albumId,
+    Value<String?> checksum = const Value.absent(),
+    bool? isFavorite,
+    int? orientation,
+  }) => TrashedLocalAssetEntityData(
+    name: name ?? this.name,
+    type: type ?? this.type,
+    createdAt: createdAt ?? this.createdAt,
+    updatedAt: updatedAt ?? this.updatedAt,
+    width: width.present ? width.value : this.width,
+    height: height.present ? height.value : this.height,
+    durationInSeconds: durationInSeconds.present
+        ? durationInSeconds.value
+        : this.durationInSeconds,
+    id: id ?? this.id,
+    albumId: albumId ?? this.albumId,
+    checksum: checksum.present ? checksum.value : this.checksum,
+    isFavorite: isFavorite ?? this.isFavorite,
+    orientation: orientation ?? this.orientation,
+  );
+  TrashedLocalAssetEntityData copyWithCompanion(
+    TrashedLocalAssetEntityCompanion data,
+  ) {
+    return TrashedLocalAssetEntityData(
+      name: data.name.present ? data.name.value : this.name,
+      type: data.type.present ? data.type.value : this.type,
+      createdAt: data.createdAt.present ? data.createdAt.value : this.createdAt,
+      updatedAt: data.updatedAt.present ? data.updatedAt.value : this.updatedAt,
+      width: data.width.present ? data.width.value : this.width,
+      height: data.height.present ? data.height.value : this.height,
+      durationInSeconds: data.durationInSeconds.present
+          ? data.durationInSeconds.value
+          : this.durationInSeconds,
+      id: data.id.present ? data.id.value : this.id,
+      albumId: data.albumId.present ? data.albumId.value : this.albumId,
+      checksum: data.checksum.present ? data.checksum.value : this.checksum,
+      isFavorite: data.isFavorite.present
+          ? data.isFavorite.value
+          : this.isFavorite,
+      orientation: data.orientation.present
+          ? data.orientation.value
+          : this.orientation,
+    );
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('TrashedLocalAssetEntityData(')
+          ..write('name: $name, ')
+          ..write('type: $type, ')
+          ..write('createdAt: $createdAt, ')
+          ..write('updatedAt: $updatedAt, ')
+          ..write('width: $width, ')
+          ..write('height: $height, ')
+          ..write('durationInSeconds: $durationInSeconds, ')
+          ..write('id: $id, ')
+          ..write('albumId: $albumId, ')
+          ..write('checksum: $checksum, ')
+          ..write('isFavorite: $isFavorite, ')
+          ..write('orientation: $orientation')
+          ..write(')'))
+        .toString();
+  }
+
+  @override
+  int get hashCode => Object.hash(
+    name,
+    type,
+    createdAt,
+    updatedAt,
+    width,
+    height,
+    durationInSeconds,
+    id,
+    albumId,
+    checksum,
+    isFavorite,
+    orientation,
+  );
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      (other is TrashedLocalAssetEntityData &&
+          other.name == this.name &&
+          other.type == this.type &&
+          other.createdAt == this.createdAt &&
+          other.updatedAt == this.updatedAt &&
+          other.width == this.width &&
+          other.height == this.height &&
+          other.durationInSeconds == this.durationInSeconds &&
+          other.id == this.id &&
+          other.albumId == this.albumId &&
+          other.checksum == this.checksum &&
+          other.isFavorite == this.isFavorite &&
+          other.orientation == this.orientation);
+}
+
+class TrashedLocalAssetEntityCompanion
+    extends UpdateCompanion<TrashedLocalAssetEntityData> {
+  final Value<String> name;
+  final Value<int> type;
+  final Value<DateTime> createdAt;
+  final Value<DateTime> updatedAt;
+  final Value<int?> width;
+  final Value<int?> height;
+  final Value<int?> durationInSeconds;
+  final Value<String> id;
+  final Value<String> albumId;
+  final Value<String?> checksum;
+  final Value<bool> isFavorite;
+  final Value<int> orientation;
+  const TrashedLocalAssetEntityCompanion({
+    this.name = const Value.absent(),
+    this.type = const Value.absent(),
+    this.createdAt = const Value.absent(),
+    this.updatedAt = const Value.absent(),
+    this.width = const Value.absent(),
+    this.height = const Value.absent(),
+    this.durationInSeconds = const Value.absent(),
+    this.id = const Value.absent(),
+    this.albumId = const Value.absent(),
+    this.checksum = const Value.absent(),
+    this.isFavorite = const Value.absent(),
+    this.orientation = const Value.absent(),
+  });
+  TrashedLocalAssetEntityCompanion.insert({
+    required String name,
+    required int type,
+    this.createdAt = const Value.absent(),
+    this.updatedAt = const Value.absent(),
+    this.width = const Value.absent(),
+    this.height = const Value.absent(),
+    this.durationInSeconds = const Value.absent(),
+    required String id,
+    required String albumId,
+    this.checksum = const Value.absent(),
+    this.isFavorite = const Value.absent(),
+    this.orientation = const Value.absent(),
+  }) : name = Value(name),
+       type = Value(type),
+       id = Value(id),
+       albumId = Value(albumId);
+  static Insertable<TrashedLocalAssetEntityData> custom({
+    Expression<String>? name,
+    Expression<int>? type,
+    Expression<DateTime>? createdAt,
+    Expression<DateTime>? updatedAt,
+    Expression<int>? width,
+    Expression<int>? height,
+    Expression<int>? durationInSeconds,
+    Expression<String>? id,
+    Expression<String>? albumId,
+    Expression<String>? checksum,
+    Expression<bool>? isFavorite,
+    Expression<int>? orientation,
+  }) {
+    return RawValuesInsertable({
+      if (name != null) 'name': name,
+      if (type != null) 'type': type,
+      if (createdAt != null) 'created_at': createdAt,
+      if (updatedAt != null) 'updated_at': updatedAt,
+      if (width != null) 'width': width,
+      if (height != null) 'height': height,
+      if (durationInSeconds != null) 'duration_in_seconds': durationInSeconds,
+      if (id != null) 'id': id,
+      if (albumId != null) 'album_id': albumId,
+      if (checksum != null) 'checksum': checksum,
+      if (isFavorite != null) 'is_favorite': isFavorite,
+      if (orientation != null) 'orientation': orientation,
+    });
+  }
+
+  TrashedLocalAssetEntityCompanion copyWith({
+    Value<String>? name,
+    Value<int>? type,
+    Value<DateTime>? createdAt,
+    Value<DateTime>? updatedAt,
+    Value<int?>? width,
+    Value<int?>? height,
+    Value<int?>? durationInSeconds,
+    Value<String>? id,
+    Value<String>? albumId,
+    Value<String?>? checksum,
+    Value<bool>? isFavorite,
+    Value<int>? orientation,
+  }) {
+    return TrashedLocalAssetEntityCompanion(
+      name: name ?? this.name,
+      type: type ?? this.type,
+      createdAt: createdAt ?? this.createdAt,
+      updatedAt: updatedAt ?? this.updatedAt,
+      width: width ?? this.width,
+      height: height ?? this.height,
+      durationInSeconds: durationInSeconds ?? this.durationInSeconds,
+      id: id ?? this.id,
+      albumId: albumId ?? this.albumId,
+      checksum: checksum ?? this.checksum,
+      isFavorite: isFavorite ?? this.isFavorite,
+      orientation: orientation ?? this.orientation,
+    );
+  }
+
+  @override
+  Map<String, Expression> toColumns(bool nullToAbsent) {
+    final map = <String, Expression>{};
+    if (name.present) {
+      map['name'] = Variable<String>(name.value);
+    }
+    if (type.present) {
+      map['type'] = Variable<int>(type.value);
+    }
+    if (createdAt.present) {
+      map['created_at'] = Variable<DateTime>(createdAt.value);
+    }
+    if (updatedAt.present) {
+      map['updated_at'] = Variable<DateTime>(updatedAt.value);
+    }
+    if (width.present) {
+      map['width'] = Variable<int>(width.value);
+    }
+    if (height.present) {
+      map['height'] = Variable<int>(height.value);
+    }
+    if (durationInSeconds.present) {
+      map['duration_in_seconds'] = Variable<int>(durationInSeconds.value);
+    }
+    if (id.present) {
+      map['id'] = Variable<String>(id.value);
+    }
+    if (albumId.present) {
+      map['album_id'] = Variable<String>(albumId.value);
+    }
+    if (checksum.present) {
+      map['checksum'] = Variable<String>(checksum.value);
+    }
+    if (isFavorite.present) {
+      map['is_favorite'] = Variable<bool>(isFavorite.value);
+    }
+    if (orientation.present) {
+      map['orientation'] = Variable<int>(orientation.value);
+    }
+    return map;
+  }
+
+  @override
+  String toString() {
+    return (StringBuffer('TrashedLocalAssetEntityCompanion(')
+          ..write('name: $name, ')
+          ..write('type: $type, ')
+          ..write('createdAt: $createdAt, ')
+          ..write('updatedAt: $updatedAt, ')
+          ..write('width: $width, ')
+          ..write('height: $height, ')
+          ..write('durationInSeconds: $durationInSeconds, ')
+          ..write('id: $id, ')
+          ..write('albumId: $albumId, ')
+          ..write('checksum: $checksum, ')
+          ..write('isFavorite: $isFavorite, ')
+          ..write('orientation: $orientation')
+          ..write(')'))
+        .toString();
+  }
+}
+
+class DatabaseAtV13 extends GeneratedDatabase {
+  DatabaseAtV13(QueryExecutor e) : super(e);
+  late final UserEntity userEntity = UserEntity(this);
+  late final RemoteAssetEntity remoteAssetEntity = RemoteAssetEntity(this);
+  late final StackEntity stackEntity = StackEntity(this);
+  late final LocalAssetEntity localAssetEntity = LocalAssetEntity(this);
+  late final RemoteAlbumEntity remoteAlbumEntity = RemoteAlbumEntity(this);
+  late final LocalAlbumEntity localAlbumEntity = LocalAlbumEntity(this);
+  late final LocalAlbumAssetEntity localAlbumAssetEntity =
+      LocalAlbumAssetEntity(this);
+  late final Index idxLocalAssetChecksum = Index(
+    'idx_local_asset_checksum',
+    'CREATE INDEX IF NOT EXISTS idx_local_asset_checksum ON local_asset_entity (checksum)',
+  );
+  late final Index idxRemoteAssetOwnerChecksum = Index(
+    'idx_remote_asset_owner_checksum',
+    'CREATE INDEX IF NOT EXISTS idx_remote_asset_owner_checksum ON remote_asset_entity (owner_id, checksum)',
+  );
+  late final Index uQRemoteAssetsOwnerChecksum = Index(
+    'UQ_remote_assets_owner_checksum',
+    'CREATE UNIQUE INDEX IF NOT EXISTS UQ_remote_assets_owner_checksum ON remote_asset_entity (owner_id, checksum) WHERE(library_id IS NULL)',
+  );
+  late final Index uQRemoteAssetsOwnerLibraryChecksum = Index(
+    'UQ_remote_assets_owner_library_checksum',
+    'CREATE UNIQUE INDEX IF NOT EXISTS UQ_remote_assets_owner_library_checksum ON remote_asset_entity (owner_id, library_id, checksum) WHERE(library_id IS NOT NULL)',
+  );
+  late final Index idxRemoteAssetChecksum = Index(
+    'idx_remote_asset_checksum',
+    'CREATE INDEX IF NOT EXISTS idx_remote_asset_checksum ON remote_asset_entity (checksum)',
+  );
+  late final AuthUserEntity authUserEntity = AuthUserEntity(this);
+  late final UserMetadataEntity userMetadataEntity = UserMetadataEntity(this);
+  late final PartnerEntity partnerEntity = PartnerEntity(this);
+  late final RemoteExifEntity remoteExifEntity = RemoteExifEntity(this);
+  late final RemoteAlbumAssetEntity remoteAlbumAssetEntity =
+      RemoteAlbumAssetEntity(this);
+  late final RemoteAlbumUserEntity remoteAlbumUserEntity =
+      RemoteAlbumUserEntity(this);
+  late final MemoryEntity memoryEntity = MemoryEntity(this);
+  late final MemoryAssetEntity memoryAssetEntity = MemoryAssetEntity(this);
+  late final PersonEntity personEntity = PersonEntity(this);
+  late final AssetFaceEntity assetFaceEntity = AssetFaceEntity(this);
+  late final StoreEntity storeEntity = StoreEntity(this);
+  late final TrashedLocalAssetEntity trashedLocalAssetEntity =
+      TrashedLocalAssetEntity(this);
+  late final Index idxLatLng = Index(
+    'idx_lat_lng',
+    'CREATE INDEX IF NOT EXISTS idx_lat_lng ON remote_exif_entity (latitude, longitude)',
+  );
+  late final Index idxTrashedLocalAssetChecksum = Index(
+    'idx_trashed_local_asset_checksum',
+    'CREATE INDEX IF NOT EXISTS idx_trashed_local_asset_checksum ON trashed_local_asset_entity (checksum)',
+  );
+  late final Index idxTrashedLocalAssetAlbum = Index(
+    'idx_trashed_local_asset_album',
+    'CREATE INDEX IF NOT EXISTS idx_trashed_local_asset_album ON trashed_local_asset_entity (album_id)',
+  );
+  @override
+  Iterable<TableInfo<Table, Object?>> get allTables =>
+      allSchemaEntities.whereType<TableInfo<Table, Object?>>();
+  @override
+  List<DatabaseSchemaEntity> get allSchemaEntities => [
+    userEntity,
+    remoteAssetEntity,
+    stackEntity,
+    localAssetEntity,
+    remoteAlbumEntity,
+    localAlbumEntity,
+    localAlbumAssetEntity,
+    idxLocalAssetChecksum,
+    idxRemoteAssetOwnerChecksum,
+    uQRemoteAssetsOwnerChecksum,
+    uQRemoteAssetsOwnerLibraryChecksum,
+    idxRemoteAssetChecksum,
+    authUserEntity,
+    userMetadataEntity,
+    partnerEntity,
+    remoteExifEntity,
+    remoteAlbumAssetEntity,
+    remoteAlbumUserEntity,
+    memoryEntity,
+    memoryAssetEntity,
+    personEntity,
+    assetFaceEntity,
+    storeEntity,
+    trashedLocalAssetEntity,
+    idxLatLng,
+    idxTrashedLocalAssetChecksum,
+    idxTrashedLocalAssetAlbum,
+  ];
+  @override
+  int get schemaVersion => 13;
+  @override
+  DriftDatabaseOptions get options =>
+      const DriftDatabaseOptions(storeDateTimeAsText: true);
+}
diff --git a/mobile/test/fixtures/sync_stream.stub.dart b/mobile/test/fixtures/sync_stream.stub.dart
index 23c750d6d9..523984f966 100644
--- a/mobile/test/fixtures/sync_stream.stub.dart
+++ b/mobile/test/fixtures/sync_stream.stub.dart
@@ -81,4 +81,67 @@ abstract final class SyncStreamStub {
     data: SyncMemoryAssetDeleteV1(assetId: "asset-2", memoryId: "memory-1"),
     ack: "8",
   );
+
+  static final assetDeleteV1 = SyncEvent(
+    type: SyncEntityType.assetDeleteV1,
+    data: SyncAssetDeleteV1(assetId: "remote-asset"),
+    ack: "asset-delete-ack",
+  );
+
+  static SyncEvent assetTrashed({
+    required String id,
+    required String checksum,
+    required String ack,
+    DateTime? trashedAt,
+  }) {
+    return _assetV1(
+      id: id,
+      checksum: checksum,
+      deletedAt: trashedAt ?? DateTime(2025, 1, 1),
+      ack: ack,
+    );
+  }
+
+  static SyncEvent assetModified({
+    required String id,
+    required String checksum,
+    required String ack,
+  }) {
+    return _assetV1(
+      id: id,
+      checksum: checksum,
+      deletedAt: null,
+      ack: ack,
+    );
+  }
+
+  static SyncEvent _assetV1({
+    required String id,
+    required String checksum,
+    required DateTime? deletedAt,
+    required String ack,
+  }) {
+    return SyncEvent(
+      type: SyncEntityType.assetV1,
+      data: SyncAssetV1(
+        checksum: checksum,
+        deletedAt: deletedAt,
+        duration: '0',
+        fileCreatedAt: DateTime(2025),
+        fileModifiedAt: DateTime(2025, 1, 2),
+        id: id,
+        isFavorite: false,
+        libraryId: null,
+        livePhotoVideoId: null,
+        localDateTime: DateTime(2025, 1, 3),
+        originalFileName: '$id.jpg',
+        ownerId: 'owner',
+        stackId: null,
+        thumbhash: null,
+        type: AssetTypeEnum.IMAGE,
+        visibility: AssetVisibility.timeline,
+      ),
+      ack: ack,
+    );
+  }
 }
diff --git a/mobile/test/infrastructure/repository.mock.dart b/mobile/test/infrastructure/repository.mock.dart
index 44e756e88e..becfafe33d 100644
--- a/mobile/test/infrastructure/repository.mock.dart
+++ b/mobile/test/infrastructure/repository.mock.dart
@@ -8,6 +8,7 @@ import 'package:immich_mobile/infrastructure/repositories/storage.repository.dar
 import 'package:immich_mobile/infrastructure/repositories/store.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/sync_api.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/sync_stream.repository.dart';
+import 'package:immich_mobile/infrastructure/repositories/trashed_local_asset.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/user.repository.dart';
 import 'package:immich_mobile/infrastructure/repositories/user_api.repository.dart';
 import 'package:immich_mobile/repositories/drift_album_api_repository.dart';
@@ -34,6 +35,8 @@ class MockLocalAssetRepository extends Mock implements DriftLocalAssetRepository
 
 class MockDriftLocalAssetRepository extends Mock implements DriftLocalAssetRepository {}
 
+class MockTrashedLocalAssetRepository extends Mock implements DriftTrashedLocalAssetRepository {}
+
 class MockStorageRepository extends Mock implements StorageRepository {}
 
 class MockDriftBackupRepository extends Mock implements DriftBackupRepository {}
diff --git a/mobile/test/mocks/asset_entity.mock.dart b/mobile/test/mocks/asset_entity.mock.dart
new file mode 100644
index 0000000000..fdea58315d
--- /dev/null
+++ b/mobile/test/mocks/asset_entity.mock.dart
@@ -0,0 +1,4 @@
+import 'package:mocktail/mocktail.dart';
+import 'package:photo_manager/photo_manager.dart';
+
+class MockAssetEntity extends Mock implements AssetEntity {}
diff --git a/mobile/test/services/hash_service_test.dart b/mobile/test/services/hash_service_test.dart
index 74b8575e40..9429d434b0 100644
--- a/mobile/test/services/hash_service_test.dart
+++ b/mobile/test/services/hash_service_test.dart
@@ -12,16 +12,14 @@ import 'package:immich_mobile/infrastructure/repositories/device_asset.repositor
 import 'package:immich_mobile/services/background.service.dart';
 import 'package:immich_mobile/services/hash.service.dart';
 import 'package:mocktail/mocktail.dart';
-import 'package:photo_manager/photo_manager.dart';
 
 import '../fixtures/asset.stub.dart';
 import '../infrastructure/repository.mock.dart';
 import '../service.mocks.dart';
+import '../mocks/asset_entity.mock.dart';
 
 class MockAsset extends Mock implements Asset {}
 
-class MockAssetEntity extends Mock implements AssetEntity {}
-
 void main() {
   late HashService sut;
   late BackgroundService mockBackgroundService;
diff --git a/mobile/test/services/upload.service_test.dart b/mobile/test/services/upload.service_test.dart
index b18ad7b7d4..d33126782f 100644
--- a/mobile/test/services/upload.service_test.dart
+++ b/mobile/test/services/upload.service_test.dart
@@ -12,14 +12,12 @@ import 'package:immich_mobile/infrastructure/repositories/store.repository.dart'
 import 'package:immich_mobile/services/app_settings.service.dart';
 import 'package:immich_mobile/services/upload.service.dart';
 import 'package:mocktail/mocktail.dart';
-import 'package:photo_manager/photo_manager.dart';
 
 import '../domain/service.mock.dart';
 import '../fixtures/asset.stub.dart';
 import '../infrastructure/repository.mock.dart';
 import '../repository.mocks.dart';
-
-class MockAssetEntity extends Mock implements AssetEntity {}
+import '../mocks/asset_entity.mock.dart';
 
 void main() {
   late UploadService sut;

From dd393c83461a2d396bc2b9759fb3210059a76735 Mon Sep 17 00:00:00 2001
From: Daniel Dietzler <36593685+danieldietzler@users.noreply.github.com>
Date: Mon, 10 Nov 2025 17:49:46 +0100
Subject: [PATCH 56/84] feat(web): event handler component (#23763)

---
 web/src/lib/components/OnEvents.svelte        | 33 +++++++++++++++++++
 web/src/lib/managers/auth-manager.svelte.ts   |  2 +-
 web/src/lib/managers/event-manager.svelte.ts  | 18 +++++-----
 .../lib/managers/language-manager.svelte.ts   |  4 +--
 web/src/lib/managers/theme-manager.svelte.ts  |  4 +--
 web/src/lib/managers/upload-manager.svelte.ts |  2 +-
 web/src/lib/stores/folders.svelte.ts          |  2 +-
 web/src/lib/stores/memory.store.svelte.ts     |  2 +-
 .../lib/stores/notification-manager.svelte.ts |  4 +--
 web/src/lib/stores/search.svelte.ts           |  2 +-
 web/src/lib/stores/user.store.ts              |  2 +-
 web/src/lib/stores/user.svelte.ts             |  2 +-
 web/src/routes/+layout.svelte                 |  2 +-
 web/src/routes/auth/login/+page.svelte        |  2 +-
 14 files changed, 58 insertions(+), 23 deletions(-)
 create mode 100644 web/src/lib/components/OnEvents.svelte

diff --git a/web/src/lib/components/OnEvents.svelte b/web/src/lib/components/OnEvents.svelte
new file mode 100644
index 0000000000..3933f4df7b
--- /dev/null
+++ b/web/src/lib/components/OnEvents.svelte
@@ -0,0 +1,33 @@
+<script lang="ts">
+  import { eventManager, type Events } from '$lib/managers/event-manager.svelte';
+  import { onMount } from 'svelte';
+
+  type Props = Partial<{
+    [K in keyof Events as `on${K}`]: (...args: Events[K]) => void;
+  }>;
+
+  const props: Props = $props();
+  const unsubscribes: Array<() => void> = [];
+
+  onMount(() => {
+    for (const name of Object.keys(props)) {
+      const event = name.slice(2) as keyof Events;
+      const listener = props[name as keyof Props];
+
+      if (!listener) {
+        continue;
+      }
+
+      const args = [event, listener as (...args: Events[typeof event]) => void] as const;
+
+      eventManager.on(...args);
+      unsubscribes.push(() => eventManager.off(...args));
+    }
+
+    return () => {
+      for (const unsubscribe of unsubscribes) {
+        unsubscribe();
+      }
+    };
+  });
+</script>
diff --git a/web/src/lib/managers/auth-manager.svelte.ts b/web/src/lib/managers/auth-manager.svelte.ts
index 0128892c3f..515fde0996 100644
--- a/web/src/lib/managers/auth-manager.svelte.ts
+++ b/web/src/lib/managers/auth-manager.svelte.ts
@@ -30,7 +30,7 @@ class AuthManager {
         globalThis.location.href = redirectUri;
       }
     } finally {
-      eventManager.emit('auth.logout');
+      eventManager.emit('AuthLogout');
     }
   }
 }
diff --git a/web/src/lib/managers/event-manager.svelte.ts b/web/src/lib/managers/event-manager.svelte.ts
index f8e39411cf..7c7717a4d4 100644
--- a/web/src/lib/managers/event-manager.svelte.ts
+++ b/web/src/lib/managers/event-manager.svelte.ts
@@ -1,6 +1,15 @@
 import type { ThemeSetting } from '$lib/managers/theme-manager.svelte';
 import type { LoginResponseDto } from '@immich/sdk';
 
+export type Events = {
+  AppInit: [];
+  UserLogin: [];
+  AuthLogin: [LoginResponseDto];
+  AuthLogout: [];
+  LanguageChange: [{ name: string; code: string; rtl?: boolean }];
+  ThemeChange: [ThemeSetting];
+};
+
 type Listener<EventMap extends Record<string, unknown[]>, K extends keyof EventMap> = (...params: EventMap[K]) => void;
 
 class EventManager<EventMap extends Record<string, unknown[]>> {
@@ -51,11 +60,4 @@ class EventManager<EventMap extends Record<string, unknown[]>> {
   }
 }
 
-export const eventManager = new EventManager<{
-  'app.init': [];
-  'user.login': [];
-  'auth.login': [LoginResponseDto];
-  'auth.logout': [];
-  'language.change': [{ name: string; code: string; rtl?: boolean }];
-  'theme.change': [ThemeSetting];
-}>();
+export const eventManager = new EventManager<Events>();
diff --git a/web/src/lib/managers/language-manager.svelte.ts b/web/src/lib/managers/language-manager.svelte.ts
index 5acae27aa3..91d621f679 100644
--- a/web/src/lib/managers/language-manager.svelte.ts
+++ b/web/src/lib/managers/language-manager.svelte.ts
@@ -4,7 +4,7 @@ import { lang } from '$lib/stores/preferences.store';
 
 class LanguageManager {
   constructor() {
-    eventManager.on('app.init', () => lang.subscribe((lang) => this.setLanguage(lang)));
+    eventManager.on('AppInit', () => lang.subscribe((lang) => this.setLanguage(lang)));
   }
 
   rtl = $state(false);
@@ -19,7 +19,7 @@ class LanguageManager {
 
     document.body.setAttribute('dir', item.rtl ? 'rtl' : 'ltr');
 
-    eventManager.emit('language.change', item);
+    eventManager.emit('LanguageChange', item);
   }
 }
 
diff --git a/web/src/lib/managers/theme-manager.svelte.ts b/web/src/lib/managers/theme-manager.svelte.ts
index 394c9850de..5095b5739e 100644
--- a/web/src/lib/managers/theme-manager.svelte.ts
+++ b/web/src/lib/managers/theme-manager.svelte.ts
@@ -36,7 +36,7 @@ class ThemeManager {
   isDark = $derived(this.value === Theme.DARK);
 
   constructor() {
-    eventManager.on('app.init', () => this.#onAppInit());
+    eventManager.on('AppInit', () => this.#onAppInit());
   }
 
   setSystem(system: boolean) {
@@ -71,7 +71,7 @@ class ThemeManager {
 
     this.#theme.current = theme;
 
-    eventManager.emit('theme.change', theme);
+    eventManager.emit('ThemeChange', theme);
   }
 }
 
diff --git a/web/src/lib/managers/upload-manager.svelte.ts b/web/src/lib/managers/upload-manager.svelte.ts
index 61c6d73b53..b51756678b 100644
--- a/web/src/lib/managers/upload-manager.svelte.ts
+++ b/web/src/lib/managers/upload-manager.svelte.ts
@@ -6,7 +6,7 @@ class UploadManager {
   mediaTypes = $state<ServerMediaTypesResponseDto>({ image: [], sidecar: [], video: [] });
 
   constructor() {
-    eventManager.on('app.init', () => void this.#loadExtensions()).on('auth.logout', () => void this.reset());
+    eventManager.on('AppInit', () => void this.#loadExtensions()).on('AuthLogout', () => void this.reset());
   }
 
   reset() {
diff --git a/web/src/lib/stores/folders.svelte.ts b/web/src/lib/stores/folders.svelte.ts
index f77b67bb7c..3480e95f28 100644
--- a/web/src/lib/stores/folders.svelte.ts
+++ b/web/src/lib/stores/folders.svelte.ts
@@ -19,7 +19,7 @@ class FoldersStore {
   private assets = $state<AssetCache>({});
 
   constructor() {
-    eventManager.on('auth.logout', () => this.clearCache());
+    eventManager.on('AuthLogout', () => this.clearCache());
   }
 
   async fetchTree(): Promise<TreeNode> {
diff --git a/web/src/lib/stores/memory.store.svelte.ts b/web/src/lib/stores/memory.store.svelte.ts
index bc42053a21..05f45b3d7d 100644
--- a/web/src/lib/stores/memory.store.svelte.ts
+++ b/web/src/lib/stores/memory.store.svelte.ts
@@ -21,7 +21,7 @@ export type MemoryAsset = MemoryIndex & {
 
 class MemoryStoreSvelte {
   constructor() {
-    eventManager.on('auth.logout', () => this.clearCache());
+    eventManager.on('AuthLogout', () => this.clearCache());
   }
 
   memories = $state<MemoryResponseDto[]>([]);
diff --git a/web/src/lib/stores/notification-manager.svelte.ts b/web/src/lib/stores/notification-manager.svelte.ts
index 3eba15deed..a0f0f6bb93 100644
--- a/web/src/lib/stores/notification-manager.svelte.ts
+++ b/web/src/lib/stores/notification-manager.svelte.ts
@@ -9,8 +9,8 @@ class NotificationStore {
   notifications = $state<NotificationDto[]>([]);
 
   constructor() {
-    eventManager.on('auth.login', () => handlePromiseError(this.refresh()));
-    eventManager.on('auth.logout', () => this.clear());
+    eventManager.on('AuthLogin', () => handlePromiseError(this.refresh()));
+    eventManager.on('AuthLogout', () => this.clear());
   }
 
   async refresh() {
diff --git a/web/src/lib/stores/search.svelte.ts b/web/src/lib/stores/search.svelte.ts
index 32f2741955..007c764fcf 100644
--- a/web/src/lib/stores/search.svelte.ts
+++ b/web/src/lib/stores/search.svelte.ts
@@ -5,7 +5,7 @@ class SearchStore {
   isSearchEnabled = $state(false);
 
   constructor() {
-    eventManager.on('auth.logout', () => this.clearCache());
+    eventManager.on('AuthLogout', () => this.clearCache());
   }
 
   clearCache() {
diff --git a/web/src/lib/stores/user.store.ts b/web/src/lib/stores/user.store.ts
index 0790788278..bc23917d22 100644
--- a/web/src/lib/stores/user.store.ts
+++ b/web/src/lib/stores/user.store.ts
@@ -16,4 +16,4 @@ export const resetSavedUser = () => {
   purchaseStore.setPurchaseStatus(false);
 };
 
-eventManager.on('auth.logout', () => resetSavedUser());
+eventManager.on('AuthLogout', () => resetSavedUser());
diff --git a/web/src/lib/stores/user.svelte.ts b/web/src/lib/stores/user.svelte.ts
index 94d73efb9c..f9319fcfa1 100644
--- a/web/src/lib/stores/user.svelte.ts
+++ b/web/src/lib/stores/user.svelte.ts
@@ -26,4 +26,4 @@ const reset = () => {
   Object.assign(userInteraction, defaultUserInteraction);
 };
 
-eventManager.on('auth.logout', () => reset());
+eventManager.on('AuthLogout', () => reset());
diff --git a/web/src/routes/+layout.svelte b/web/src/routes/+layout.svelte
index 979c7b5c42..f5d4619943 100644
--- a/web/src/routes/+layout.svelte
+++ b/web/src/routes/+layout.svelte
@@ -58,7 +58,7 @@
     // if the browser theme changes, changes the Immich theme too
   });
 
-  eventManager.emit('app.init');
+  eventManager.emit('AppInit');
 
   beforeNavigate(({ from, to }) => {
     if (isAssetViewerRoute(from) && isAssetViewerRoute(to)) {
diff --git a/web/src/routes/auth/login/+page.svelte b/web/src/routes/auth/login/+page.svelte
index 9ed89a0c63..352eaed408 100644
--- a/web/src/routes/auth/login/+page.svelte
+++ b/web/src/routes/auth/login/+page.svelte
@@ -27,7 +27,7 @@
 
   const onSuccess = async (user: LoginResponseDto) => {
     await goto(data.continueUrl, { invalidateAll: true });
-    eventManager.emit('auth.login', user);
+    eventManager.emit('AuthLogin', user);
   };
 
   const onFirstLogin = () => goto(AppRoute.AUTH_CHANGE_PASSWORD);

From a4e65a7ea822e9ce406e2a9dd0aca4e1acd92d74 Mon Sep 17 00:00:00 2001
From: Jason Rasmussen <jason@rasm.me>
Date: Mon, 10 Nov 2025 11:49:59 -0500
Subject: [PATCH 57/84] refactor: albums-list (#23765)

---
 .../components/album-page/albums-list.svelte  | 139 +++++++-----------
 web/src/lib/services/album.service.ts         |  15 ++
 web/src/lib/utils/album-utils.ts              |  14 --
 .../[[assetId=id]]/+page.svelte               |   5 +-
 4 files changed, 74 insertions(+), 99 deletions(-)

diff --git a/web/src/lib/components/album-page/albums-list.svelte b/web/src/lib/components/album-page/albums-list.svelte
index 5a93dd08f1..deb206ca9f 100644
--- a/web/src/lib/components/album-page/albums-list.svelte
+++ b/web/src/lib/components/album-page/albums-list.svelte
@@ -11,7 +11,7 @@
   import AlbumShareModal from '$lib/modals/AlbumShareModal.svelte';
   import QrCodeModal from '$lib/modals/QrCodeModal.svelte';
   import SharedLinkCreateModal from '$lib/modals/SharedLinkCreateModal.svelte';
-  import { handleDownloadAlbum } from '$lib/services/album.service';
+  import { handleConfirmAlbumDelete, handleDownloadAlbum } from '$lib/services/album.service';
   import {
     AlbumFilter,
     AlbumGroupBy,
@@ -24,13 +24,7 @@
   import { user } from '$lib/stores/user.store';
   import { userInteraction } from '$lib/stores/user.svelte';
   import { makeSharedLinkUrl } from '$lib/utils';
-  import {
-    confirmAlbumDelete,
-    getSelectedAlbumGroupOption,
-    sortAlbums,
-    stringToSortOrder,
-    type AlbumGroup,
-  } from '$lib/utils/album-utils';
+  import { getSelectedAlbumGroupOption, sortAlbums, stringToSortOrder, type AlbumGroup } from '$lib/utils/album-utils';
   import type { ContextMenuPosition } from '$lib/utils/context-menu';
   import { handleError } from '$lib/utils/handle-error';
   import { normalizeSearchString } from '$lib/utils/string-utils';
@@ -142,10 +136,9 @@
   let albumGroupOption: string = $state(AlbumGroupBy.None);
 
   let albumToShare: AlbumResponseDto | null = $state(null);
-  let albumToDelete: AlbumResponseDto | null = null;
 
   let contextMenuPosition: ContextMenuPosition = $state({ x: 0, y: 0 });
-  let contextMenuTargetAlbum: AlbumResponseDto | undefined = $state();
+  let selectedAlbum: AlbumResponseDto | undefined = $state();
   let isOpen = $state(false);
 
   // Step 1: Filter between Owned and Shared albums, or both.
@@ -198,9 +191,7 @@
     albumGroupIds = groupedAlbums.map(({ id }) => id);
   });
 
-  let showFullContextMenu = $derived(
-    allowEdit && contextMenuTargetAlbum && contextMenuTargetAlbum.ownerId === $user.id,
-  );
+  let showFullContextMenu = $derived(allowEdit && selectedAlbum && selectedAlbum.ownerId === $user.id);
 
   onMount(async () => {
     if (allowEdit) {
@@ -209,7 +200,7 @@
   });
 
   const showAlbumContextMenu = (contextMenuDetail: ContextMenuPosition, album: AlbumResponseDto) => {
-    contextMenuTargetAlbum = album;
+    selectedAlbum = album;
     contextMenuPosition = {
       x: contextMenuDetail.x,
       y: contextMenuDetail.y,
@@ -221,13 +212,6 @@
     isOpen = false;
   };
 
-  const onDownloadAlbum = async () => {
-    if (contextMenuTargetAlbum) {
-      closeAlbumContextMenu();
-      await handleDownloadAlbum(contextMenuTargetAlbum);
-    }
-  };
-
   const handleDeleteAlbum = async (albumToDelete: AlbumResponseDto) => {
     try {
       await deleteAlbum({
@@ -247,39 +231,61 @@
     sharedAlbums = sharedAlbums.filter(({ id }) => id !== albumToDelete.id);
   };
 
-  const setAlbumToDelete = async () => {
-    albumToDelete = contextMenuTargetAlbum ?? null;
+  const handleSelect = async (action: 'edit' | 'share' | 'download' | 'delete') => {
     closeAlbumContextMenu();
-    await deleteSelectedAlbum();
-  };
 
-  const handleEdit = async (album: AlbumResponseDto) => {
-    closeAlbumContextMenu();
-    const editedAlbum = await modalManager.show(AlbumEditModal, {
-      album,
-    });
-    if (editedAlbum) {
-      successEditAlbumInfo(editedAlbum);
-    }
-  };
-
-  const deleteSelectedAlbum = async () => {
-    if (!albumToDelete) {
+    if (!selectedAlbum) {
       return;
     }
 
-    const isConfirmed = await confirmAlbumDelete(albumToDelete);
+    switch (action) {
+      case 'edit': {
+        const editedAlbum = await modalManager.show(AlbumEditModal, { album: selectedAlbum });
+        if (editedAlbum) {
+          successEditAlbumInfo(editedAlbum);
+        }
+        break;
+      }
 
-    if (!isConfirmed) {
-      return;
-    }
+      case 'share': {
+        const result = await modalManager.show(AlbumShareModal, { album: selectedAlbum });
+        switch (result?.action) {
+          case 'sharedUsers': {
+            await handleAddUsers(result.data);
+            break;
+          }
 
-    try {
-      await handleDeleteAlbum(albumToDelete);
-    } catch (error) {
-      handleError(error, $t('errors.unable_to_delete_album'));
-    } finally {
-      albumToDelete = null;
+          case 'sharedLink': {
+            const sharedLink = await modalManager.show(SharedLinkCreateModal, { albumId: selectedAlbum.id });
+            if (sharedLink) {
+              handleSharedLinkCreated(selectedAlbum);
+              await modalManager.show(QrCodeModal, { title: $t('view_link'), value: makeSharedLinkUrl(sharedLink) });
+            }
+            break;
+          }
+        }
+        break;
+      }
+
+      case 'download': {
+        await handleDownloadAlbum(selectedAlbum);
+        break;
+      }
+
+      case 'delete': {
+        const isConfirmed = await handleConfirmAlbumDelete(selectedAlbum);
+        if (!isConfirmed) {
+          return;
+        }
+
+        try {
+          await handleDeleteAlbum(selectedAlbum);
+        } catch (error) {
+          handleError(error, $t('errors.unable_to_delete_album'));
+        }
+
+        break;
+      }
     }
   };
 
@@ -347,33 +353,6 @@
     album.hasSharedLink = true;
     updateAlbumInfo(album);
   };
-
-  const openShareModal = async () => {
-    if (!contextMenuTargetAlbum) {
-      return;
-    }
-
-    albumToShare = contextMenuTargetAlbum;
-    closeAlbumContextMenu();
-    const result = await modalManager.show(AlbumShareModal, { album: albumToShare });
-
-    switch (result?.action) {
-      case 'sharedUsers': {
-        await handleAddUsers(result.data);
-        return;
-      }
-
-      case 'sharedLink': {
-        const sharedLink = await modalManager.show(SharedLinkCreateModal, { albumId: albumToShare.id });
-
-        if (sharedLink) {
-          handleSharedLinkCreated(albumToShare);
-          await modalManager.show(QrCodeModal, { title: $t('view_link'), value: makeSharedLinkUrl(sharedLink) });
-        }
-        return;
-      }
-    }
-  };
 </script>
 
 {#if albums.length > 0}
@@ -411,15 +390,11 @@
 <!-- Context Menu -->
 <RightClickContextMenu title={$t('album_options')} {...contextMenuPosition} {isOpen} onClose={closeAlbumContextMenu}>
   {#if showFullContextMenu}
-    <MenuOption
-      icon={mdiRenameOutline}
-      text={$t('edit_album')}
-      onClick={() => contextMenuTargetAlbum && handleEdit(contextMenuTargetAlbum)}
-    />
-    <MenuOption icon={mdiShareVariantOutline} text={$t('share')} onClick={() => openShareModal()} />
+    <MenuOption icon={mdiRenameOutline} text={$t('edit_album')} onClick={() => handleSelect('edit')} />
+    <MenuOption icon={mdiShareVariantOutline} text={$t('share')} onClick={() => handleSelect('share')} />
   {/if}
-  <MenuOption icon={mdiDownload} text={$t('download')} onClick={onDownloadAlbum} />
+  <MenuOption icon={mdiDownload} text={$t('download')} onClick={() => handleSelect('download')} />
   {#if showFullContextMenu}
-    <MenuOption icon={mdiDeleteOutline} text={$t('delete')} onClick={() => setAlbumToDelete()} />
+    <MenuOption icon={mdiDeleteOutline} text={$t('delete')} onClick={() => handleSelect('delete')} />
   {/if}
 </RightClickContextMenu>
diff --git a/web/src/lib/services/album.service.ts b/web/src/lib/services/album.service.ts
index cb7b55bc11..52fa09d103 100644
--- a/web/src/lib/services/album.service.ts
+++ b/web/src/lib/services/album.service.ts
@@ -1,6 +1,21 @@
 import { downloadArchive } from '$lib/utils/asset-utils';
+import { getFormatter } from '$lib/utils/i18n';
 import type { AlbumResponseDto } from '@immich/sdk';
+import { modalManager } from '@immich/ui';
 
 export const handleDownloadAlbum = async (album: AlbumResponseDto) => {
   await downloadArchive(`${album.albumName}.zip`, { albumId: album.id });
 };
+
+export const handleConfirmAlbumDelete = async (album: AlbumResponseDto) => {
+  const $t = await getFormatter();
+  const confirmation =
+    album.albumName.length > 0
+      ? $t('album_delete_confirmation', { values: { album: album.albumName } })
+      : $t('unnamed_album_delete_confirmation');
+
+  const description = $t('album_delete_confirmation_description');
+  const prompt = `${confirmation} ${description}`;
+
+  return modalManager.showDialog({ prompt });
+};
diff --git a/web/src/lib/utils/album-utils.ts b/web/src/lib/utils/album-utils.ts
index 0cb8b7fc04..d4541949ca 100644
--- a/web/src/lib/utils/album-utils.ts
+++ b/web/src/lib/utils/album-utils.ts
@@ -12,7 +12,6 @@ import {
 import { handleError } from '$lib/utils/handle-error';
 import type { AlbumResponseDto } from '@immich/sdk';
 import * as sdk from '@immich/sdk';
-import { modalManager } from '@immich/ui';
 import { orderBy } from 'lodash-es';
 import { t } from 'svelte-i18n';
 import { get } from 'svelte/store';
@@ -203,19 +202,6 @@ export const expandAllAlbumGroups = () => {
   collapseAllAlbumGroups([]);
 };
 
-export const confirmAlbumDelete = async (album: AlbumResponseDto) => {
-  const $t = get(t);
-  const confirmation =
-    album.albumName.length > 0
-      ? $t('album_delete_confirmation', { values: { album: album.albumName } })
-      : $t('unnamed_album_delete_confirmation');
-
-  const description = $t('album_delete_confirmation_description');
-  const prompt = `${confirmation} ${description}`;
-
-  return modalManager.showDialog({ prompt });
-};
-
 interface AlbumSortOption {
   [option: string]: (order: SortOrder, albums: AlbumResponseDto[]) => AlbumResponseDto[];
 }
diff --git 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
index f9453c41cf..34f3240e84 100644
--- 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
@@ -36,14 +36,13 @@
   import AlbumUsersModal from '$lib/modals/AlbumUsersModal.svelte';
   import QrCodeModal from '$lib/modals/QrCodeModal.svelte';
   import SharedLinkCreateModal from '$lib/modals/SharedLinkCreateModal.svelte';
-  import { handleDownloadAlbum } from '$lib/services/album.service';
+  import { handleConfirmAlbumDelete, handleDownloadAlbum } from '$lib/services/album.service';
   import { AssetInteraction } from '$lib/stores/asset-interaction.svelte';
   import { assetViewingStore } from '$lib/stores/asset-viewing.store';
   import { featureFlags } from '$lib/stores/server-config.store';
   import { SlideshowNavigation, SlideshowState, slideshowStore } from '$lib/stores/slideshow.store';
   import { preferences, user } from '$lib/stores/user.store';
   import { handlePromiseError, makeSharedLinkUrl } from '$lib/utils';
-  import { confirmAlbumDelete } from '$lib/utils/album-utils';
   import { cancelMultiselect } from '$lib/utils/asset-utils';
   import { openFileUploadDialog } from '$lib/utils/file-uploader';
   import { handleError } from '$lib/utils/handle-error';
@@ -235,7 +234,7 @@
   };
 
   const handleRemoveAlbum = async () => {
-    const isConfirmed = await confirmAlbumDelete(album);
+    const isConfirmed = await handleConfirmAlbumDelete(album);
 
     if (!isConfirmed) {
       viewMode = AlbumPageViewMode.VIEW;

From 45304f121173083587c6db99b89c62c3c6a5b5a4 Mon Sep 17 00:00:00 2001
From: Jason Rasmussen <jason@rasm.me>
Date: Mon, 10 Nov 2025 12:21:26 -0500
Subject: [PATCH 58/84] refactor: view shared link (#23766)

---
 .../album-page/album-shared-link.svelte       |  8 ++---
 .../components/album-page/albums-list.svelte  |  5 ++-
 .../asset-viewer/actions/share-action.svelte  |  6 ++--
 .../actions/shared-link-copy.svelte           | 14 +++-----
 .../covers/__tests__/share-cover.spec.ts      | 10 +++---
 .../covers/share-cover.svelte                 | 16 ++++-----
 .../sharedlinks-page/shared-link-card.svelte  | 36 +++++++++----------
 .../actions/CreateSharedLinkAction.svelte     |  5 ++-
 web/src/lib/modals/AlbumShareModal.svelte     | 13 ++-----
 web/src/lib/services/shared-link.service.ts   | 21 +++++++++++
 web/src/lib/utils.ts                          |  6 ----
 .../[[assetId=id]]/+page.svelte               |  6 ++--
 .../shared-links/[[id=id]]/+page.svelte       |  4 +--
 13 files changed, 74 insertions(+), 76 deletions(-)
 create mode 100644 web/src/lib/services/shared-link.service.ts

diff --git a/web/src/lib/components/album-page/album-shared-link.svelte b/web/src/lib/components/album-page/album-shared-link.svelte
index e7d6503da3..935fa7837c 100644
--- a/web/src/lib/components/album-page/album-shared-link.svelte
+++ b/web/src/lib/components/album-page/album-shared-link.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
   import SharedLinkCopy from '$lib/components/sharedlinks-page/actions/shared-link-copy.svelte';
+  import { handleViewSharedLinkQrCode } from '$lib/services/shared-link.service';
   import { locale } from '$lib/stores/preferences.store';
   import type { AlbumResponseDto, SharedLinkResponseDto } from '@immich/sdk';
   import { IconButton, Text } from '@immich/ui';
@@ -10,10 +11,9 @@
   type Props = {
     album: AlbumResponseDto;
     sharedLink: SharedLinkResponseDto;
-    onViewQrCode: () => void;
   };
 
-  const { album, sharedLink, onViewQrCode }: Props = $props();
+  const { album, sharedLink }: Props = $props();
 
   const getShareProperties = () =>
     [
@@ -46,8 +46,8 @@
       color="secondary"
       variant="ghost"
       icon={mdiQrcode}
-      onclick={onViewQrCode}
+      onclick={() => handleViewSharedLinkQrCode(sharedLink)}
     />
-    <SharedLinkCopy link={sharedLink} />
+    <SharedLinkCopy {sharedLink} />
   </div>
 </div>
diff --git a/web/src/lib/components/album-page/albums-list.svelte b/web/src/lib/components/album-page/albums-list.svelte
index deb206ca9f..7b4cae0312 100644
--- a/web/src/lib/components/album-page/albums-list.svelte
+++ b/web/src/lib/components/album-page/albums-list.svelte
@@ -9,9 +9,9 @@
   import { AppRoute } from '$lib/constants';
   import AlbumEditModal from '$lib/modals/AlbumEditModal.svelte';
   import AlbumShareModal from '$lib/modals/AlbumShareModal.svelte';
-  import QrCodeModal from '$lib/modals/QrCodeModal.svelte';
   import SharedLinkCreateModal from '$lib/modals/SharedLinkCreateModal.svelte';
   import { handleConfirmAlbumDelete, handleDownloadAlbum } from '$lib/services/album.service';
+  import { handleViewSharedLinkQrCode } from '$lib/services/shared-link.service';
   import {
     AlbumFilter,
     AlbumGroupBy,
@@ -23,7 +23,6 @@
   } from '$lib/stores/preferences.store';
   import { user } from '$lib/stores/user.store';
   import { userInteraction } from '$lib/stores/user.svelte';
-  import { makeSharedLinkUrl } from '$lib/utils';
   import { getSelectedAlbumGroupOption, sortAlbums, stringToSortOrder, type AlbumGroup } from '$lib/utils/album-utils';
   import type { ContextMenuPosition } from '$lib/utils/context-menu';
   import { handleError } from '$lib/utils/handle-error';
@@ -259,7 +258,7 @@
             const sharedLink = await modalManager.show(SharedLinkCreateModal, { albumId: selectedAlbum.id });
             if (sharedLink) {
               handleSharedLinkCreated(selectedAlbum);
-              await modalManager.show(QrCodeModal, { title: $t('view_link'), value: makeSharedLinkUrl(sharedLink) });
+              await handleViewSharedLinkQrCode(sharedLink);
             }
             break;
           }
diff --git a/web/src/lib/components/asset-viewer/actions/share-action.svelte b/web/src/lib/components/asset-viewer/actions/share-action.svelte
index 24a67848a9..a284d5e364 100644
--- a/web/src/lib/components/asset-viewer/actions/share-action.svelte
+++ b/web/src/lib/components/asset-viewer/actions/share-action.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
-  import QrCodeModal from '$lib/modals/QrCodeModal.svelte';
   import SharedLinkCreateModal from '$lib/modals/SharedLinkCreateModal.svelte';
-  import { makeSharedLinkUrl } from '$lib/utils';
+  import { handleViewSharedLinkQrCode } from '$lib/services/shared-link.service';
   import type { AssetResponseDto } from '@immich/sdk';
   import { IconButton, modalManager } from '@immich/ui';
   import { mdiShareVariantOutline } from '@mdi/js';
@@ -15,9 +14,8 @@
 
   const handleClick = async () => {
     const sharedLink = await modalManager.show(SharedLinkCreateModal, { assetIds: [asset.id] });
-
     if (sharedLink) {
-      await modalManager.show(QrCodeModal, { title: $t('view_link'), value: makeSharedLinkUrl(sharedLink) });
+      await handleViewSharedLinkQrCode(sharedLink);
     }
   };
 </script>
diff --git a/web/src/lib/components/sharedlinks-page/actions/shared-link-copy.svelte b/web/src/lib/components/sharedlinks-page/actions/shared-link-copy.svelte
index 235048d35d..06369e7792 100644
--- a/web/src/lib/components/sharedlinks-page/actions/shared-link-copy.svelte
+++ b/web/src/lib/components/sharedlinks-page/actions/shared-link-copy.svelte
@@ -1,25 +1,21 @@
 <script lang="ts">
   import MenuOption from '$lib/components/shared-components/context-menu/menu-option.svelte';
-  import { copyToClipboard, makeSharedLinkUrl } from '$lib/utils';
+  import { handleCopySharedLinkUrl } from '$lib/services/shared-link.service';
   import type { SharedLinkResponseDto } from '@immich/sdk';
   import { IconButton } from '@immich/ui';
   import { mdiContentCopy } from '@mdi/js';
   import { t } from 'svelte-i18n';
 
   interface Props {
-    link: SharedLinkResponseDto;
+    sharedLink: SharedLinkResponseDto;
     menuItem?: boolean;
   }
 
-  let { link, menuItem = false }: Props = $props();
-
-  const handleCopy = async () => {
-    await copyToClipboard(makeSharedLinkUrl(link));
-  };
+  let { sharedLink, menuItem = false }: Props = $props();
 </script>
 
 {#if menuItem}
-  <MenuOption text={$t('copy_link')} icon={mdiContentCopy} onClick={handleCopy} />
+  <MenuOption text={$t('copy_link')} icon={mdiContentCopy} onClick={() => handleCopySharedLinkUrl(sharedLink)} />
 {:else}
   <IconButton
     color="secondary"
@@ -27,6 +23,6 @@
     variant="ghost"
     aria-label={$t('copy_link')}
     icon={mdiContentCopy}
-    onclick={handleCopy}
+    onclick={() => handleCopySharedLinkUrl(sharedLink)}
   />
 {/if}
diff --git a/web/src/lib/components/sharedlinks-page/covers/__tests__/share-cover.spec.ts b/web/src/lib/components/sharedlinks-page/covers/__tests__/share-cover.spec.ts
index 76de04ea31..3b8d90f1ba 100644
--- a/web/src/lib/components/sharedlinks-page/covers/__tests__/share-cover.spec.ts
+++ b/web/src/lib/components/sharedlinks-page/covers/__tests__/share-cover.spec.ts
@@ -10,7 +10,7 @@ vi.mock('$lib/utils');
 describe('ShareCover component', () => {
   it('renders an image when the shared link is an album', () => {
     const component = render(ShareCover, {
-      link: sharedLinkFactory.build({ album: albumFactory.build({ albumName: '123' }) }),
+      sharedLink: sharedLinkFactory.build({ album: albumFactory.build({ albumName: '123' }) }),
       preload: false,
       class: 'text',
     });
@@ -23,7 +23,7 @@ describe('ShareCover component', () => {
   it('renders an image when the shared link is an individual share', () => {
     vi.mocked(getAssetThumbnailUrl).mockReturnValue('/asdf');
     const component = render(ShareCover, {
-      link: sharedLinkFactory.build({ assets: [assetFactory.build({ id: 'someId' })] }),
+      sharedLink: sharedLinkFactory.build({ assets: [assetFactory.build({ id: 'someId' })] }),
       preload: false,
       class: 'text',
     });
@@ -37,7 +37,7 @@ describe('ShareCover component', () => {
 
   it('renders an image when the shared link has no album or assets', () => {
     const component = render(ShareCover, {
-      link: sharedLinkFactory.build(),
+      sharedLink: sharedLinkFactory.build(),
       preload: false,
       class: 'text',
     });
@@ -48,9 +48,9 @@ describe('ShareCover component', () => {
   });
 
   it.skip('renders fallback image when asset is not resized', () => {
-    const link = sharedLinkFactory.build({ assets: [assetFactory.build()] });
+    const sharedLink = sharedLinkFactory.build({ assets: [assetFactory.build()] });
     render(ShareCover, {
-      link,
+      sharedLink,
       preload: false,
     });
 
diff --git a/web/src/lib/components/sharedlinks-page/covers/share-cover.svelte b/web/src/lib/components/sharedlinks-page/covers/share-cover.svelte
index 6f15cca45f..ec3deb9943 100644
--- a/web/src/lib/components/sharedlinks-page/covers/share-cover.svelte
+++ b/web/src/lib/components/sharedlinks-page/covers/share-cover.svelte
@@ -1,29 +1,29 @@
 <script lang="ts">
-  import type { SharedLinkResponseDto } from '@immich/sdk';
   import AlbumCover from '$lib/components/album-page/album-cover.svelte';
-  import NoCover from '$lib/components/sharedlinks-page/covers/no-cover.svelte';
   import AssetCover from '$lib/components/sharedlinks-page/covers/asset-cover.svelte';
+  import NoCover from '$lib/components/sharedlinks-page/covers/no-cover.svelte';
   import { getAssetThumbnailUrl } from '$lib/utils';
+  import type { SharedLinkResponseDto } from '@immich/sdk';
   import { t } from 'svelte-i18n';
 
   interface Props {
-    link: SharedLinkResponseDto;
+    sharedLink: SharedLinkResponseDto;
     preload?: boolean;
     class?: string;
   }
 
-  let { link, preload = false, class: className = '' }: Props = $props();
+  let { sharedLink, preload = false, class: className = '' }: Props = $props();
 </script>
 
 <div class="relative shrink-0 size-24">
-  {#if link?.album}
-    <AlbumCover album={link.album} class={className} {preload} />
-  {:else if link.assets[0]}
+  {#if sharedLink?.album}
+    <AlbumCover album={sharedLink.album} class={className} {preload} />
+  {:else if sharedLink.assets[0]}
     <AssetCover
       alt={$t('individual_share')}
       class={className}
       {preload}
-      src={getAssetThumbnailUrl(link.assets[0].id)}
+      src={getAssetThumbnailUrl(sharedLink.assets[0].id)}
     />
   {:else}
     <NoCover alt={$t('unnamed_share')} class={className} {preload} />
diff --git a/web/src/lib/components/sharedlinks-page/shared-link-card.svelte b/web/src/lib/components/sharedlinks-page/shared-link-card.svelte
index 33842e3f74..f811f60e77 100644
--- a/web/src/lib/components/sharedlinks-page/shared-link-card.svelte
+++ b/web/src/lib/components/sharedlinks-page/shared-link-card.svelte
@@ -13,14 +13,14 @@
   import { t } from 'svelte-i18n';
 
   interface Props {
-    link: SharedLinkResponseDto;
+    sharedLink: SharedLinkResponseDto;
     onDelete: () => void;
   }
 
-  let { link, onDelete }: Props = $props();
+  let { sharedLink, onDelete }: Props = $props();
 
   let now = DateTime.now();
-  let expiresAt = $derived(link.expiresAt ? DateTime.fromISO(link.expiresAt) : undefined);
+  let expiresAt = $derived(sharedLink.expiresAt ? DateTime.fromISO(sharedLink.expiresAt) : undefined);
   let isExpired = $derived(expiresAt ? now > expiresAt : false);
 
   const getCountDownExpirationDate = (expiresAtDate: DateTime, now: DateTime) => {
@@ -41,10 +41,10 @@
 >
   <svelte:element
     this={isExpired ? 'div' : 'a'}
-    href={isExpired ? undefined : `${AppRoute.SHARE}/${link.key}`}
+    href={isExpired ? undefined : `${AppRoute.SHARE}/${sharedLink.key}`}
     class="flex gap-4 w-full py-4"
   >
-    <ShareCover class="transition-all duration-300 hover:shadow-lg" {link} />
+    <ShareCover class="transition-all duration-300 hover:shadow-lg" {sharedLink} />
 
     <div class="flex flex-col justify-between">
       <div class="info-top">
@@ -62,34 +62,34 @@
 
         <div class="text-sm pb-2">
           <p class="flex place-items-center gap-2 text-primary break-all uppercase">
-            {#if link.type === SharedLinkType.Album}
-              {link.album?.albumName}
-            {:else if link.type === SharedLinkType.Individual}
+            {#if sharedLink.type === SharedLinkType.Album}
+              {sharedLink.album?.albumName}
+            {:else if sharedLink.type === SharedLinkType.Individual}
               {$t('individual_share')}
             {/if}
           </p>
 
-          <p class="text-sm">{link.description ?? ''}</p>
+          <p class="text-sm">{sharedLink.description ?? ''}</p>
         </div>
       </div>
 
       <div class="flex flex-wrap gap-2 text-xl">
-        {#if link.allowUpload}
+        {#if sharedLink.allowUpload}
           <Badge rounded="full"><span class="text-xs px-1">{$t('upload')}</span></Badge>
         {/if}
 
-        {#if link.allowDownload}
+        {#if sharedLink.allowDownload}
           <Badge rounded="full"><span class="text-xs px-1">{$t('download')}</span></Badge>
         {/if}
 
-        {#if link.showMetadata}
+        {#if sharedLink.showMetadata}
           <Badge rounded="full"><span class="uppercase text-xs px-1">{$t('exif')}</span></Badge>
         {/if}
 
-        {#if link.password}
+        {#if sharedLink.password}
           <Badge rounded="full"><span class="text-xs px-1">{$t('password')}</span></Badge>
         {/if}
-        {#if link.slug}
+        {#if sharedLink.slug}
           <Badge rounded="full"><span class="text-xs px-1">{$t('custom_url')}</span></Badge>
         {/if}
       </div>
@@ -97,8 +97,8 @@
   </svelte:element>
   <div class="flex flex-auto flex-col place-content-center place-items-end text-end ms-4">
     <div class="sm:flex hidden">
-      <SharedLinkEdit sharedLink={link} />
-      <SharedLinkCopy {link} />
+      <SharedLinkEdit {sharedLink} />
+      <SharedLinkCopy {sharedLink} />
       <SharedLinkDelete {onDelete} />
     </div>
 
@@ -110,8 +110,8 @@
         size="large"
         hideContent
       >
-        <SharedLinkEdit menuItem sharedLink={link} />
-        <SharedLinkCopy menuItem {link} />
+        <SharedLinkEdit menuItem {sharedLink} />
+        <SharedLinkCopy menuItem {sharedLink} />
         <SharedLinkDelete menuItem {onDelete} />
       </ButtonContextMenu>
     </div>
diff --git a/web/src/lib/components/timeline/actions/CreateSharedLinkAction.svelte b/web/src/lib/components/timeline/actions/CreateSharedLinkAction.svelte
index 515fa64af1..06291e2188 100644
--- a/web/src/lib/components/timeline/actions/CreateSharedLinkAction.svelte
+++ b/web/src/lib/components/timeline/actions/CreateSharedLinkAction.svelte
@@ -1,8 +1,7 @@
 <script lang="ts">
   import { getAssetControlContext } from '$lib/components/timeline/AssetSelectControlBar.svelte';
-  import QrCodeModal from '$lib/modals/QrCodeModal.svelte';
   import SharedLinkCreateModal from '$lib/modals/SharedLinkCreateModal.svelte';
-  import { makeSharedLinkUrl } from '$lib/utils';
+  import { handleViewSharedLinkQrCode } from '$lib/services/shared-link.service';
   import { IconButton, modalManager } from '@immich/ui';
   import { mdiShareVariantOutline } from '@mdi/js';
   import { t } from 'svelte-i18n';
@@ -15,7 +14,7 @@
     });
 
     if (sharedLink) {
-      await modalManager.show(QrCodeModal, { title: $t('view_link'), value: makeSharedLinkUrl(sharedLink) });
+      await handleViewSharedLinkQrCode(sharedLink);
     }
   };
 </script>
diff --git a/web/src/lib/modals/AlbumShareModal.svelte b/web/src/lib/modals/AlbumShareModal.svelte
index 9a60c0f710..8a4995efc4 100644
--- a/web/src/lib/modals/AlbumShareModal.svelte
+++ b/web/src/lib/modals/AlbumShareModal.svelte
@@ -2,8 +2,6 @@
   import AlbumSharedLink from '$lib/components/album-page/album-shared-link.svelte';
   import { AppRoute } from '$lib/constants';
   import Dropdown from '$lib/elements/Dropdown.svelte';
-  import QrCodeModal from '$lib/modals/QrCodeModal.svelte';
-  import { makeSharedLinkUrl } from '$lib/utils';
   import {
     AlbumUserRole,
     getAllSharedLinks,
@@ -13,7 +11,7 @@
     type SharedLinkResponseDto,
     type UserResponseDto,
   } from '@immich/sdk';
-  import { Button, Icon, Link, Modal, ModalBody, modalManager, Stack, Text } from '@immich/ui';
+  import { Button, Icon, Link, Modal, ModalBody, Stack, Text } from '@immich/ui';
   import { mdiCheck, mdiEye, mdiLink, mdiPencil } from '@mdi/js';
   import { onMount } from 'svelte';
   import { t } from 'svelte-i18n';
@@ -29,13 +27,6 @@
   let users: UserResponseDto[] = $state([]);
   let selectedUsers: Record<string, { user: UserResponseDto; role: AlbumUserRole }> = $state({});
 
-  const handleViewQrCode = async (sharedLink: SharedLinkResponseDto) => {
-    await modalManager.show(QrCodeModal, {
-      title: $t('view_link'),
-      value: makeSharedLinkUrl(sharedLink),
-    });
-  };
-
   const roleOptions: Array<{ title: string; value: AlbumUserRole | 'none'; icon?: string }> = [
     { title: $t('role_editor'), value: AlbumUserRole.Editor, icon: mdiPencil },
     { title: $t('role_viewer'), value: AlbumUserRole.Viewer, icon: mdiEye },
@@ -174,7 +165,7 @@
 
         <Stack gap={4}>
           {#each sharedLinks as sharedLink (sharedLink.id)}
-            <AlbumSharedLink {album} {sharedLink} onViewQrCode={() => handleViewQrCode(sharedLink)} />
+            <AlbumSharedLink {album} {sharedLink} />
           {/each}
         </Stack>
       {/if}
diff --git a/web/src/lib/services/shared-link.service.ts b/web/src/lib/services/shared-link.service.ts
new file mode 100644
index 0000000000..35bde6784f
--- /dev/null
+++ b/web/src/lib/services/shared-link.service.ts
@@ -0,0 +1,21 @@
+import QrCodeModal from '$lib/modals/QrCodeModal.svelte';
+import { serverConfig } from '$lib/stores/server-config.store';
+import { copyToClipboard } from '$lib/utils';
+import { getFormatter } from '$lib/utils/i18n';
+import type { SharedLinkResponseDto } from '@immich/sdk';
+import { modalManager } from '@immich/ui';
+import { get } from 'svelte/store';
+
+const makeSharedLinkUrl = (sharedLink: SharedLinkResponseDto) => {
+  const path = sharedLink.slug ? `s/${sharedLink.slug}` : `share/${sharedLink.key}`;
+  return new URL(path, get(serverConfig).externalDomain || globalThis.location.origin).href;
+};
+
+export const handleViewSharedLinkQrCode = async (sharedLink: SharedLinkResponseDto) => {
+  const $t = await getFormatter();
+  await modalManager.show(QrCodeModal, { title: $t('view_link'), value: makeSharedLinkUrl(sharedLink) });
+};
+
+export const handleCopySharedLinkUrl = async (sharedLink: SharedLinkResponseDto) => {
+  await copyToClipboard(makeSharedLinkUrl(sharedLink));
+};
diff --git a/web/src/lib/utils.ts b/web/src/lib/utils.ts
index 3f2d945f39..65510352c1 100644
--- a/web/src/lib/utils.ts
+++ b/web/src/lib/utils.ts
@@ -1,7 +1,6 @@
 import { defaultLang, langs, locales } from '$lib/constants';
 import { authManager } from '$lib/managers/auth-manager.svelte';
 import { lang } from '$lib/stores/preferences.store';
-import { serverConfig } from '$lib/stores/server-config.store';
 import { handleError } from '$lib/utils/handle-error';
 import {
   AssetJobName,
@@ -269,11 +268,6 @@ export const copyToClipboard = async (secret: string) => {
   }
 };
 
-export const makeSharedLinkUrl = (sharedLink: SharedLinkResponseDto) => {
-  const path = sharedLink.slug ? `s/${sharedLink.slug}` : `share/${sharedLink.key}`;
-  return new URL(path, get(serverConfig).externalDomain || globalThis.location.origin).href;
-};
-
 export const oauth = {
   isCallback: (location: Location) => {
     const search = location.search;
diff --git 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
index 34f3240e84..1c8a6ccfa0 100644
--- 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
@@ -34,15 +34,15 @@
   import AlbumOptionsModal from '$lib/modals/AlbumOptionsModal.svelte';
   import AlbumShareModal from '$lib/modals/AlbumShareModal.svelte';
   import AlbumUsersModal from '$lib/modals/AlbumUsersModal.svelte';
-  import QrCodeModal from '$lib/modals/QrCodeModal.svelte';
   import SharedLinkCreateModal from '$lib/modals/SharedLinkCreateModal.svelte';
   import { handleConfirmAlbumDelete, handleDownloadAlbum } from '$lib/services/album.service';
+  import { handleViewSharedLinkQrCode } from '$lib/services/shared-link.service';
   import { AssetInteraction } from '$lib/stores/asset-interaction.svelte';
   import { assetViewingStore } from '$lib/stores/asset-viewing.store';
   import { featureFlags } from '$lib/stores/server-config.store';
   import { SlideshowNavigation, SlideshowState, slideshowStore } from '$lib/stores/slideshow.store';
   import { preferences, user } from '$lib/stores/user.store';
-  import { handlePromiseError, makeSharedLinkUrl } from '$lib/utils';
+  import { handlePromiseError } from '$lib/utils';
   import { cancelMultiselect } from '$lib/utils/asset-utils';
   import { openFileUploadDialog } from '$lib/utils/file-uploader';
   import { handleError } from '$lib/utils/handle-error';
@@ -388,7 +388,7 @@
     const sharedLink = await modalManager.show(SharedLinkCreateModal, { albumId: album.id });
     if (sharedLink) {
       await refreshAlbum();
-      await modalManager.show(QrCodeModal, { title: $t('view_link'), value: makeSharedLinkUrl(sharedLink) });
+      await handleViewSharedLinkQrCode(sharedLink);
     }
   };
 
diff --git a/web/src/routes/(user)/shared-links/[[id=id]]/+page.svelte b/web/src/routes/(user)/shared-links/[[id=id]]/+page.svelte
index 02f230d609..2aa24a57ba 100644
--- a/web/src/routes/(user)/shared-links/[[id=id]]/+page.svelte
+++ b/web/src/routes/(user)/shared-links/[[id=id]]/+page.svelte
@@ -109,8 +109,8 @@
       </div>
     {:else}
       <div class="flex flex-col gap-2">
-        {#each filteredSharedLinks as link (link.id)}
-          <SharedLinkCard {link} onDelete={() => handleDeleteLink(link.id)} />
+        {#each filteredSharedLinks as sharedLink (sharedLink.id)}
+          <SharedLinkCard {sharedLink} onDelete={() => handleDeleteLink(sharedLink.id)} />
         {/each}
       </div>
     {/if}

From da5a72f6de894629de2c57424bae12d4428c95d0 Mon Sep 17 00:00:00 2001
From: shenlong <139912620+shenlong-tanwen@users.noreply.github.com>
Date: Mon, 10 Nov 2025 23:07:45 +0530
Subject: [PATCH 59/84] chore: patch MemoriesResponse (#23764)

Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>
---
 mobile/lib/utils/openapi_patching.dart | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/mobile/lib/utils/openapi_patching.dart b/mobile/lib/utils/openapi_patching.dart
index 0a3fa7e91d..0c1f03086f 100644
--- a/mobile/lib/utils/openapi_patching.dart
+++ b/mobile/lib/utils/openapi_patching.dart
@@ -51,6 +51,11 @@ dynamic upgradeDto(dynamic value, String targetType) {
         addDefault(value, 'ocr', false);
       }
       break;
+    case 'MemoriesResponse':
+      if (value is Map) {
+        addDefault(value, 'duration', 5);
+      }
+      break;
   }
 }
 

From b2cbefe41e3076d51fe94db5c321134be517d74d Mon Sep 17 00:00:00 2001
From: Viktor Mykhailiv <vitoksmile@gmail.com>
Date: Mon, 10 Nov 2025 18:03:12 +0000
Subject: [PATCH 60/84] fix(mobile): Set dynamic height of actions row in
 BottomSheet (#23755)

Co-authored-by: Alex <alex.tran1502@gmail.com>
---
 .../widgets/bottom_sheet/base_bottom_sheet.widget.dart | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/mobile/lib/presentation/widgets/bottom_sheet/base_bottom_sheet.widget.dart b/mobile/lib/presentation/widgets/bottom_sheet/base_bottom_sheet.widget.dart
index 7205dad941..2f2847543f 100644
--- a/mobile/lib/presentation/widgets/bottom_sheet/base_bottom_sheet.widget.dart
+++ b/mobile/lib/presentation/widgets/bottom_sheet/base_bottom_sheet.widget.dart
@@ -86,13 +86,9 @@ class _BaseDraggableScrollableSheetState extends ConsumerState<BaseBottomSheet>
                       SliverToBoxAdapter(
                         child: Column(
                           children: [
-                            SizedBox(
-                              height: 115,
-                              child: ListView(
-                                shrinkWrap: true,
-                                scrollDirection: Axis.horizontal,
-                                children: widget.actions,
-                              ),
+                            SingleChildScrollView(
+                              scrollDirection: Axis.horizontal,
+                              child: Row(crossAxisAlignment: CrossAxisAlignment.start, children: widget.actions),
                             ),
                             const Divider(indent: 16, endIndent: 16),
                             const SizedBox(height: 16),

From d6307b262f1be23d677d4a4e87bd3a00560fcd46 Mon Sep 17 00:00:00 2001
From: Noel S <noelsteves02@gmail.com>
Date: Mon, 10 Nov 2025 10:13:04 -0800
Subject: [PATCH 61/84] fix(mobile): Hide download button in asset viewer
 "immersive mode" (#23720)

* Hide download FAB in asset viewer immersive mode

* Remove commented out code

* Remove more comments
---
 .../widgets/asset_viewer/asset_viewer.page.dart       | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.page.dart b/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.page.dart
index f8a2c37ccd..50c4347301 100644
--- a/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.page.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.page.dart
@@ -627,10 +627,10 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
     // Rebuild the widget when the asset viewer state changes
     // Using multiple selectors to avoid unnecessary rebuilds for other state changes
     ref.watch(assetViewerProvider.select((s) => s.showingBottomSheet));
-    ref.watch(assetViewerProvider.select((s) => s.showingControls));
     ref.watch(assetViewerProvider.select((s) => s.backgroundOpacity));
     ref.watch(assetViewerProvider.select((s) => s.stackIndex));
     ref.watch(isPlayingMotionVideoProvider);
+    final showingControls = ref.watch(assetViewerProvider.select((s) => s.showingControls));
 
     // Listen for casting changes and send initial asset to the cast provider
     ref.listen(castProvider.select((value) => value.isCasting), (_, isCasting) async {
@@ -663,7 +663,14 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
         appBar: const ViewerTopAppBar(),
         extendBody: true,
         extendBodyBehindAppBar: true,
-        floatingActionButton: const DownloadStatusFloatingButton(),
+        floatingActionButton: IgnorePointer(
+          ignoring: !showingControls,
+          child: AnimatedOpacity(
+            opacity: showingControls ? 1.0 : 0.0,
+            duration: Durations.short2,
+            child: const DownloadStatusFloatingButton(),
+          ),
+        ),
         body: Stack(
           children: [
             PhotoViewGallery.builder(

From d27c01ef70ec0535d613fa5ec1ed714bc02d65cf Mon Sep 17 00:00:00 2001
From: Daniel Dietzler <36593685+danieldietzler@users.noreply.github.com>
Date: Mon, 10 Nov 2025 19:16:49 +0100
Subject: [PATCH 62/84] chore: migrate remaining usages of the logo to use the
 UI lib (#23430)

---
 .../components/album-page/album-viewer.svelte |   7 +-
 .../lib/components/layouts/ErrorLayout.svelte |   5 +-
 .../onboarding-page/onboarding-hello.svelte   |   4 +-
 .../components/pages/SharedLinkPage.svelte    |   7 +-
 .../individual-shared-viewer.svelte           |   7 +-
 .../drag-and-drop-upload-overlay.svelte       |   4 +-
 .../immich-logo-small-link.svelte             |   8 --
 .../shared-components/immich-logo.svelte      | 112 ------------------
 .../navigation-bar/navigation-bar.svelte      |   5 +-
 .../side-bar/purchase-info.svelte             |  10 +-
 .../side-bar/supporter-badge.svelte           |   4 +-
 11 files changed, 25 insertions(+), 148 deletions(-)
 delete mode 100644 web/src/lib/components/shared-components/immich-logo-small-link.svelte
 delete mode 100644 web/src/lib/components/shared-components/immich-logo.svelte

diff --git a/web/src/lib/components/album-page/album-viewer.svelte b/web/src/lib/components/album-page/album-viewer.svelte
index 460cf4e63b..d0d03eef80 100644
--- a/web/src/lib/components/album-page/album-viewer.svelte
+++ b/web/src/lib/components/album-page/album-viewer.svelte
@@ -16,11 +16,10 @@
   import { cancelMultiselect } from '$lib/utils/asset-utils';
   import { fileUploadHandler, openFileUploadDialog } from '$lib/utils/file-uploader';
   import type { AlbumResponseDto, SharedLinkResponseDto, UserResponseDto } from '@immich/sdk';
-  import { IconButton } from '@immich/ui';
+  import { IconButton, Logo } from '@immich/ui';
   import { mdiDownload, mdiFileImagePlusOutline } from '@mdi/js';
   import { t } from 'svelte-i18n';
   import ControlAppBar from '../shared-components/control-app-bar.svelte';
-  import ImmichLogoSmallLink from '../shared-components/immich-logo-small-link.svelte';
   import ThemeButton from '../shared-components/theme-button.svelte';
   import AlbumSummary from './album-summary.svelte';
 
@@ -98,7 +97,9 @@
   {:else}
     <ControlAppBar showBackButton={false}>
       {#snippet leading()}
-        <ImmichLogoSmallLink />
+        <a data-sveltekit-preload-data="hover" class="ms-4" href="/">
+          <Logo variant="inline" />
+        </a>
       {/snippet}
 
       {#snippet trailing()}
diff --git a/web/src/lib/components/layouts/ErrorLayout.svelte b/web/src/lib/components/layouts/ErrorLayout.svelte
index b97b1f05d5..1df1dbf422 100644
--- a/web/src/lib/components/layouts/ErrorLayout.svelte
+++ b/web/src/lib/components/layouts/ErrorLayout.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
-  import ImmichLogo from '$lib/components/shared-components/immich-logo.svelte';
   import { copyToClipboard } from '$lib/utils';
-  import { Icon, IconButton } from '@immich/ui';
+  import { Icon, IconButton, Logo } from '@immich/ui';
   import { mdiCodeTags, mdiContentCopy, mdiMessage, mdiPartyPopper } from '@mdi/js';
   import { t } from 'svelte-i18n';
 
@@ -24,7 +23,7 @@
   <section>
     <div class="flex place-items-center border-b px-6 py-4 dark:border-b-immich-dark-gray">
       <a class="flex place-items-center gap-2 hover:cursor-pointer" href="/photos">
-        <ImmichLogo class="h-12.5" />
+        <Logo variant="inline" />
       </a>
     </div>
   </section>
diff --git a/web/src/lib/components/onboarding-page/onboarding-hello.svelte b/web/src/lib/components/onboarding-page/onboarding-hello.svelte
index 3466ecda2b..c21302a5bd 100644
--- a/web/src/lib/components/onboarding-page/onboarding-hello.svelte
+++ b/web/src/lib/components/onboarding-page/onboarding-hello.svelte
@@ -1,15 +1,15 @@
 <script lang="ts">
-  import ImmichLogo from '$lib/components/shared-components/immich-logo.svelte';
   import { OnboardingRole } from '$lib/models/onboarding-role';
   import { serverConfig } from '$lib/stores/server-config.store';
   import { user } from '$lib/stores/user.store';
+  import { Logo } from '@immich/ui';
   import { t } from 'svelte-i18n';
 
   let userRole = $derived($user.isAdmin && !$serverConfig.isOnboarded ? OnboardingRole.SERVER : OnboardingRole.USER);
 </script>
 
 <div class="gap-4">
-  <ImmichLogo noText class="h-25 mb-2" />
+  <Logo variant="icon" size="giant" class="mb-2" />
   <p class="font-medium mb-6 text-6xl text-primary">
     {$t('onboarding_welcome_user', { values: { user: $user.name } })}
   </p>
diff --git a/web/src/lib/components/pages/SharedLinkPage.svelte b/web/src/lib/components/pages/SharedLinkPage.svelte
index b9ed34c0e8..d30c3ce341 100644
--- a/web/src/lib/components/pages/SharedLinkPage.svelte
+++ b/web/src/lib/components/pages/SharedLinkPage.svelte
@@ -2,7 +2,6 @@
   import AlbumViewer from '$lib/components/album-page/album-viewer.svelte';
   import IndividualSharedViewer from '$lib/components/share-page/individual-shared-viewer.svelte';
   import ControlAppBar from '$lib/components/shared-components/control-app-bar.svelte';
-  import ImmichLogoSmallLink from '$lib/components/shared-components/immich-logo-small-link.svelte';
   import ThemeButton from '$lib/components/shared-components/theme-button.svelte';
   import { assetViewingStore } from '$lib/stores/asset-viewing.store';
   import { user } from '$lib/stores/user.store';
@@ -10,7 +9,7 @@
   import { handleError } from '$lib/utils/handle-error';
   import { navigate } from '$lib/utils/navigation';
   import { getMySharedLink, SharedLinkType, type AssetResponseDto, type SharedLinkResponseDto } from '@immich/sdk';
-  import { Button, PasswordInput } from '@immich/ui';
+  import { Button, Logo, PasswordInput } from '@immich/ui';
   import { tick } from 'svelte';
   import { t } from 'svelte-i18n';
 
@@ -87,7 +86,9 @@
   <header>
     <ControlAppBar showBackButton={false}>
       {#snippet leading()}
-        <ImmichLogoSmallLink />
+        <a data-sveltekit-preload-data="hover" class="ms-4" href="/">
+          <Logo variant="inline" />
+        </a>
       {/snippet}
 
       {#snippet trailing()}
diff --git a/web/src/lib/components/share-page/individual-shared-viewer.svelte b/web/src/lib/components/share-page/individual-shared-viewer.svelte
index f805e92de0..b7d9e548df 100644
--- a/web/src/lib/components/share-page/individual-shared-viewer.svelte
+++ b/web/src/lib/components/share-page/individual-shared-viewer.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
   import { goto } from '$app/navigation';
   import type { Action } from '$lib/components/asset-viewer/actions/action';
-  import ImmichLogoSmallLink from '$lib/components/shared-components/immich-logo-small-link.svelte';
   import DownloadAction from '$lib/components/timeline/actions/DownloadAction.svelte';
   import RemoveFromSharedLink from '$lib/components/timeline/actions/RemoveFromSharedLinkAction.svelte';
   import AssetSelectControlBar from '$lib/components/timeline/AssetSelectControlBar.svelte';
@@ -16,7 +15,7 @@
   import { handleError } from '$lib/utils/handle-error';
   import { toTimelineAsset } from '$lib/utils/timeline-util';
   import { addSharedLinkAssets, getAssetInfo, type SharedLinkResponseDto } from '@immich/sdk';
-  import { IconButton, toastManager } from '@immich/ui';
+  import { IconButton, Logo, toastManager } from '@immich/ui';
   import { mdiArrowLeft, mdiDownload, mdiFileImagePlusOutline, mdiSelectAll } from '@mdi/js';
   import { t } from 'svelte-i18n';
   import ControlAppBar from '../shared-components/control-app-bar.svelte';
@@ -108,7 +107,9 @@
     {:else}
       <ControlAppBar onClose={() => goto(AppRoute.PHOTOS)} backIcon={mdiArrowLeft} showBackButton={false}>
         {#snippet leading()}
-          <ImmichLogoSmallLink />
+          <a data-sveltekit-preload-data="hover" class="ms-4" href="/">
+            <Logo variant="inline" />
+          </a>
         {/snippet}
 
         {#snippet trailing()}
diff --git a/web/src/lib/components/shared-components/drag-and-drop-upload-overlay.svelte b/web/src/lib/components/shared-components/drag-and-drop-upload-overlay.svelte
index 5de1bc58ad..77178aa992 100644
--- a/web/src/lib/components/shared-components/drag-and-drop-upload-overlay.svelte
+++ b/web/src/lib/components/shared-components/drag-and-drop-upload-overlay.svelte
@@ -5,9 +5,9 @@
   import { dragAndDropFilesStore } from '$lib/stores/drag-and-drop-files.store';
   import { fileUploadHandler } from '$lib/utils/file-uploader';
   import { isAlbumsRoute, isLockedFolderRoute } from '$lib/utils/navigation';
+  import { Logo } from '@immich/ui';
   import { t } from 'svelte-i18n';
   import { fade } from 'svelte/transition';
-  import ImmichLogo from './immich-logo.svelte';
 
   let albumId = $derived(isAlbumsRoute(page.route?.id) ? page.params.albumId : undefined);
   let isInLockedFolder = $derived(isLockedFolderRoute(page.route.id));
@@ -168,7 +168,7 @@
     transition:fade={{ duration: 250 }}
     ondragover={onDragOver}
   >
-    <ImmichLogo noText class="m-16 h-48 animate-bounce" />
+    <Logo variant="icon" size="giant" class="m-16 animate-bounce" />
     <div class="text-2xl">{$t('drop_files_to_upload')}</div>
   </div>
 {/if}
diff --git a/web/src/lib/components/shared-components/immich-logo-small-link.svelte b/web/src/lib/components/shared-components/immich-logo-small-link.svelte
deleted file mode 100644
index 5cce02e89e..0000000000
--- a/web/src/lib/components/shared-components/immich-logo-small-link.svelte
+++ /dev/null
@@ -1,8 +0,0 @@
-<script lang="ts">
-  import ImmichLogo from '$lib/components/shared-components/immich-logo.svelte';
-  import { mobileDevice } from '$lib/stores/mobile-device.svelte';
-</script>
-
-<a data-sveltekit-preload-data="hover" class="ms-4" href="/">
-  <ImmichLogo class="h-12.5 max-w-none md:w-auto md:max-w-full" noText={mobileDevice.maxMd} />
-</a>
diff --git a/web/src/lib/components/shared-components/immich-logo.svelte b/web/src/lib/components/shared-components/immich-logo.svelte
deleted file mode 100644
index a57f367964..0000000000
--- a/web/src/lib/components/shared-components/immich-logo.svelte
+++ /dev/null
@@ -1,112 +0,0 @@
-<script lang="ts">
-  import { t } from 'svelte-i18n';
-  import type { HTMLImgAttributes } from 'svelte/elements';
-
-  interface Props extends HTMLImgAttributes {
-    noText?: boolean;
-    class?: string | undefined;
-  }
-
-  let { noText = false, class: cssClass }: Props = $props();
-  const viewBox = $derived(`0 0 ${noText ? '260' : '792'} 266.25`);
-</script>
-
-<svg {viewBox} class={cssClass}>
-  <title>{$t('immich_logo')}</title>
-  {#if !noText}
-    <g class="st0 dark:fill-[#accbfa] fill-[#4251b0]">
-      <path
-        d="M268.73,63.18c6.34,0,11.52,5.18,11.52,11.35c0,6.34-5.18,11.35-11.52,11.35s-11.69-5.01-11.69-11.35
-		C257.04,68.36,262.39,63.18,268.73,63.18z M258.88,122.45c0-3.01-0.67-7.85-0.67-10.68c0-6.01,4.67-10.68,10.52-10.68
-		c5.84,0,10.52,4.67,10.52,10.68c0,2.84-0.83,7.68-0.83,10.68v38.73c0,3.01,0.83,7.85,0.83,10.68c0,6.01-4.67,10.68-10.52,10.68
-		c-5.84,0-10.52-4.67-10.52-10.68c0-2.84,0.67-7.68,0.67-10.68V122.45z"
-      />
-      <path
-        d="M394.28,171.87c0-2.84,0.83-7.68,0.83-10.68V132.3c0-10.18-5.34-16.86-14.52-16.86c-6.01,0-11.35,3-14.86,8.85
-		c0.33,1.84,0.5,3.67,0.5,5.68v31.22c0,3.01,0.83,7.85,0.83,10.68c0,6.01-4.67,10.68-10.68,10.68c-5.51,0-10.35-4.67-10.35-10.68
-		c0-2.84,0.83-7.68,0.83-10.68V131.8c0-3.17-0.5-6.01-1.67-8.51c-2.17-4.84-6.51-7.85-12.52-7.85c-6.18,0-11.19,3.17-14.86,8.85
-		v36.9c0,3.01,0.83,7.85,0.83,10.68c0,6.01-4.84,10.68-10.52,10.68c-5.84,0-10.52-4.67-10.52-10.68c0-2.84,0.67-7.68,0.67-10.68
-		v-38.57c0-3.01-1.5-8.35-1.5-10.85c0-6.01,4.34-10.68,10.18-10.68c5.51,0,8.68,3.67,9.68,8.51c5.01-6.68,12.02-10.85,21.2-10.85
-		c10.85,0,18.7,5.18,23.54,13.52c5.51-8.68,13.52-13.52,23.54-13.52c16.86,0,29.72,12.19,29.72,31.72v30.72
-		c0,3.01,0.67,7.85,0.67,10.68c0,6.01-4.51,10.68-10.52,10.68C399.12,182.55,394.28,177.88,394.28,171.87z"
-      />
-      <path
-        d="M528.5,171.87c0-2.84,0.83-7.68,0.83-10.68V132.3c0-10.18-5.34-16.86-14.52-16.86c-6.01,0-11.35,3-14.86,8.85
-		c0.33,1.84,0.5,3.67,0.5,5.68v31.22c0,3.01,0.84,7.85,0.84,10.68c0,6.01-4.67,10.68-10.68,10.68c-5.51,0-10.35-4.67-10.35-10.68
-		c0-2.84,0.84-7.68,0.84-10.68V131.8c0-3.17-0.5-6.01-1.67-8.51c-2.17-4.84-6.51-7.85-12.52-7.85c-6.18,0-11.19,3.17-14.86,8.85
-		v36.9c0,3.01,0.83,7.85,0.83,10.68c0,6.01-4.84,10.68-10.52,10.68c-5.84,0-10.52-4.67-10.52-10.68c0-2.84,0.67-7.68,0.67-10.68
-		v-38.57c0-3.01-1.5-8.35-1.5-10.85c0-6.01,4.34-10.68,10.18-10.68c5.51,0,8.68,3.67,9.68,8.51c5.01-6.68,12.02-10.85,21.2-10.85
-		c10.85,0,18.7,5.18,23.54,13.52c5.51-8.68,13.52-13.52,23.54-13.52c16.86,0,29.72,12.19,29.72,31.72v30.72
-		c0,3.01,0.67,7.85,0.67,10.68c0,6.01-4.51,10.68-10.52,10.68C533.35,182.55,528.5,177.88,528.5,171.87z"
-      />
-      <path
-        d="M576.92,63.18c6.34,0,11.52,5.18,11.52,11.35c0,6.34-5.18,11.35-11.52,11.35s-11.69-5.01-11.69-11.35
-		C565.23,68.36,570.57,63.18,576.92,63.18z M567.07,122.45c0-3.01-0.67-7.85-0.67-10.68c0-6.01,4.67-10.68,10.52-10.68
-		s10.52,4.67,10.52,10.68c0,2.84-0.84,7.68-0.84,10.68v38.73c0,3.01,0.84,7.85,0.84,10.68c0,6.01-4.67,10.68-10.52,10.68
-		s-10.52-4.67-10.52-10.68c0-2.84,0.67-7.68,0.67-10.68V122.45z"
-      />
-      <path
-        d="M601.79,141.31c0-23.54,14.69-42.57,39.07-42.57c12.86,0,24.71,5.84,30.05,14.53c2,3.17,2.34,5.01,2.34,6.51
-		c0,5.18-4.01,9.52-9.85,9.52c-3.84,0-7.34-2.17-8.85-6.01c-2.34-5.18-6.85-8.18-13.69-8.18c-12.86,0-20.03,11.52-20.03,26.04
-		c0,14.69,7.51,26.04,20.53,26.04c7.01,0,12.02-2.5,14.36-7.68c1.67-3.51,4.84-6.51,9.18-6.51c6.01,0,9.68,4.17,9.68,9.35
-		c0,2.5-1,5.51-3.17,8.35c-5.51,7.35-15.86,13.19-30.05,13.19C616.32,183.89,601.79,165.19,601.79,141.31z"
-      />
-      <path
-        d="M737.69,171.87c0-2.84,0.67-7.68,0.67-10.68v-28.55c0-10.18-5.68-17.2-15.36-17.2
-		c-6.68,0-12.35,3.17-16.03,8.35v37.4c0,3.01,0.67,7.85,0.67,10.68c0,6.01-4.67,10.68-10.52,10.68s-10.52-4.67-10.52-10.68
-		c0-2.84,0.84-7.68,0.84-10.68v-80.8c0-3.01-0.84-7.85-0.84-10.68c0-6.01,4.84-10.68,10.52-10.68c5.84,0,10.52,4.67,10.52,10.68
-		c0,2.84-0.67,7.68-0.67,10.68v27.21c5.01-5.51,12.19-8.85,21.37-8.85c17.2,0,29.55,12.86,29.55,31.22v31.22
-		c0,3.01,0.83,7.85,0.83,10.68c0,6.01-4.84,10.68-10.52,10.68C742.36,182.55,737.69,177.88,737.69,171.87z"
-      />
-    </g>
-  {/if}
-  <g>
-    <path
-      class="st1"
-      d="M114.82,96.21c11.92,10.55,21.52,21.86,27.7,32.52c10.62-18.99,17.71-41.55,17.8-55.92c0-0.1,0-0.19,0-0.28
-		c0-21.26-21.21-29.54-39.48-29.54s-39.48,8.28-39.48,29.54c0,0.29,0,0.68,0,1.15C91.54,78.2,103.61,86.29,114.82,96.21z"
-    />
-    <path
-      class="st2"
-      d="M49.8,154.19c7.45-8.29,18.88-17.27,31.77-24.86c13.72-8.07,27.44-13.71,39.49-16.3
-		c-14.78-15.96-34.04-29.68-47.68-34.21c-0.1-0.03-0.18-0.06-0.27-0.09c-20.22-6.57-34.65,11.05-40.3,28.42s-4.33,40.11,15.89,46.68
-		C48.99,153.93,49.35,154.05,49.8,154.19z"
-    />
-    <path
-      class="st3"
-      d="M209.07,106.86c-5.65-17.38-20.07-34.99-40.3-28.42c-0.28,0.09-0.65,0.21-1.09,0.35
-		c-1.16,11.08-5.12,25.07-11.09,38.79c-6.35,14.6-14.14,27.23-22.36,36.39c21.34,4.23,44.99,4,58.68-0.35
-		c0.1-0.03,0.19-0.06,0.27-0.09C213.4,146.97,214.71,124.24,209.07,106.86z"
-    />
-    <path
-      class="st4"
-      d="M102.8,171.18c-3.44-15.54-4.56-30.34-3.3-42.59c-19.75,9.12-38.75,23.2-47.27,34.78
-		c-0.06,0.08-0.11,0.16-0.16,0.23c-12.5,17.2-0.2,36.37,14.58,47.11s36.81,16.51,49.31-0.69c0.17-0.24,0.4-0.55,0.68-0.93
-		C111.05,199.44,106.04,185.79,102.8,171.18z"
-    />
-    <path
-      class="st5"
-      d="M189.48,162.49c-10.9,2.33-25.42,2.88-40.32,1.44c-15.84-1.53-30.26-5.03-41.52-10.02
-		c2.57,21.6,10.09,44.02,18.47,55.7c0.06,0.08,0.11,0.16,0.16,0.23c12.5,17.2,34.52,11.43,49.31,0.69
-		c14.78-10.74,27.08-29.9,14.58-47.11C189.99,163.18,189.76,162.86,189.48,162.49z"
-    />
-  </g>
-</svg>
-
-<style>
-  .st1 {
-    fill: #fa2921;
-  }
-  .st2 {
-    fill: #ed79b5;
-  }
-  .st3 {
-    fill: #ffb400;
-  }
-  .st4 {
-    fill: #1e83f7;
-  }
-  .st5 {
-    fill: #18c249;
-  }
-</style>
diff --git a/web/src/lib/components/shared-components/navigation-bar/navigation-bar.svelte b/web/src/lib/components/shared-components/navigation-bar/navigation-bar.svelte
index f73f9f3b51..03c5ca3be4 100644
--- a/web/src/lib/components/shared-components/navigation-bar/navigation-bar.svelte
+++ b/web/src/lib/components/shared-components/navigation-bar/navigation-bar.svelte
@@ -6,7 +6,6 @@
   import { page } from '$app/state';
   import { clickOutside } from '$lib/actions/click-outside';
   import CastButton from '$lib/cast/cast-button.svelte';
-  import ImmichLogo from '$lib/components/shared-components/immich-logo.svelte';
   import NotificationPanel from '$lib/components/shared-components/navigation-bar/notification-panel.svelte';
   import SearchBar from '$lib/components/shared-components/search-bar/search-bar.svelte';
   import { AppRoute } from '$lib/constants';
@@ -17,7 +16,7 @@
   import { featureFlags } from '$lib/stores/server-config.store';
   import { sidebarStore } from '$lib/stores/sidebar.svelte';
   import { user } from '$lib/stores/user.store';
-  import { Button, IconButton } from '@immich/ui';
+  import { Button, IconButton, Logo } from '@immich/ui';
   import { mdiBellBadge, mdiBellOutline, mdiMagnify, mdiMenu, mdiTrayArrowUp } from '@mdi/js';
   import { onMount } from 'svelte';
   import { t } from 'svelte-i18n';
@@ -78,7 +77,7 @@
         class="sidebar:hidden"
       />
       <a data-sveltekit-preload-data="hover" href={AppRoute.PHOTOS}>
-        <ImmichLogo class="max-md:h-12 h-12.5" noText={!mobileDevice.isFullSidebar} />
+        <Logo variant={mobileDevice.isFullSidebar ? 'inline' : 'icon'} class="max-md:h-12" />
       </a>
     </div>
     <div class="flex justify-between gap-4 lg:gap-8 pe-6">
diff --git a/web/src/lib/components/shared-components/side-bar/purchase-info.svelte b/web/src/lib/components/shared-components/side-bar/purchase-info.svelte
index eb4433aa2b..8c16e3ba38 100644
--- a/web/src/lib/components/shared-components/side-bar/purchase-info.svelte
+++ b/web/src/lib/components/shared-components/side-bar/purchase-info.svelte
@@ -1,7 +1,5 @@
 <script lang="ts">
   import { goto } from '$app/navigation';
-  import ImmichLogo from '$lib/components/shared-components/immich-logo.svelte';
-  import SupporterBadge from '$lib/components/shared-components/side-bar/supporter-badge.svelte';
   import { AppRoute } from '$lib/constants';
   import Portal from '$lib/elements/Portal.svelte';
   import PurchaseModal from '$lib/modals/PurchaseModal.svelte';
@@ -11,7 +9,7 @@
   import { handleError } from '$lib/utils/handle-error';
   import { getButtonVisibility } from '$lib/utils/purchase-utils';
   import { updateMyPreferences } from '@immich/sdk';
-  import { Button, Icon, IconButton, modalManager } from '@immich/ui';
+  import { Button, Icon, IconButton, Logo, modalManager, SupporterBadge } from '@immich/ui';
   import { mdiClose, mdiInformationOutline } from '@mdi/js';
   import { t } from 'svelte-i18n';
   import { SvelteDate } from 'svelte/reactivity';
@@ -93,9 +91,7 @@
     >
       <div class="flex justify-between w-full place-items-center place-content-center">
         <div class="flex place-items-center place-content-center gap-1">
-          <div class="h-6 w-6">
-            <ImmichLogo noText class="h-6" />
-          </div>
+          <Logo variant="icon" size="tiny" />
           <p class="flex text-primary font-medium">
             {$t('purchase_button_buy_immich')}
           </p>
@@ -122,7 +118,7 @@
     >
       <div class="flex justify-between place-items-center">
         <div class="h-10 w-10">
-          <ImmichLogo noText class="h-8" />
+          <Logo variant="icon" size="small" />
         </div>
         <IconButton
           shape="round"
diff --git a/web/src/lib/components/shared-components/side-bar/supporter-badge.svelte b/web/src/lib/components/shared-components/side-bar/supporter-badge.svelte
index 61489955be..2dde2717c2 100644
--- a/web/src/lib/components/shared-components/side-bar/supporter-badge.svelte
+++ b/web/src/lib/components/shared-components/side-bar/supporter-badge.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
+  import { Logo } from '@immich/ui';
   import { t } from 'svelte-i18n';
-  import ImmichLogo from '../immich-logo.svelte';
 
   interface Props {
     centered?: boolean;
@@ -14,7 +14,7 @@
   class="flex gap-1 mt-2 place-items-center dark:bg-immich-dark-primary/10 bg-gray-200/50 p-2 rounded-lg bg-clip-padding border border-transparent relative supporter-effect"
   class:place-content-center={centered}
 >
-  <ImmichLogo class={logoSize === 'sm' ? 'h-6' : 'h-8'} noText />
+  <Logo variant="icon" size={logoSize === 'sm' ? 'tiny' : 'small'} />
   <p class="dark:text-gray-100">{$t('purchase_account_info')}</p>
 </div>
 

From 8de6ec1a1b926719838a39725349db373e732897 Mon Sep 17 00:00:00 2001
From: Jason Rasmussen <jason@rasm.me>
Date: Mon, 10 Nov 2025 13:40:58 -0500
Subject: [PATCH 63/84] refactor: album service (#23768)

---
 .../album-page/album-shared-link.svelte       |  4 +-
 .../components/album-page/albums-list.svelte  | 16 +---
 .../asset-viewer/actions/share-action.svelte  |  6 +-
 .../actions/CreateSharedLinkAction.svelte     |  9 +-
 web/src/lib/managers/event-manager.svelte.ts  |  4 +-
 .../lib/modals/SharedLinkCreateModal.svelte   | 95 ++++++++-----------
 web/src/lib/services/shared-link.service.ts   | 49 +++++++++-
 .../[[assetId=id]]/+page.svelte               | 14 +--
 .../shared-links/[[id=id]]/+page.svelte       | 24 +++--
 9 files changed, 114 insertions(+), 107 deletions(-)

diff --git a/web/src/lib/components/album-page/album-shared-link.svelte b/web/src/lib/components/album-page/album-shared-link.svelte
index 935fa7837c..580a865ae6 100644
--- a/web/src/lib/components/album-page/album-shared-link.svelte
+++ b/web/src/lib/components/album-page/album-shared-link.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import SharedLinkCopy from '$lib/components/sharedlinks-page/actions/shared-link-copy.svelte';
-  import { handleViewSharedLinkQrCode } from '$lib/services/shared-link.service';
+  import { handleShowSharedLinkQrCode } from '$lib/services/shared-link.service';
   import { locale } from '$lib/stores/preferences.store';
   import type { AlbumResponseDto, SharedLinkResponseDto } from '@immich/sdk';
   import { IconButton, Text } from '@immich/ui';
@@ -46,7 +46,7 @@
       color="secondary"
       variant="ghost"
       icon={mdiQrcode}
-      onclick={() => handleViewSharedLinkQrCode(sharedLink)}
+      onclick={() => handleShowSharedLinkQrCode(sharedLink)}
     />
     <SharedLinkCopy {sharedLink} />
   </div>
diff --git a/web/src/lib/components/album-page/albums-list.svelte b/web/src/lib/components/album-page/albums-list.svelte
index 7b4cae0312..fb8d044b1a 100644
--- a/web/src/lib/components/album-page/albums-list.svelte
+++ b/web/src/lib/components/album-page/albums-list.svelte
@@ -11,7 +11,6 @@
   import AlbumShareModal from '$lib/modals/AlbumShareModal.svelte';
   import SharedLinkCreateModal from '$lib/modals/SharedLinkCreateModal.svelte';
   import { handleConfirmAlbumDelete, handleDownloadAlbum } from '$lib/services/album.service';
-  import { handleViewSharedLinkQrCode } from '$lib/services/shared-link.service';
   import {
     AlbumFilter,
     AlbumGroupBy,
@@ -255,10 +254,11 @@
           }
 
           case 'sharedLink': {
-            const sharedLink = await modalManager.show(SharedLinkCreateModal, { albumId: selectedAlbum.id });
-            if (sharedLink) {
-              handleSharedLinkCreated(selectedAlbum);
-              await handleViewSharedLinkQrCode(sharedLink);
+            const success = await modalManager.show(SharedLinkCreateModal, { albumId: selectedAlbum.id });
+            if (success) {
+              selectedAlbum.shared = true;
+              selectedAlbum.hasSharedLink = true;
+              updateAlbumInfo(selectedAlbum);
             }
             break;
           }
@@ -346,12 +346,6 @@
       albumToShare = null;
     }
   };
-
-  const handleSharedLinkCreated = (album: AlbumResponseDto) => {
-    album.shared = true;
-    album.hasSharedLink = true;
-    updateAlbumInfo(album);
-  };
 </script>
 
 {#if albums.length > 0}
diff --git a/web/src/lib/components/asset-viewer/actions/share-action.svelte b/web/src/lib/components/asset-viewer/actions/share-action.svelte
index a284d5e364..bfd3312f3b 100644
--- a/web/src/lib/components/asset-viewer/actions/share-action.svelte
+++ b/web/src/lib/components/asset-viewer/actions/share-action.svelte
@@ -1,6 +1,5 @@
 <script lang="ts">
   import SharedLinkCreateModal from '$lib/modals/SharedLinkCreateModal.svelte';
-  import { handleViewSharedLinkQrCode } from '$lib/services/shared-link.service';
   import type { AssetResponseDto } from '@immich/sdk';
   import { IconButton, modalManager } from '@immich/ui';
   import { mdiShareVariantOutline } from '@mdi/js';
@@ -13,10 +12,7 @@
   let { asset }: Props = $props();
 
   const handleClick = async () => {
-    const sharedLink = await modalManager.show(SharedLinkCreateModal, { assetIds: [asset.id] });
-    if (sharedLink) {
-      await handleViewSharedLinkQrCode(sharedLink);
-    }
+    await modalManager.show(SharedLinkCreateModal, { assetIds: [asset.id] });
   };
 </script>
 
diff --git a/web/src/lib/components/timeline/actions/CreateSharedLinkAction.svelte b/web/src/lib/components/timeline/actions/CreateSharedLinkAction.svelte
index 06291e2188..202b87a15b 100644
--- a/web/src/lib/components/timeline/actions/CreateSharedLinkAction.svelte
+++ b/web/src/lib/components/timeline/actions/CreateSharedLinkAction.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
   import { getAssetControlContext } from '$lib/components/timeline/AssetSelectControlBar.svelte';
   import SharedLinkCreateModal from '$lib/modals/SharedLinkCreateModal.svelte';
-  import { handleViewSharedLinkQrCode } from '$lib/services/shared-link.service';
   import { IconButton, modalManager } from '@immich/ui';
   import { mdiShareVariantOutline } from '@mdi/js';
   import { t } from 'svelte-i18n';
@@ -9,13 +8,7 @@
   const { getAssets } = getAssetControlContext();
 
   const handleClick = async () => {
-    const sharedLink = await modalManager.show(SharedLinkCreateModal, {
-      assetIds: [...getAssets()].map(({ id }) => id),
-    });
-
-    if (sharedLink) {
-      await handleViewSharedLinkQrCode(sharedLink);
-    }
+    await modalManager.show(SharedLinkCreateModal, { assetIds: [...getAssets()].map(({ id }) => id) });
   };
 </script>
 
diff --git a/web/src/lib/managers/event-manager.svelte.ts b/web/src/lib/managers/event-manager.svelte.ts
index 7c7717a4d4..44ee524658 100644
--- a/web/src/lib/managers/event-manager.svelte.ts
+++ b/web/src/lib/managers/event-manager.svelte.ts
@@ -1,5 +1,5 @@
 import type { ThemeSetting } from '$lib/managers/theme-manager.svelte';
-import type { LoginResponseDto } from '@immich/sdk';
+import type { LoginResponseDto, SharedLinkResponseDto } from '@immich/sdk';
 
 export type Events = {
   AppInit: [];
@@ -8,6 +8,8 @@ export type Events = {
   AuthLogout: [];
   LanguageChange: [{ name: string; code: string; rtl?: boolean }];
   ThemeChange: [ThemeSetting];
+  SharedLinkCreate: [SharedLinkResponseDto];
+  SharedLinkUpdate: [SharedLinkResponseDto];
 };
 
 type Listener<EventMap extends Record<string, unknown[]>, K extends keyof EventMap> = (...params: EventMap[K]) => void;
diff --git a/web/src/lib/modals/SharedLinkCreateModal.svelte b/web/src/lib/modals/SharedLinkCreateModal.svelte
index b8444705fa..5ba0402752 100644
--- a/web/src/lib/modals/SharedLinkCreateModal.svelte
+++ b/web/src/lib/modals/SharedLinkCreateModal.svelte
@@ -1,26 +1,15 @@
 <script lang="ts">
   import SettingSelect from '$lib/components/shared-components/settings/setting-select.svelte';
+  import { handleCreateSharedLink, handleUpdateSharedLink } from '$lib/services/shared-link.service';
   import { locale } from '$lib/stores/preferences.store';
-  import { handleError } from '$lib/utils/handle-error';
-  import { SharedLinkType, createSharedLink, updateSharedLink, type SharedLinkResponseDto } from '@immich/sdk';
-  import {
-    Button,
-    Field,
-    Input,
-    Modal,
-    ModalBody,
-    ModalFooter,
-    PasswordInput,
-    Switch,
-    Text,
-    toastManager,
-  } from '@immich/ui';
+  import { SharedLinkType, type SharedLinkResponseDto } from '@immich/sdk';
+  import { Button, Field, Input, Modal, ModalBody, ModalFooter, PasswordInput, Switch, Text } from '@immich/ui';
   import { mdiLink } from '@mdi/js';
   import { DateTime, Duration } from 'luxon';
   import { t } from 'svelte-i18n';
 
   interface Props {
-    onClose: (sharedLink?: SharedLinkResponseDto) => void;
+    onClose: (success?: boolean) => void;
     albumId?: string | undefined;
     assetIds?: string[];
     editingLink?: SharedLinkResponseDto | undefined;
@@ -81,56 +70,46 @@
     assetIds = editingLink.assets.map(({ id }) => id);
   }
 
-  const handleCreateSharedLink = async () => {
-    const expirationDate = expirationOption > 0 ? DateTime.now().plus(expirationOption).toISO() : undefined;
+  const onCreate = async () => {
+    const success = await handleCreateSharedLink({
+      type: shareType,
+      albumId,
+      assetIds,
+      expiresAt: expirationOption > 0 ? DateTime.now().plus(expirationOption).toISO() : undefined,
+      allowUpload,
+      description,
+      password,
+      allowDownload,
+      showMetadata,
+      slug,
+    });
 
-    try {
-      const data = await createSharedLink({
-        sharedLinkCreateDto: {
-          type: shareType,
-          albumId,
-          assetIds,
-          expiresAt: expirationDate,
-          allowUpload,
-          description,
-          password,
-          allowDownload,
-          showMetadata,
-          slug,
-        },
-      });
-      onClose(data);
-    } catch (error) {
-      handleError(error, $t('errors.failed_to_create_shared_link'));
+    if (success) {
+      onClose(true);
     }
   };
 
-  const handleEditLink = async () => {
+  const onUpdate = async () => {
     if (!editingLink) {
       return;
     }
 
-    try {
-      const expirationDate = expirationOption > 0 ? DateTime.now().plus(expirationOption).toISO() : null;
+    const success = await handleUpdateSharedLink(editingLink, {
+      description,
+      password: password ?? null,
+      expiresAt: shouldChangeExpirationTime
+        ? expirationOption > 0
+          ? DateTime.now().plus(expirationOption).toISO()
+          : null
+        : undefined,
+      allowUpload,
+      allowDownload,
+      showMetadata,
+      slug: slug.trim() ?? null,
+    });
 
-      const updatedLink = await updateSharedLink({
-        id: editingLink.id,
-        sharedLinkEditDto: {
-          description,
-          password: password ?? null,
-          expiresAt: shouldChangeExpirationTime ? expirationDate : undefined,
-          allowUpload,
-          allowDownload,
-          showMetadata,
-          slug: slug.trim() ?? null,
-        },
-      });
-
-      toastManager.success($t('saved'));
-
-      onClose(updatedLink);
-    } catch (error) {
-      handleError(error, $t('errors.failed_to_edit_shared_link'));
+    if (success) {
+      onClose(true);
     }
   };
 
@@ -219,9 +198,9 @@
 
   <ModalFooter>
     {#if editingLink}
-      <Button fullWidth onclick={handleEditLink}>{$t('confirm')}</Button>
+      <Button fullWidth onclick={onUpdate}>{$t('confirm')}</Button>
     {:else}
-      <Button fullWidth onclick={handleCreateSharedLink}>{$t('create_link')}</Button>
+      <Button fullWidth onclick={onCreate}>{$t('create_link')}</Button>
     {/if}
   </ModalFooter>
 </Modal>
diff --git a/web/src/lib/services/shared-link.service.ts b/web/src/lib/services/shared-link.service.ts
index 35bde6784f..529b6b23b4 100644
--- a/web/src/lib/services/shared-link.service.ts
+++ b/web/src/lib/services/shared-link.service.ts
@@ -1,9 +1,17 @@
+import { eventManager } from '$lib/managers/event-manager.svelte';
 import QrCodeModal from '$lib/modals/QrCodeModal.svelte';
 import { serverConfig } from '$lib/stores/server-config.store';
 import { copyToClipboard } from '$lib/utils';
+import { handleError } from '$lib/utils/handle-error';
 import { getFormatter } from '$lib/utils/i18n';
-import type { SharedLinkResponseDto } from '@immich/sdk';
-import { modalManager } from '@immich/ui';
+import {
+  createSharedLink,
+  updateSharedLink,
+  type SharedLinkCreateDto,
+  type SharedLinkEditDto,
+  type SharedLinkResponseDto,
+} from '@immich/sdk';
+import { modalManager, toastManager } from '@immich/ui';
 import { get } from 'svelte/store';
 
 const makeSharedLinkUrl = (sharedLink: SharedLinkResponseDto) => {
@@ -11,7 +19,42 @@ const makeSharedLinkUrl = (sharedLink: SharedLinkResponseDto) => {
   return new URL(path, get(serverConfig).externalDomain || globalThis.location.origin).href;
 };
 
-export const handleViewSharedLinkQrCode = async (sharedLink: SharedLinkResponseDto) => {
+export const handleCreateSharedLink = async (dto: SharedLinkCreateDto) => {
+  const $t = await getFormatter();
+
+  try {
+    const sharedLink = await createSharedLink({ sharedLinkCreateDto: dto });
+
+    eventManager.emit('SharedLinkCreate', sharedLink);
+
+    // prevent nested modal
+    void handleShowSharedLinkQrCode(sharedLink);
+
+    return true;
+  } catch (error) {
+    handleError(error, $t('errors.failed_to_create_shared_link'));
+    return false;
+  }
+};
+
+export const handleUpdateSharedLink = async (sharedLink: SharedLinkResponseDto, dto: SharedLinkEditDto) => {
+  const $t = await getFormatter();
+
+  try {
+    const response = await updateSharedLink({ id: sharedLink.id, sharedLinkEditDto: dto });
+
+    eventManager.emit('SharedLinkUpdate', { album: sharedLink.album, ...response });
+
+    toastManager.success($t('saved'));
+
+    return true;
+  } catch (error) {
+    handleError(error, $t('errors.failed_to_edit_shared_link'));
+    return false;
+  }
+};
+
+export const handleShowSharedLinkQrCode = async (sharedLink: SharedLinkResponseDto) => {
   const $t = await getFormatter();
   await modalManager.show(QrCodeModal, { title: $t('view_link'), value: makeSharedLinkUrl(sharedLink) });
 };
diff --git 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
index 1c8a6ccfa0..6b543e1ecf 100644
--- 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
@@ -8,6 +8,7 @@
   import AlbumTitle from '$lib/components/album-page/album-title.svelte';
   import ActivityStatus from '$lib/components/asset-viewer/activity-status.svelte';
   import ActivityViewer from '$lib/components/asset-viewer/activity-viewer.svelte';
+  import OnEvents from '$lib/components/OnEvents.svelte';
   import ButtonContextMenu from '$lib/components/shared-components/context-menu/button-context-menu.svelte';
   import MenuOption from '$lib/components/shared-components/context-menu/menu-option.svelte';
   import ControlAppBar from '$lib/components/shared-components/control-app-bar.svelte';
@@ -36,7 +37,6 @@
   import AlbumUsersModal from '$lib/modals/AlbumUsersModal.svelte';
   import SharedLinkCreateModal from '$lib/modals/SharedLinkCreateModal.svelte';
   import { handleConfirmAlbumDelete, handleDownloadAlbum } from '$lib/services/album.service';
-  import { handleViewSharedLinkQrCode } from '$lib/services/shared-link.service';
   import { AssetInteraction } from '$lib/stores/asset-interaction.svelte';
   import { assetViewingStore } from '$lib/stores/asset-viewing.store';
   import { featureFlags } from '$lib/stores/server-config.store';
@@ -384,12 +384,12 @@
     }
   };
 
+  const onSharedLinkCreate = async () => {
+    await refreshAlbum();
+  };
+
   const handleShareLink = async () => {
-    const sharedLink = await modalManager.show(SharedLinkCreateModal, { albumId: album.id });
-    if (sharedLink) {
-      await refreshAlbum();
-      await handleViewSharedLinkQrCode(sharedLink);
-    }
+    await modalManager.show(SharedLinkCreateModal, { albumId: album.id });
   };
 
   const handleEditUsers = async () => {
@@ -424,6 +424,8 @@
   };
 </script>
 
+<OnEvents {onSharedLinkCreate} />
+
 <div class="flex overflow-hidden" use:scrollMemoryClearer={{ routeStartsWith: AppRoute.ALBUMS }}>
   <div class="relative w-full shrink">
     <main class="relative h-dvh overflow-hidden px-2 md:px-6 max-md:pt-(--navbar-height-md) pt-(--navbar-height)">
diff --git a/web/src/routes/(user)/shared-links/[[id=id]]/+page.svelte b/web/src/routes/(user)/shared-links/[[id=id]]/+page.svelte
index 2aa24a57ba..4b63ce71a1 100644
--- a/web/src/routes/(user)/shared-links/[[id=id]]/+page.svelte
+++ b/web/src/routes/(user)/shared-links/[[id=id]]/+page.svelte
@@ -2,6 +2,7 @@
   import { goto } from '$app/navigation';
   import { page } from '$app/state';
   import UserPageLayout from '$lib/components/layouts/user-page-layout.svelte';
+  import OnEvents from '$lib/components/OnEvents.svelte';
   import SharedLinkCard from '$lib/components/sharedlinks-page/shared-link-card.svelte';
   import { AppRoute } from '$lib/constants';
   import GroupTab from '$lib/elements/GroupTab.svelte';
@@ -50,18 +51,6 @@
     }
   };
 
-  const handleEditDone = async (updatedLink?: SharedLinkResponseDto) => {
-    if (updatedLink) {
-      const index = sharedLinks.findIndex((link) => link.id === updatedLink.id);
-      if (index !== -1) {
-        sharedLinks[index] = updatedLink;
-      }
-    } else {
-      await refresh();
-    }
-    await goto(AppRoute.SHARED_LINKS);
-  };
-
   type Filter = 'all' | 'album' | 'individual';
 
   const filterMap: Record<Filter, string> = {
@@ -91,8 +80,17 @@
         (type === SharedLinkType.Individual && selectedTab === 'individual'),
     ),
   );
+
+  const onSharedLinkUpdate = (sharedLink: SharedLinkResponseDto) => {
+    const index = sharedLinks.findIndex((link) => link.id === sharedLink.id);
+    if (index !== -1) {
+      sharedLinks[index] = sharedLink;
+    }
+  };
 </script>
 
+<OnEvents {onSharedLinkUpdate} />
+
 <UserPageLayout title={data.meta.title}>
   {#snippet buttons()}
     <div class="hidden xl:block h-10">
@@ -116,7 +114,7 @@
     {/if}
 
     {#if sharedLink}
-      <SharedLinkCreateModal editingLink={sharedLink} onClose={handleEditDone} />
+      <SharedLinkCreateModal editingLink={sharedLink} onClose={() => goto(AppRoute.SHARED_LINKS)} />
     {/if}
   </div>
 </UserPageLayout>

From cb6d81771dbb8197322b2ef2568dc9b97fd1dd0c Mon Sep 17 00:00:00 2001
From: idubnori <i.dub.nori@gmail.com>
Date: Tue, 11 Nov 2025 04:25:43 +0900
Subject: [PATCH 64/84] fix(mobile): sync album and asset activity state when
 add/remove asset level activity (#23484)

* fix; sync album-asset state when remove activity

* make build

* fix: support adding case

* make build

* Update mobile/lib/providers/activity.provider.dart

Co-authored-by: shenlong <139912620+shenlong-tanwen@users.noreply.github.com>

* fix: add missing import for collection package

* make build

---------

Co-authored-by: shenlong <139912620+shenlong-tanwen@users.noreply.github.com>
---
 mobile/lib/providers/activity.provider.dart   | 53 ++++++++++--
 mobile/lib/providers/activity.provider.g.dart |  2 +-
 .../activity/activity_provider_test.dart      | 86 ++++++++++++++++---
 3 files changed, 118 insertions(+), 23 deletions(-)

diff --git a/mobile/lib/providers/activity.provider.dart b/mobile/lib/providers/activity.provider.dart
index a867a5a281..5e0e71d85d 100644
--- a/mobile/lib/providers/activity.provider.dart
+++ b/mobile/lib/providers/activity.provider.dart
@@ -1,3 +1,4 @@
+import 'package:collection/collection.dart';
 import 'package:immich_mobile/models/activities/activity.model.dart';
 import 'package:immich_mobile/providers/activity_service.provider.dart';
 import 'package:immich_mobile/providers/activity_statistics.provider.dart';
@@ -16,13 +17,20 @@ class AlbumActivity extends _$AlbumActivity {
 
   Future<void> removeActivity(String id) async {
     if (await ref.watch(activityServiceProvider).removeActivity(id)) {
-      final activities = state.valueOrNull ?? [];
-      final removedActivity = activities.firstWhere((a) => a.id == id);
-      activities.remove(removedActivity);
-      state = AsyncData(activities);
-      // Decrement activity count only for comments
+      final removedActivity = _removeFromState(id);
+      if (removedActivity == null) {
+        return;
+      }
+
+      if (assetId != null) {
+        ref.read(albumActivityProvider(albumId).notifier)._removeFromState(id);
+      }
+
       if (removedActivity.type == ActivityType.comment) {
         ref.watch(activityStatisticsProvider(albumId, assetId).notifier).removeActivity();
+        if (assetId != null) {
+          ref.watch(activityStatisticsProvider(albumId).notifier).removeActivity();
+        }
       }
     }
   }
@@ -30,8 +38,10 @@ class AlbumActivity extends _$AlbumActivity {
   Future<void> addLike() async {
     final activity = await ref.watch(activityServiceProvider).addActivity(albumId, ActivityType.like, assetId: assetId);
     if (activity.hasValue) {
-      final activities = state.asData?.value ?? [];
-      state = AsyncData([...activities, activity.requireValue]);
+      _addToState(activity.requireValue);
+      if (assetId != null) {
+        ref.read(albumActivityProvider(albumId).notifier)._addToState(activity.requireValue);
+      }
     }
   }
 
@@ -41,8 +51,10 @@ class AlbumActivity extends _$AlbumActivity {
         .addActivity(albumId, ActivityType.comment, assetId: assetId, comment: comment);
 
     if (activity.hasValue) {
-      final activities = state.valueOrNull ?? [];
-      state = AsyncData([...activities, activity.requireValue]);
+      _addToState(activity.requireValue);
+      if (assetId != null) {
+        ref.read(albumActivityProvider(albumId).notifier)._addToState(activity.requireValue);
+      }
       ref.watch(activityStatisticsProvider(albumId, assetId).notifier).addActivity();
       // The previous addActivity call would increase the count of an asset if assetId != null
       // To also increase the activity count of the album, calling it once again with assetId set to null
@@ -51,6 +63,29 @@ class AlbumActivity extends _$AlbumActivity {
       }
     }
   }
+
+  void _addToState(Activity activity) {
+    final activities = state.valueOrNull ?? [];
+    if (activities.any((a) => a.id == activity.id)) {
+      return;
+    }
+    state = AsyncData([...activities, activity]);
+  }
+
+  Activity? _removeFromState(String id) {
+    final activities = state.valueOrNull;
+    if (activities == null) {
+      return null;
+    }
+    final activity = activities.firstWhereOrNull((a) => a.id == id);
+    if (activity == null) {
+      return null;
+    }
+
+    final updated = [...activities]..remove(activity);
+    state = AsyncData(updated);
+    return activity;
+  }
 }
 
 /// Mock class for testing
diff --git a/mobile/lib/providers/activity.provider.g.dart b/mobile/lib/providers/activity.provider.g.dart
index dc927795f8..6ca99e4f72 100644
--- a/mobile/lib/providers/activity.provider.g.dart
+++ b/mobile/lib/providers/activity.provider.g.dart
@@ -6,7 +6,7 @@ part of 'activity.provider.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$albumActivityHash() => r'3b0d7acee4d41c84b3f220784c3b904c83f836e6';
+String _$albumActivityHash() => r'154e8ae98da3efc142369eae46d4005468fd67da';
 
 /// Copied from Dart SDK
 class _SystemHash {
diff --git a/mobile/test/modules/activity/activity_provider_test.dart b/mobile/test/modules/activity/activity_provider_test.dart
index 7964b43cad..84eba62b70 100644
--- a/mobile/test/modules/activity/activity_provider_test.dart
+++ b/mobile/test/modules/activity/activity_provider_test.dart
@@ -33,6 +33,7 @@ final _activities = [
 void main() {
   late ActivityServiceMock activityMock;
   late ActivityStatisticsMock activityStatisticsMock;
+  late ActivityStatisticsMock albumActivityStatisticsMock;
   late ProviderContainer container;
   late AlbumActivityProvider provider;
   late ListenerMock<AsyncValue<List<Activity>>> listener;
@@ -44,17 +45,23 @@ void main() {
   setUp(() async {
     activityMock = ActivityServiceMock();
     activityStatisticsMock = ActivityStatisticsMock();
+    albumActivityStatisticsMock = ActivityStatisticsMock();
+
     container = TestUtils.createContainer(
       overrides: [
         activityServiceProvider.overrideWith((ref) => activityMock),
         activityStatisticsProvider('test-album', 'test-asset').overrideWith(() => activityStatisticsMock),
+        activityStatisticsProvider('test-album').overrideWith(() => albumActivityStatisticsMock),
       ],
     );
 
     // Mock values
+    when(() => activityStatisticsMock.build(any(), any())).thenReturn(0);
+    when(() => albumActivityStatisticsMock.build(any())).thenReturn(0);
     when(
       () => activityMock.getAllActivities('test-album', assetId: 'test-asset'),
     ).thenAnswer((_) async => [..._activities]);
+    when(() => activityMock.getAllActivities('test-album')).thenAnswer((_) async => [..._activities]);
 
     // Init and wait for providers future to complete
     provider = albumActivityProvider('test-album', 'test-asset');
@@ -89,6 +96,10 @@ void main() {
         () => activityMock.addActivity('test-album', ActivityType.like, assetId: 'test-asset'),
       ).thenAnswer((_) async => AsyncData(like));
 
+      final albumProvider = albumActivityProvider('test-album');
+      container.read(albumProvider.notifier);
+      await container.read(albumProvider.future);
+
       await container.read(provider.notifier).addLike();
 
       verify(() => activityMock.addActivity('test-album', ActivityType.like, assetId: 'test-asset'));
@@ -99,6 +110,11 @@ void main() {
 
       // Never bump activity count for new likes
       verifyNever(() => activityStatisticsMock.addActivity());
+      verifyNever(() => albumActivityStatisticsMock.addActivity());
+
+      final albumActivities = container.read(albumProvider).requireValue;
+      expect(albumActivities, hasLength(5));
+      expect(albumActivities, contains(like));
     });
 
     test('Like failed', () async {
@@ -107,6 +123,10 @@ void main() {
         () => activityMock.addActivity('test-album', ActivityType.like, assetId: 'test-asset'),
       ).thenAnswer((_) async => AsyncError(Exception('Mock'), StackTrace.current));
 
+      final albumProvider = albumActivityProvider('test-album');
+      container.read(albumProvider.notifier);
+      await container.read(albumProvider.future);
+
       await container.read(provider.notifier).addLike();
 
       verify(() => activityMock.addActivity('test-album', ActivityType.like, assetId: 'test-asset'));
@@ -114,6 +134,12 @@ void main() {
       final activities = await container.read(provider.future);
       expect(activities, hasLength(4));
       expect(activities, isNot(contains(like)));
+
+      verifyNever(() => albumActivityStatisticsMock.addActivity());
+
+      final albumActivities = container.read(albumProvider).requireValue;
+      expect(albumActivities, hasLength(4));
+      expect(albumActivities, isNot(contains(like)));
     });
   });
 
@@ -130,6 +156,7 @@ void main() {
       expect(activities, isNot(anyElement(predicate((Activity a) => a.id == '3'))));
 
       verifyNever(() => activityStatisticsMock.removeActivity());
+      verifyNever(() => albumActivityStatisticsMock.removeActivity());
     });
 
     test('Remove Like failed', () async {
@@ -140,6 +167,9 @@ void main() {
       final activities = await container.read(provider.future);
       expect(activities, hasLength(4));
       expect(activities, anyElement(predicate((Activity a) => a.id == '3')));
+
+      verifyNever(() => activityStatisticsMock.removeActivity());
+      verifyNever(() => albumActivityStatisticsMock.removeActivity());
     });
 
     test('Comment successfully removed', () async {
@@ -151,23 +181,35 @@ void main() {
       expect(activities, isNot(anyElement(predicate((Activity a) => a.id == '1'))));
 
       verify(() => activityStatisticsMock.removeActivity());
+      verify(() => albumActivityStatisticsMock.removeActivity());
+    });
+
+    test('Removes activity from album state when asset scoped', () async {
+      when(() => activityMock.removeActivity('3')).thenAnswer((_) async => true);
+      when(() => activityMock.getAllActivities('test-album')).thenAnswer((_) async => [..._activities]);
+
+      final albumProvider = albumActivityProvider('test-album');
+      container.read(albumProvider.notifier);
+      await container.read(albumProvider.future);
+
+      await container.read(provider.notifier).removeActivity('3');
+
+      final assetActivities = container.read(provider).requireValue;
+      final albumActivities = container.read(albumProvider).requireValue;
+
+      expect(assetActivities, hasLength(3));
+      expect(assetActivities, isNot(anyElement(predicate((Activity a) => a.id == '3'))));
+
+      expect(albumActivities, hasLength(3));
+      expect(albumActivities, isNot(anyElement(predicate((Activity a) => a.id == '3'))));
+
+      verify(() => activityMock.removeActivity('3'));
+      verifyNever(() => activityStatisticsMock.removeActivity());
+      verifyNever(() => albumActivityStatisticsMock.removeActivity());
     });
   });
 
   group('addComment()', () {
-    late ActivityStatisticsMock albumActivityStatisticsMock;
-
-    setUp(() {
-      albumActivityStatisticsMock = ActivityStatisticsMock();
-      container = TestUtils.createContainer(
-        overrides: [
-          activityServiceProvider.overrideWith((ref) => activityMock),
-          activityStatisticsProvider('test-album', 'test-asset').overrideWith(() => activityStatisticsMock),
-          activityStatisticsProvider('test-album').overrideWith(() => albumActivityStatisticsMock),
-        ],
-      );
-    });
-
     test('Comment successfully added', () async {
       final comment = Activity(
         id: '5',
@@ -178,6 +220,10 @@ void main() {
         assetId: 'test-asset',
       );
 
+      final albumProvider = albumActivityProvider('test-album');
+      container.read(albumProvider.notifier);
+      await container.read(albumProvider.future);
+
       when(
         () => activityMock.addActivity(
           'test-album',
@@ -206,6 +252,10 @@ void main() {
 
       verify(() => activityStatisticsMock.addActivity());
       verify(() => albumActivityStatisticsMock.addActivity());
+
+      final albumActivities = container.read(albumProvider).requireValue;
+      expect(albumActivities, hasLength(5));
+      expect(albumActivities, contains(comment));
     });
 
     test('Comment successfully added without assetId', () async {
@@ -225,6 +275,8 @@ void main() {
       when(() => activityMock.getAllActivities('test-album')).thenAnswer((_) async => [..._activities]);
 
       final albumProvider = albumActivityProvider('test-album');
+      container.read(albumProvider.notifier);
+      await container.read(albumProvider.future);
       await container.read(albumProvider.notifier).addComment('Test-Comment');
 
       verify(
@@ -258,6 +310,10 @@ void main() {
         ),
       ).thenAnswer((_) async => AsyncError(Exception('Error'), StackTrace.current));
 
+      final albumProvider = albumActivityProvider('test-album');
+      container.read(albumProvider.notifier);
+      await container.read(albumProvider.future);
+
       await container.read(provider.notifier).addComment('Test-Comment');
 
       final activities = await container.read(provider.future);
@@ -266,6 +322,10 @@ void main() {
 
       verifyNever(() => activityStatisticsMock.addActivity());
       verifyNever(() => albumActivityStatisticsMock.addActivity());
+
+      final albumActivities = container.read(albumProvider).requireValue;
+      expect(albumActivities, hasLength(4));
+      expect(albumActivities, isNot(contains(comment)));
     });
   });
 }

From b0a0b7c2e1eefe8d921f64f406e3c4c74f8de646 Mon Sep 17 00:00:00 2001
From: idubnori <i.dub.nori@gmail.com>
Date: Tue, 11 Nov 2025 04:26:27 +0900
Subject: [PATCH 65/84] feat(mobile): chat-style for asset activity view
 (#23347)

* feat(mobile): open assetviewer via album activities page

* adjust ui behavior: keep current asset & disable initial forcus

* init of v2...

* refactoring...

* refactor: remove _DismissibleWrapper

* feat: initial scrolling to bottom

* refactor: use feature toggle

* refactor: new route page

* fix: file name, dcm analyze

* fix: test failure

* fix: remove toggle and the exisitng style based on review feedback

* refactorr: rename methods for clarity in comment bubble widget

* feat: (mobile) chat-style asset activity timeline

* chore: extract as a new file

* chore: styling (based on 2c12bc56)

* chore: clean up

* fix: albumActivityProvider parameter

* fix: review point

* fix
---
 .../pages/drift_activities.page.dart          | 156 +-----------------
 .../activities_bottom_sheet.widget.dart       |  16 +-
 .../widgets/activities/comment_bubble.dart    | 143 ++++++++++++++++
 3 files changed, 151 insertions(+), 164 deletions(-)
 create mode 100644 mobile/lib/widgets/activities/comment_bubble.dart

diff --git a/mobile/lib/presentation/pages/drift_activities.page.dart b/mobile/lib/presentation/pages/drift_activities.page.dart
index 30e7dd497a..b92d429aa1 100644
--- a/mobile/lib/presentation/pages/drift_activities.page.dart
+++ b/mobile/lib/presentation/pages/drift_activities.page.dart
@@ -3,21 +3,13 @@ import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart' hide Store;
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/album/album.model.dart';
-import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/extensions/asyncvalue_extensions.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
-import 'package:immich_mobile/extensions/datetime_extensions.dart';
-import 'package:immich_mobile/models/activities/activity.model.dart';
+import 'package:immich_mobile/widgets/activities/comment_bubble.dart';
 import 'package:immich_mobile/presentation/widgets/action_buttons/like_activity_action_button.widget.dart';
 import 'package:immich_mobile/presentation/widgets/album/drift_activity_text_field.dart';
 import 'package:immich_mobile/providers/activity.provider.dart';
-import 'package:immich_mobile/providers/activity_service.provider.dart';
-import 'package:immich_mobile/providers/image/immich_remote_thumbnail_provider.dart';
-import 'package:immich_mobile/providers/infrastructure/asset_viewer/current_asset.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/current_album.provider.dart';
-import 'package:immich_mobile/providers/user.provider.dart';
-import 'package:immich_mobile/widgets/activities/dismissible_activity.dart';
-import 'package:immich_mobile/widgets/common/user_circle_avatar.dart';
 
 @RoutePage()
 class DriftActivitiesPage extends HookConsumerWidget {
@@ -27,10 +19,8 @@ class DriftActivitiesPage extends HookConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final asset = ref.read(currentAssetNotifier) as RemoteAsset?;
-
-    final activityNotifier = ref.read(albumActivityProvider(album.id, asset?.id).notifier);
-    final activities = ref.watch(albumActivityProvider(album.id, asset?.id));
+    final activityNotifier = ref.read(albumActivityProvider(album.id).notifier);
+    final activities = ref.watch(albumActivityProvider(album.id));
     final listViewScrollController = useScrollController();
 
     void scrollToBottom() {
@@ -46,7 +36,7 @@ class DriftActivitiesPage extends HookConsumerWidget {
       overrides: [currentRemoteAlbumScopedProvider.overrideWithValue(album)],
       child: Scaffold(
         appBar: AppBar(
-          title: asset == null ? Text(album.name) : null,
+          title: Text(album.name),
           actions: [const LikeActivityActionButton(menuItem: true)],
           actionsPadding: const EdgeInsets.only(right: 8),
         ),
@@ -57,7 +47,7 @@ class DriftActivitiesPage extends HookConsumerWidget {
               activityWidgets.add(
                 Padding(
                   padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 6),
-                  child: _CommentBubble(activity: activity),
+                  child: CommentBubble(activity: activity),
                 ),
               );
             }
@@ -91,139 +81,3 @@ class DriftActivitiesPage extends HookConsumerWidget {
     );
   }
 }
-
-class _CommentBubble extends ConsumerWidget {
-  final Activity activity;
-
-  const _CommentBubble({required this.activity});
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final user = ref.watch(currentUserProvider);
-    final album = ref.watch(currentRemoteAlbumProvider)!;
-    final isOwn = activity.user.id == user?.id;
-    final canDelete = isOwn || album.ownerId == user?.id;
-    final hasAsset = activity.assetId != null && activity.assetId!.isNotEmpty;
-    final isLike = activity.type == ActivityType.like;
-    final bgColor = isOwn ? context.colorScheme.primaryContainer : context.colorScheme.surfaceContainer;
-
-    final activityNotifier = ref.read(albumActivityProvider(album.id, activity.assetId).notifier);
-
-    Future<void> openAssetViewer() async {
-      final activityService = ref.read(activityServiceProvider);
-      final route = await activityService.buildAssetViewerRoute(activity.assetId!, ref);
-      if (route != null) await context.pushRoute(route);
-    }
-
-    Widget avatar() {
-      if (isOwn) {
-        return const SizedBox.shrink();
-      }
-
-      return UserCircleAvatar(user: activity.user, size: 28, radius: 14);
-    }
-
-    Widget? thumbnail() {
-      if (!hasAsset) {
-        return null;
-      }
-
-      return ConstrainedBox(
-        constraints: const BoxConstraints(maxWidth: 150, maxHeight: 150),
-        child: Stack(
-          children: [
-            GestureDetector(
-              onTap: openAssetViewer,
-              child: ClipRRect(
-                borderRadius: const BorderRadius.all(Radius.circular(10)),
-                child: Image(
-                  image: ImmichRemoteThumbnailProvider(assetId: activity.assetId!),
-                  fit: BoxFit.cover,
-                ),
-              ),
-            ),
-            if (isLike)
-              Positioned(
-                right: 6,
-                bottom: 6,
-                child: Container(
-                  padding: const EdgeInsets.all(4),
-                  decoration: BoxDecoration(color: Colors.white.withValues(alpha: 0.7), shape: BoxShape.circle),
-                  child: Icon(Icons.favorite, color: Colors.red[600], size: 18),
-                ),
-              ),
-          ],
-        ),
-      );
-    }
-
-    // Likes Album widget (for likes without asset)
-    Widget? likesToAlbum() {
-      if (!isLike || hasAsset) {
-        return null;
-      }
-
-      return Container(
-        padding: const EdgeInsets.all(8),
-        decoration: BoxDecoration(color: Colors.white.withValues(alpha: 0.7), shape: BoxShape.circle),
-        child: Icon(Icons.favorite, color: Colors.red[600], size: 18),
-      );
-    }
-
-    Widget? commentBubble() {
-      if (activity.comment == null || activity.comment!.isEmpty) {
-        return null;
-      }
-
-      return ConstrainedBox(
-        constraints: BoxConstraints(maxWidth: MediaQuery.of(context).size.width * 0.5),
-        child: Container(
-          padding: const EdgeInsets.all(10),
-          decoration: BoxDecoration(color: bgColor, borderRadius: const BorderRadius.all(Radius.circular(12))),
-          child: Text(
-            activity.comment ?? '',
-            style: context.textTheme.bodyLarge?.copyWith(color: context.colorScheme.onSurface),
-          ),
-        ),
-      );
-    }
-
-    // Combined content widgets
-    final List<Widget> contentChildren = [thumbnail(), likesToAlbum(), commentBubble()].whereType<Widget>().toList();
-
-    return DismissibleActivity(
-      onDismiss: canDelete ? (id) async => await activityNotifier.removeActivity(id) : null,
-      activity.id,
-      Align(
-        alignment: isOwn ? Alignment.centerRight : Alignment.centerLeft,
-        child: ConstrainedBox(
-          constraints: BoxConstraints(maxWidth: MediaQuery.of(context).size.width * 0.86),
-          child: Container(
-            margin: const EdgeInsets.symmetric(vertical: 6, horizontal: 10),
-            child: Row(
-              mainAxisSize: MainAxisSize.min,
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                if (!isOwn) ...[avatar(), const SizedBox(width: 8)],
-                // Content column
-                Column(
-                  crossAxisAlignment: isOwn ? CrossAxisAlignment.end : CrossAxisAlignment.start,
-                  children: [
-                    ...contentChildren.map((w) => Padding(padding: const EdgeInsets.only(bottom: 8.0), child: w)),
-                    Text(
-                      '${activity.user.name} • ${activity.createdAt.timeAgo()}',
-                      style: context.textTheme.labelMedium?.copyWith(
-                        color: context.colorScheme.onSurface.withValues(alpha: 0.6),
-                      ),
-                    ),
-                  ],
-                ),
-                if (isOwn) const SizedBox(width: 8),
-              ],
-            ),
-          ),
-        ),
-      ),
-    );
-  }
-}
diff --git a/mobile/lib/presentation/widgets/asset_viewer/activities_bottom_sheet.widget.dart b/mobile/lib/presentation/widgets/asset_viewer/activities_bottom_sheet.widget.dart
index 81e64bed89..63669495b9 100644
--- a/mobile/lib/presentation/widgets/asset_viewer/activities_bottom_sheet.widget.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/activities_bottom_sheet.widget.dart
@@ -3,14 +3,12 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
 import 'package:immich_mobile/extensions/asyncvalue_extensions.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/widgets/activities/comment_bubble.dart';
 import 'package:immich_mobile/presentation/widgets/album/drift_activity_text_field.dart';
 import 'package:immich_mobile/presentation/widgets/bottom_sheet/base_bottom_sheet.widget.dart';
 import 'package:immich_mobile/providers/activity.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/asset_viewer/current_asset.provider.dart';
 import 'package:immich_mobile/providers/infrastructure/current_album.provider.dart';
-import 'package:immich_mobile/providers/user.provider.dart';
-import 'package:immich_mobile/widgets/activities/activity_tile.dart';
-import 'package:immich_mobile/widgets/activities/dismissible_activity.dart';
 
 class ActivitiesBottomSheet extends HookConsumerWidget {
   final DraggableScrollableController controller;
@@ -28,7 +26,6 @@ class ActivitiesBottomSheet extends HookConsumerWidget {
   Widget build(BuildContext context, WidgetRef ref) {
     final album = ref.watch(currentRemoteAlbumProvider)!;
     final asset = ref.watch(currentAssetNotifier) as RemoteAsset?;
-    final user = ref.watch(currentUserProvider);
 
     final activityNotifier = ref.read(albumActivityProvider(album.id, asset?.id).notifier);
     final activities = ref.watch(albumActivityProvider(album.id, asset?.id));
@@ -47,16 +44,9 @@ class ActivitiesBottomSheet extends HookConsumerWidget {
                 return const SizedBox.shrink();
               }
               final activity = data[data.length - 1 - index];
-              final canDelete = activity.user.id == user?.id || album.ownerId == user?.id;
               return Padding(
-                padding: const EdgeInsets.symmetric(vertical: 1),
-                child: DismissibleActivity(
-                  activity.id,
-                  ActivityTile(activity, isBottomSheet: true),
-                  onDismiss: canDelete
-                      ? (activityId) async => await activityNotifier.removeActivity(activity.id)
-                      : null,
-                ),
+                padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
+                child: CommentBubble(activity: activity, isAssetActivity: true),
               );
             }, childCount: data.length + 1),
           );
diff --git a/mobile/lib/widgets/activities/comment_bubble.dart b/mobile/lib/widgets/activities/comment_bubble.dart
new file mode 100644
index 0000000000..11d5c21cec
--- /dev/null
+++ b/mobile/lib/widgets/activities/comment_bubble.dart
@@ -0,0 +1,143 @@
+import 'package:auto_route/auto_route.dart';
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
+import 'package:immich_mobile/extensions/datetime_extensions.dart';
+import 'package:immich_mobile/models/activities/activity.model.dart';
+import 'package:immich_mobile/providers/activity.provider.dart';
+import 'package:immich_mobile/providers/activity_service.provider.dart';
+import 'package:immich_mobile/providers/image/immich_remote_thumbnail_provider.dart';
+import 'package:immich_mobile/providers/infrastructure/current_album.provider.dart';
+import 'package:immich_mobile/providers/user.provider.dart';
+import 'package:immich_mobile/widgets/activities/dismissible_activity.dart';
+import 'package:immich_mobile/widgets/common/user_circle_avatar.dart';
+
+class CommentBubble extends ConsumerWidget {
+  final Activity activity;
+  final bool isAssetActivity;
+
+  const CommentBubble({super.key, required this.activity, this.isAssetActivity = false});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final user = ref.watch(currentUserProvider);
+    final album = ref.watch(currentRemoteAlbumProvider)!;
+    final isOwn = activity.user.id == user?.id;
+    final canDelete = isOwn || album.ownerId == user?.id;
+    final showThumbnail = !isAssetActivity && activity.assetId != null && activity.assetId!.isNotEmpty;
+    final isLike = activity.type == ActivityType.like;
+    final bgColor = isOwn ? context.colorScheme.primaryContainer : context.colorScheme.surfaceContainer;
+
+    final activityNotifier = ref.read(
+      albumActivityProvider(album.id, isAssetActivity ? activity.assetId : null).notifier,
+    );
+
+    Future<void> openAssetViewer() async {
+      final activityService = ref.read(activityServiceProvider);
+      final route = await activityService.buildAssetViewerRoute(activity.assetId!, ref);
+      if (route != null) await context.pushRoute(route);
+    }
+
+    // avatar (hidden for own messages)
+    Widget avatar = const SizedBox.shrink();
+    if (!isOwn) {
+      avatar = UserCircleAvatar(user: activity.user, size: 28, radius: 14);
+    }
+
+    // Thumbnail with tappable behavior and optional heart overlay
+    Widget? thumbnail;
+    if (showThumbnail) {
+      thumbnail = ConstrainedBox(
+        constraints: const BoxConstraints(maxWidth: 150, maxHeight: 150),
+        child: Stack(
+          children: [
+            GestureDetector(
+              onTap: openAssetViewer,
+              child: ClipRRect(
+                borderRadius: const BorderRadius.all(Radius.circular(10)),
+                child: Image(
+                  image: ImmichRemoteThumbnailProvider(assetId: activity.assetId!),
+                  fit: BoxFit.cover,
+                ),
+              ),
+            ),
+            if (isLike)
+              Positioned(
+                right: 6,
+                bottom: 6,
+                child: Container(
+                  padding: const EdgeInsets.all(4),
+                  decoration: BoxDecoration(color: Colors.white.withValues(alpha: 0.7), shape: BoxShape.circle),
+                  child: Icon(Icons.favorite, color: Colors.red[600], size: 18),
+                ),
+              ),
+          ],
+        ),
+      );
+    }
+
+    // Likes widget
+    Widget? likes;
+    if (isLike && !showThumbnail) {
+      likes = Container(
+        padding: const EdgeInsets.all(8),
+        decoration: BoxDecoration(color: Colors.white.withValues(alpha: 0.7), shape: BoxShape.circle),
+        child: Icon(Icons.favorite, color: Colors.red[600], size: 18),
+      );
+    }
+
+    // Comment bubble, comment-only
+    Widget? commentBubble;
+    if (activity.comment != null && activity.comment!.isNotEmpty) {
+      commentBubble = ConstrainedBox(
+        constraints: BoxConstraints(maxWidth: MediaQuery.of(context).size.width * 0.5),
+        child: Container(
+          padding: const EdgeInsets.all(10),
+          decoration: BoxDecoration(color: bgColor, borderRadius: const BorderRadius.all(Radius.circular(12))),
+          child: Text(
+            activity.comment ?? '',
+            style: context.textTheme.bodyLarge?.copyWith(color: context.colorScheme.onSurface),
+          ),
+        ),
+      );
+    }
+
+    // Combined content widgets
+    final List<Widget> contentChildren = [thumbnail, likes, commentBubble].whereType<Widget>().toList();
+
+    return DismissibleActivity(
+      onDismiss: canDelete ? (id) async => await activityNotifier.removeActivity(id) : null,
+      activity.id,
+      Align(
+        alignment: isOwn ? Alignment.centerRight : Alignment.centerLeft,
+        child: ConstrainedBox(
+          constraints: BoxConstraints(maxWidth: MediaQuery.of(context).size.width * 0.86),
+          child: Container(
+            margin: const EdgeInsets.symmetric(vertical: 6, horizontal: 10),
+            child: Row(
+              mainAxisSize: MainAxisSize.min,
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                if (!isOwn) ...[avatar, const SizedBox(width: 8)],
+                // Content column
+                Column(
+                  crossAxisAlignment: isOwn ? CrossAxisAlignment.end : CrossAxisAlignment.start,
+                  children: [
+                    ...contentChildren.map((w) => Padding(padding: const EdgeInsets.only(bottom: 8.0), child: w)),
+                    Text(
+                      '${activity.user.name} • ${activity.createdAt.timeAgo()}',
+                      style: context.textTheme.labelMedium?.copyWith(
+                        color: context.colorScheme.onSurface.withValues(alpha: 0.6),
+                      ),
+                    ),
+                  ],
+                ),
+                if (isOwn) const SizedBox(width: 8),
+              ],
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}

From 787158247f6627ba15af7b79d752538901bafbdd Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 10 Nov 2025 19:50:19 +0000
Subject: [PATCH 66/84] fix(deps): update typescript-projects (#23588)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Daniel Dietzler <mail@ddietzler.dev>
---
 mise.toml        |   10 +-
 package.json     |    2 +-
 pnpm-lock.yaml   | 1103 +++++++++++++++++++++++-----------------------
 web/package.json |    4 +-
 4 files changed, 568 insertions(+), 551 deletions(-)

diff --git a/mise.toml b/mise.toml
index 474f768137..cf3b86c6cc 100644
--- a/mise.toml
+++ b/mise.toml
@@ -2,7 +2,15 @@ experimental_monorepo_root = true
 
 [tools]
 node = "24.11.0"
-pnpm = "10.19.0"
+flutter = "3.35.7"
+pnpm = "10.20.0"
+terragrunt = "0.91.2"
+opentofu = "1.10.6"
+
+[tools."github:CQLabs/homebrew-dcm"]
+version = "1.30.0"
+bin = "dcm"
+postinstall = "chmod +x $MISE_TOOL_INSTALL_PATH/dcm"
 
 [settings]
 experimental = true
diff --git a/package.json b/package.json
index 4c262de2b9..d08ea46edf 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "version": "0.0.1",
   "description": "Monorepo for Immich",
   "private": true,
-  "packageManager": "pnpm@10.19.0+sha512.c9fc7236e92adf5c8af42fd5bf1612df99c2ceb62f27047032f4720b33f8eacdde311865e91c411f2774f618d82f320808ecb51718bfa82c060c4ba7c76a32b8",
+  "packageManager": "pnpm@10.20.0+sha512.cf9998222162dd85864d0a8102e7892e7ba4ceadebbf5a31f9c2fce48dfce317a9c53b9f6464d1ef9042cba2e02ae02a9f7c143a2b438cd93c91840f0192b9dd",
   "engines": {
     "pnpm": ">=10.0.0"
   }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 463c7ccb46..da1dd18d97 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -64,10 +64,10 @@ importers:
         version: 4.13.4
       '@types/node':
         specifier: ^22.18.13
-        version: 22.18.13
+        version: 22.19.0
       '@vitest/coverage-v8':
         specifier: ^3.0.0
-        version: 3.2.4(vitest@3.2.4(@types/debug@4.1.12)(@types/node@22.18.13)(happy-dom@20.0.8)(jiti@2.6.1)(jsdom@26.1.0(canvas@2.11.2))(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1))
+        version: 3.2.4(vitest@3.2.4(@types/debug@4.1.12)(@types/node@22.19.0)(happy-dom@20.0.10)(jiti@2.6.1)(jsdom@26.1.0(canvas@2.11.2))(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1))
       byte-size:
         specifier: ^9.0.0
         version: 9.0.1
@@ -109,16 +109,16 @@ importers:
         version: 8.46.2(eslint@9.38.0(jiti@2.6.1))(typescript@5.9.3)
       vite:
         specifier: ^7.0.0
-        version: 7.1.12(@types/node@22.18.13)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)
+        version: 7.1.12(@types/node@22.19.0)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)
       vite-tsconfig-paths:
         specifier: ^5.0.0
-        version: 5.1.4(typescript@5.9.3)(vite@7.1.12(@types/node@22.18.13)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1))
+        version: 5.1.4(typescript@5.9.3)(vite@7.1.12(@types/node@22.19.0)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1))
       vitest:
         specifier: ^3.0.0
-        version: 3.2.4(@types/debug@4.1.12)(@types/node@22.18.13)(happy-dom@20.0.8)(jiti@2.6.1)(jsdom@26.1.0(canvas@2.11.2))(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)
+        version: 3.2.4(@types/debug@4.1.12)(@types/node@22.19.0)(happy-dom@20.0.10)(jiti@2.6.1)(jsdom@26.1.0(canvas@2.11.2))(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)
       vitest-fetch-mock:
         specifier: ^0.4.0
-        version: 0.4.5(vitest@3.2.4(@types/debug@4.1.12)(@types/node@22.18.13)(happy-dom@20.0.8)(jiti@2.6.1)(jsdom@26.1.0(canvas@2.11.2))(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1))
+        version: 0.4.5(vitest@3.2.4(@types/debug@4.1.12)(@types/node@22.19.0)(happy-dom@20.0.10)(jiti@2.6.1)(jsdom@26.1.0(canvas@2.11.2))(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1))
       yaml:
         specifier: ^2.3.1
         version: 2.8.1
@@ -212,13 +212,13 @@ importers:
         version: 3.7.1
       '@types/node':
         specifier: ^22.18.13
-        version: 22.18.13
+        version: 22.19.0
       '@types/oidc-provider':
         specifier: ^9.0.0
         version: 9.5.0
       '@types/pg':
         specifier: ^8.15.1
-        version: 8.15.5
+        version: 8.15.6
       '@types/pngjs':
         specifier: ^6.0.4
         version: 6.0.5
@@ -284,7 +284,7 @@ importers:
         version: 5.2.1(encoding@0.1.13)
       vitest:
         specifier: ^3.0.0
-        version: 3.2.4(@types/debug@4.1.12)(@types/node@22.18.13)(happy-dom@20.0.8)(jiti@2.6.1)(jsdom@26.1.0(canvas@2.11.2(encoding@0.1.13)))(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)
+        version: 3.2.4(@types/debug@4.1.12)(@types/node@22.19.0)(happy-dom@20.0.10)(jiti@2.6.1)(jsdom@26.1.0(canvas@2.11.2(encoding@0.1.13)))(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)
 
   open-api/typescript-sdk:
     dependencies:
@@ -294,7 +294,7 @@ importers:
     devDependencies:
       '@types/node':
         specifier: ^22.18.13
-        version: 22.18.13
+        version: 22.19.0
       typescript:
         specifier: ^5.3.3
         version: 5.9.3
@@ -303,28 +303,28 @@ importers:
     dependencies:
       '@nestjs/bullmq':
         specifier: ^11.0.1
-        version: 11.0.4(@nestjs/common@11.1.7(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.7)(bullmq@5.61.2)
+        version: 11.0.4(@nestjs/common@11.1.8(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.8)(bullmq@5.62.1)
       '@nestjs/common':
         specifier: ^11.0.4
-        version: 11.1.7(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2)
+        version: 11.1.8(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2)
       '@nestjs/core':
         specifier: ^11.0.4
-        version: 11.1.7(@nestjs/common@11.1.7(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/platform-express@11.1.7)(@nestjs/websockets@11.1.7)(reflect-metadata@0.2.2)(rxjs@7.8.2)
+        version: 11.1.8(@nestjs/common@11.1.8(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/platform-express@11.1.8)(@nestjs/websockets@11.1.8)(reflect-metadata@0.2.2)(rxjs@7.8.2)
       '@nestjs/platform-express':
         specifier: ^11.0.4
-        version: 11.1.7(@nestjs/common@11.1.7(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.7)
+        version: 11.1.8(@nestjs/common@11.1.8(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.8)
       '@nestjs/platform-socket.io':
         specifier: ^11.0.4
-        version: 11.1.7(@nestjs/common@11.1.7(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/websockets@11.1.7)(rxjs@7.8.2)
+        version: 11.1.8(@nestjs/common@11.1.8(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/websockets@11.1.8)(rxjs@7.8.2)
       '@nestjs/schedule':
         specifier: ^6.0.0
-        version: 6.0.1(@nestjs/common@11.1.7(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.7)
+        version: 6.0.1(@nestjs/common@11.1.8(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.8)
       '@nestjs/swagger':
         specifier: ^11.0.2
-        version: 11.2.1(@nestjs/common@11.1.7(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.7)(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)
+        version: 11.2.1(@nestjs/common@11.1.8(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.8)(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)
       '@nestjs/websockets':
         specifier: ^11.0.4
-        version: 11.1.7(@nestjs/common@11.1.7(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.7)(@nestjs/platform-socket.io@11.1.7)(reflect-metadata@0.2.2)(rxjs@7.8.2)
+        version: 11.1.8(@nestjs/common@11.1.8(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.8)(@nestjs/platform-socket.io@11.1.8)(reflect-metadata@0.2.2)(rxjs@7.8.2)
       '@opentelemetry/api':
         specifier: ^1.9.0
         version: 1.9.0
@@ -381,7 +381,7 @@ importers:
         version: 2.2.0
       bullmq:
         specifier: ^5.51.0
-        version: 5.61.2
+        version: 5.62.1
       chokidar:
         specifier: ^4.0.3
         version: 4.0.3
@@ -450,16 +450,16 @@ importers:
         version: 2.0.2
       nest-commander:
         specifier: ^3.16.0
-        version: 3.20.1(@nestjs/common@11.1.7(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.7)(@types/inquirer@8.2.11)(@types/node@22.18.13)(typescript@5.9.3)
+        version: 3.20.1(@nestjs/common@11.1.8(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.8)(@types/inquirer@8.2.11)(@types/node@22.19.0)(typescript@5.9.3)
       nestjs-cls:
         specifier: ^5.0.0
-        version: 5.4.3(@nestjs/common@11.1.7(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.7)(reflect-metadata@0.2.2)(rxjs@7.8.2)
+        version: 5.4.3(@nestjs/common@11.1.8(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.8)(reflect-metadata@0.2.2)(rxjs@7.8.2)
       nestjs-kysely:
         specifier: 3.1.2
-        version: 3.1.2(@nestjs/common@11.1.7(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.7)(kysely@0.28.2)(reflect-metadata@0.2.2)
+        version: 3.1.2(@nestjs/common@11.1.8(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.8)(kysely@0.28.2)(reflect-metadata@0.2.2)
       nestjs-otel:
         specifier: ^7.0.0
-        version: 7.0.1(@nestjs/common@11.1.7(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.7)
+        version: 7.0.1(@nestjs/common@11.1.8(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.8)
       nodemailer:
         specifier: ^7.0.0
         version: 7.0.10
@@ -486,7 +486,7 @@ importers:
         version: 19.2.0(react@19.2.0)
       react-email:
         specifier: ^4.0.0
-        version: 4.3.1
+        version: 4.3.2
       reflect-metadata:
         specifier: ^0.2.0
         version: 0.2.2
@@ -532,16 +532,16 @@ importers:
         version: 9.38.0
       '@nestjs/cli':
         specifier: ^11.0.2
-        version: 11.0.10(@swc/core@1.13.5(@swc/helpers@0.5.17))(@types/node@22.18.13)
+        version: 11.0.10(@swc/core@1.14.0(@swc/helpers@0.5.17))(@types/node@22.19.0)
       '@nestjs/schematics':
         specifier: ^11.0.0
         version: 11.0.9(chokidar@4.0.3)(typescript@5.9.3)
       '@nestjs/testing':
         specifier: ^11.0.4
-        version: 11.1.7(@nestjs/common@11.1.7(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.7)(@nestjs/platform-express@11.1.7)
+        version: 11.1.8(@nestjs/common@11.1.8(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.8)(@nestjs/platform-express@11.1.8)
       '@swc/core':
         specifier: ^1.4.14
-        version: 1.13.5(@swc/helpers@0.5.17)
+        version: 1.14.0(@swc/helpers@0.5.17)
       '@types/archiver':
         specifier: ^6.0.0
         version: 6.0.4
@@ -583,7 +583,7 @@ importers:
         version: 2.0.0
       '@types/node':
         specifier: ^22.18.13
-        version: 22.18.13
+        version: 22.19.0
       '@types/nodemailer':
         specifier: ^7.0.0
         version: 7.0.3
@@ -610,10 +610,10 @@ importers:
         version: 0.7.39
       '@types/validator':
         specifier: ^13.15.2
-        version: 13.15.3
+        version: 13.15.4
       '@vitest/coverage-v8':
         specifier: ^3.0.0
-        version: 3.2.4(vitest@3.2.4(@types/debug@4.1.12)(@types/node@22.18.13)(happy-dom@20.0.8)(jiti@2.6.1)(jsdom@26.1.0(canvas@2.11.2))(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1))
+        version: 3.2.4(vitest@3.2.4(@types/debug@4.1.12)(@types/node@22.19.0)(happy-dom@20.0.10)(jiti@2.6.1)(jsdom@26.1.0(canvas@2.11.2))(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1))
       eslint:
         specifier: ^9.14.0
         version: 9.38.0(jiti@2.6.1)
@@ -664,13 +664,13 @@ importers:
         version: 8.46.2(eslint@9.38.0(jiti@2.6.1))(typescript@5.9.3)
       unplugin-swc:
         specifier: ^1.4.5
-        version: 1.5.8(@swc/core@1.13.5(@swc/helpers@0.5.17))(rollup@4.52.5)
+        version: 1.5.8(@swc/core@1.14.0(@swc/helpers@0.5.17))(rollup@4.52.5)
       vite-tsconfig-paths:
         specifier: ^5.0.0
-        version: 5.1.4(typescript@5.9.3)(vite@7.1.12(@types/node@22.18.13)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1))
+        version: 5.1.4(typescript@5.9.3)(vite@7.1.12(@types/node@22.19.0)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1))
       vitest:
         specifier: ^3.0.0
-        version: 3.2.4(@types/debug@4.1.12)(@types/node@22.18.13)(happy-dom@20.0.8)(jiti@2.6.1)(jsdom@26.1.0(canvas@2.11.2))(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)
+        version: 3.2.4(@types/debug@4.1.12)(@types/node@22.19.0)(happy-dom@20.0.10)(jiti@2.6.1)(jsdom@26.1.0(canvas@2.11.2))(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)
 
   web:
     dependencies:
@@ -685,7 +685,7 @@ importers:
         version: link:../open-api/typescript-sdk
       '@immich/ui':
         specifier: ^0.40.2
-        version: 0.40.2(@internationalized/date@3.8.2)(svelte@5.41.3)
+        version: 0.40.2(@internationalized/date@3.8.2)(svelte@5.43.0)
       '@mapbox/mapbox-gl-rtl-text':
         specifier: 0.2.3
         version: 0.2.3(mapbox-gl@1.13.3)
@@ -715,7 +715,7 @@ importers:
         version: 0.41.3
       '@zoom-image/svelte':
         specifier: ^0.3.0
-        version: 0.3.7(svelte@5.41.3)
+        version: 0.3.7(svelte@5.43.0)
       async-mutex:
         specifier: ^0.5.0
         version: 0.5.0
@@ -736,7 +736,7 @@ importers:
         version: 4.7.8
       happy-dom:
         specifier: ^20.0.0
-        version: 20.0.8
+        version: 20.0.10
       intl-messageformat:
         specifier: ^10.7.11
         version: 10.7.18
@@ -751,7 +751,7 @@ importers:
         version: 3.7.2
       maplibre-gl:
         specifier: ^5.6.2
-        version: 5.9.0
+        version: 5.10.0
       pmtiles:
         specifier: ^4.3.0
         version: 4.3.0
@@ -760,7 +760,7 @@ importers:
         version: 1.5.4
       simple-icons:
         specifier: ^15.15.0
-        version: 15.17.0
+        version: 15.18.0
       socket.io-client:
         specifier: ~4.8.0
         version: 4.8.1
@@ -769,13 +769,13 @@ importers:
         version: 5.2.2
       svelte-i18n:
         specifier: ^4.0.1
-        version: 4.0.1(svelte@5.41.3)
+        version: 4.0.1(svelte@5.43.0)
       svelte-maplibre:
-        specifier: ^1.2.0
-        version: 1.2.3(svelte@5.41.3)
+        specifier: ^1.2.5
+        version: 1.2.5(svelte@5.43.0)
       svelte-persisted-store:
         specifier: ^0.12.0
-        version: 0.12.0(svelte@5.41.3)
+        version: 0.12.0(svelte@5.43.0)
       tabbable:
         specifier: ^6.2.0
         version: 6.3.0
@@ -797,25 +797,25 @@ importers:
         version: 3.1.2
       '@sveltejs/adapter-static':
         specifier: ^3.0.8
-        version: 3.0.10(@sveltejs/kit@2.47.3(@opentelemetry/api@1.9.0)(@sveltejs/vite-plugin-svelte@6.2.1(svelte@5.41.3)(vite@7.1.12(@types/node@24.9.2)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)))(svelte@5.41.3)(vite@7.1.12(@types/node@24.9.2)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)))
+        version: 3.0.10(@sveltejs/kit@2.48.3(@opentelemetry/api@1.9.0)(@sveltejs/vite-plugin-svelte@6.2.1(svelte@5.43.0)(vite@7.1.12(@types/node@24.10.0)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)))(svelte@5.43.0)(vite@7.1.12(@types/node@24.10.0)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)))
       '@sveltejs/enhanced-img':
         specifier: ^0.8.0
-        version: 0.8.4(@sveltejs/vite-plugin-svelte@6.2.1(svelte@5.41.3)(vite@7.1.12(@types/node@24.9.2)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)))(rollup@4.52.5)(svelte@5.41.3)(vite@7.1.12(@types/node@24.9.2)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1))
+        version: 0.8.4(@sveltejs/vite-plugin-svelte@6.2.1(svelte@5.43.0)(vite@7.1.12(@types/node@24.10.0)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)))(rollup@4.52.5)(svelte@5.43.0)(vite@7.1.12(@types/node@24.10.0)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1))
       '@sveltejs/kit':
         specifier: ^2.27.1
-        version: 2.47.3(@opentelemetry/api@1.9.0)(@sveltejs/vite-plugin-svelte@6.2.1(svelte@5.41.3)(vite@7.1.12(@types/node@24.9.2)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)))(svelte@5.41.3)(vite@7.1.12(@types/node@24.9.2)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1))
+        version: 2.48.3(@opentelemetry/api@1.9.0)(@sveltejs/vite-plugin-svelte@6.2.1(svelte@5.43.0)(vite@7.1.12(@types/node@24.10.0)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)))(svelte@5.43.0)(vite@7.1.12(@types/node@24.10.0)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1))
       '@sveltejs/vite-plugin-svelte':
         specifier: 6.2.1
-        version: 6.2.1(svelte@5.41.3)(vite@7.1.12(@types/node@24.9.2)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1))
+        version: 6.2.1(svelte@5.43.0)(vite@7.1.12(@types/node@24.10.0)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1))
       '@tailwindcss/vite':
         specifier: ^4.1.7
-        version: 4.1.16(vite@7.1.12(@types/node@24.9.2)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1))
+        version: 4.1.16(vite@7.1.12(@types/node@24.10.0)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1))
       '@testing-library/jest-dom':
         specifier: ^6.4.2
         version: 6.9.1
       '@testing-library/svelte':
         specifier: ^5.2.8
-        version: 5.2.8(svelte@5.41.3)(vite@7.1.12(@types/node@24.9.2)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1))(vitest@3.2.4(@types/debug@4.1.12)(@types/node@24.9.2)(happy-dom@20.0.8)(jiti@2.6.1)(jsdom@26.1.0(canvas@2.11.2))(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1))
+        version: 5.2.8(svelte@5.43.0)(vite@7.1.12(@types/node@24.10.0)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1))(vitest@3.2.4(@types/debug@4.1.12)(@types/node@24.10.0)(happy-dom@20.0.10)(jiti@2.6.1)(jsdom@26.1.0(canvas@2.11.2))(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1))
       '@testing-library/user-event':
         specifier: ^14.5.2
         version: 14.6.1(@testing-library/dom@10.4.0)
@@ -839,7 +839,7 @@ importers:
         version: 1.5.6
       '@vitest/coverage-v8':
         specifier: ^3.0.0
-        version: 3.2.4(vitest@3.2.4(@types/debug@4.1.12)(@types/node@24.9.2)(happy-dom@20.0.8)(jiti@2.6.1)(jsdom@26.1.0(canvas@2.11.2))(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1))
+        version: 3.2.4(vitest@3.2.4(@types/debug@4.1.12)(@types/node@24.10.0)(happy-dom@20.0.10)(jiti@2.6.1)(jsdom@26.1.0(canvas@2.11.2))(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1))
       dotenv:
         specifier: ^17.0.0
         version: 17.2.3
@@ -854,7 +854,7 @@ importers:
         version: 6.0.2(eslint@9.38.0(jiti@2.6.1))
       eslint-plugin-svelte:
         specifier: ^3.12.4
-        version: 3.12.5(eslint@9.38.0(jiti@2.6.1))(svelte@5.41.3)
+        version: 3.12.5(eslint@9.38.0(jiti@2.6.1))(svelte@5.43.0)
       eslint-plugin-unicorn:
         specifier: ^61.0.2
         version: 61.0.2(eslint@9.38.0(jiti@2.6.1))
@@ -875,19 +875,19 @@ importers:
         version: 4.1.1(prettier@3.6.2)
       prettier-plugin-svelte:
         specifier: ^3.3.3
-        version: 3.4.0(prettier@3.6.2)(svelte@5.41.3)
+        version: 3.4.0(prettier@3.6.2)(svelte@5.43.0)
       rollup-plugin-visualizer:
         specifier: ^6.0.0
         version: 6.0.5(rollup@4.52.5)
       svelte:
-        specifier: 5.41.3
-        version: 5.41.3
+        specifier: 5.43.0
+        version: 5.43.0
       svelte-check:
         specifier: ^4.1.5
-        version: 4.3.3(picomatch@4.0.3)(svelte@5.41.3)(typescript@5.9.3)
+        version: 4.3.3(picomatch@4.0.3)(svelte@5.43.0)(typescript@5.9.3)
       svelte-eslint-parser:
         specifier: ^1.3.3
-        version: 1.4.0(svelte@5.41.3)
+        version: 1.4.0(svelte@5.43.0)
       tailwindcss:
         specifier: ^4.1.7
         version: 4.1.16
@@ -899,10 +899,10 @@ importers:
         version: 8.46.2(eslint@9.38.0(jiti@2.6.1))(typescript@5.9.3)
       vite:
         specifier: ^7.1.2
-        version: 7.1.12(@types/node@24.9.2)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)
+        version: 7.1.12(@types/node@24.10.0)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)
       vitest:
         specifier: ^3.0.0
-        version: 3.2.4(@types/debug@4.1.12)(@types/node@24.9.2)(happy-dom@20.0.8)(jiti@2.6.1)(jsdom@26.1.0(canvas@2.11.2))(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)
+        version: 3.2.4(@types/debug@4.1.12)(@types/node@24.10.0)(happy-dom@20.0.10)(jiti@2.6.1)(jsdom@26.1.0(canvas@2.11.2))(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)
 
 packages:
 
@@ -2238,8 +2238,8 @@ packages:
     cpu: [ppc64]
     os: [aix]
 
-  '@esbuild/aix-ppc64@0.25.11':
-    resolution: {integrity: sha512-Xt1dOL13m8u0WE8iplx9Ibbm+hFAO0GsU2P34UNoDGvZYkY8ifSiy6Zuc1lYxfG7svWE2fzqCUmFp5HCn51gJg==}
+  '@esbuild/aix-ppc64@0.25.12':
+    resolution: {integrity: sha512-Hhmwd6CInZ3dwpuGTF8fJG6yoWmsToE+vYgD4nytZVxcu1ulHpUQRAB1UJ8+N1Am3Mz4+xOByoQoSZf4D+CpkA==}
     engines: {node: '>=18'}
     cpu: [ppc64]
     os: [aix]
@@ -2250,8 +2250,8 @@ packages:
     cpu: [arm64]
     os: [android]
 
-  '@esbuild/android-arm64@0.25.11':
-    resolution: {integrity: sha512-9slpyFBc4FPPz48+f6jyiXOx/Y4v34TUeDDXJpZqAWQn/08lKGeD8aDp9TMn9jDz2CiEuHwfhRmGBvpnd/PWIQ==}
+  '@esbuild/android-arm64@0.25.12':
+    resolution: {integrity: sha512-6AAmLG7zwD1Z159jCKPvAxZd4y/VTO0VkprYy+3N2FtJ8+BQWFXU+OxARIwA46c5tdD9SsKGZ/1ocqBS/gAKHg==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [android]
@@ -2262,8 +2262,8 @@ packages:
     cpu: [arm]
     os: [android]
 
-  '@esbuild/android-arm@0.25.11':
-    resolution: {integrity: sha512-uoa7dU+Dt3HYsethkJ1k6Z9YdcHjTrSb5NUy66ZfZaSV8hEYGD5ZHbEMXnqLFlbBflLsl89Zke7CAdDJ4JI+Gg==}
+  '@esbuild/android-arm@0.25.12':
+    resolution: {integrity: sha512-VJ+sKvNA/GE7Ccacc9Cha7bpS8nyzVv0jdVgwNDaR4gDMC/2TTRc33Ip8qrNYUcpkOHUT5OZ0bUcNNVZQ9RLlg==}
     engines: {node: '>=18'}
     cpu: [arm]
     os: [android]
@@ -2274,8 +2274,8 @@ packages:
     cpu: [x64]
     os: [android]
 
-  '@esbuild/android-x64@0.25.11':
-    resolution: {integrity: sha512-Sgiab4xBjPU1QoPEIqS3Xx+R2lezu0LKIEcYe6pftr56PqPygbB7+szVnzoShbx64MUupqoE0KyRlN7gezbl8g==}
+  '@esbuild/android-x64@0.25.12':
+    resolution: {integrity: sha512-5jbb+2hhDHx5phYR2By8GTWEzn6I9UqR11Kwf22iKbNpYrsmRB18aX/9ivc5cabcUiAT/wM+YIZ6SG9QO6a8kg==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [android]
@@ -2286,8 +2286,8 @@ packages:
     cpu: [arm64]
     os: [darwin]
 
-  '@esbuild/darwin-arm64@0.25.11':
-    resolution: {integrity: sha512-VekY0PBCukppoQrycFxUqkCojnTQhdec0vevUL/EDOCnXd9LKWqD/bHwMPzigIJXPhC59Vd1WFIL57SKs2mg4w==}
+  '@esbuild/darwin-arm64@0.25.12':
+    resolution: {integrity: sha512-N3zl+lxHCifgIlcMUP5016ESkeQjLj/959RxxNYIthIg+CQHInujFuXeWbWMgnTo4cp5XVHqFPmpyu9J65C1Yg==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [darwin]
@@ -2298,8 +2298,8 @@ packages:
     cpu: [x64]
     os: [darwin]
 
-  '@esbuild/darwin-x64@0.25.11':
-    resolution: {integrity: sha512-+hfp3yfBalNEpTGp9loYgbknjR695HkqtY3d3/JjSRUyPg/xd6q+mQqIb5qdywnDxRZykIHs3axEqU6l1+oWEQ==}
+  '@esbuild/darwin-x64@0.25.12':
+    resolution: {integrity: sha512-HQ9ka4Kx21qHXwtlTUVbKJOAnmG1ipXhdWTmNXiPzPfWKpXqASVcWdnf2bnL73wgjNrFXAa3yYvBSd9pzfEIpA==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [darwin]
@@ -2310,8 +2310,8 @@ packages:
     cpu: [arm64]
     os: [freebsd]
 
-  '@esbuild/freebsd-arm64@0.25.11':
-    resolution: {integrity: sha512-CmKjrnayyTJF2eVuO//uSjl/K3KsMIeYeyN7FyDBjsR3lnSJHaXlVoAK8DZa7lXWChbuOk7NjAc7ygAwrnPBhA==}
+  '@esbuild/freebsd-arm64@0.25.12':
+    resolution: {integrity: sha512-gA0Bx759+7Jve03K1S0vkOu5Lg/85dou3EseOGUes8flVOGxbhDDh/iZaoek11Y8mtyKPGF3vP8XhnkDEAmzeg==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [freebsd]
@@ -2322,8 +2322,8 @@ packages:
     cpu: [x64]
     os: [freebsd]
 
-  '@esbuild/freebsd-x64@0.25.11':
-    resolution: {integrity: sha512-Dyq+5oscTJvMaYPvW3x3FLpi2+gSZTCE/1ffdwuM6G1ARang/mb3jvjxs0mw6n3Lsw84ocfo9CrNMqc5lTfGOw==}
+  '@esbuild/freebsd-x64@0.25.12':
+    resolution: {integrity: sha512-TGbO26Yw2xsHzxtbVFGEXBFH0FRAP7gtcPE7P5yP7wGy7cXK2oO7RyOhL5NLiqTlBh47XhmIUXuGciXEqYFfBQ==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [freebsd]
@@ -2334,8 +2334,8 @@ packages:
     cpu: [arm64]
     os: [linux]
 
-  '@esbuild/linux-arm64@0.25.11':
-    resolution: {integrity: sha512-Qr8AzcplUhGvdyUF08A1kHU3Vr2O88xxP0Tm8GcdVOUm25XYcMPp2YqSVHbLuXzYQMf9Bh/iKx7YPqECs6ffLA==}
+  '@esbuild/linux-arm64@0.25.12':
+    resolution: {integrity: sha512-8bwX7a8FghIgrupcxb4aUmYDLp8pX06rGh5HqDT7bB+8Rdells6mHvrFHHW2JAOPZUbnjUpKTLg6ECyzvas2AQ==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [linux]
@@ -2346,8 +2346,8 @@ packages:
     cpu: [arm]
     os: [linux]
 
-  '@esbuild/linux-arm@0.25.11':
-    resolution: {integrity: sha512-TBMv6B4kCfrGJ8cUPo7vd6NECZH/8hPpBHHlYI3qzoYFvWu2AdTvZNuU/7hsbKWqu/COU7NIK12dHAAqBLLXgw==}
+  '@esbuild/linux-arm@0.25.12':
+    resolution: {integrity: sha512-lPDGyC1JPDou8kGcywY0YILzWlhhnRjdof3UlcoqYmS9El818LLfJJc3PXXgZHrHCAKs/Z2SeZtDJr5MrkxtOw==}
     engines: {node: '>=18'}
     cpu: [arm]
     os: [linux]
@@ -2358,8 +2358,8 @@ packages:
     cpu: [ia32]
     os: [linux]
 
-  '@esbuild/linux-ia32@0.25.11':
-    resolution: {integrity: sha512-TmnJg8BMGPehs5JKrCLqyWTVAvielc615jbkOirATQvWWB1NMXY77oLMzsUjRLa0+ngecEmDGqt5jiDC6bfvOw==}
+  '@esbuild/linux-ia32@0.25.12':
+    resolution: {integrity: sha512-0y9KrdVnbMM2/vG8KfU0byhUN+EFCny9+8g202gYqSSVMonbsCfLjUO+rCci7pM0WBEtz+oK/PIwHkzxkyharA==}
     engines: {node: '>=18'}
     cpu: [ia32]
     os: [linux]
@@ -2370,8 +2370,8 @@ packages:
     cpu: [loong64]
     os: [linux]
 
-  '@esbuild/linux-loong64@0.25.11':
-    resolution: {integrity: sha512-DIGXL2+gvDaXlaq8xruNXUJdT5tF+SBbJQKbWy/0J7OhU8gOHOzKmGIlfTTl6nHaCOoipxQbuJi7O++ldrxgMw==}
+  '@esbuild/linux-loong64@0.25.12':
+    resolution: {integrity: sha512-h///Lr5a9rib/v1GGqXVGzjL4TMvVTv+s1DPoxQdz7l/AYv6LDSxdIwzxkrPW438oUXiDtwM10o9PmwS/6Z0Ng==}
     engines: {node: '>=18'}
     cpu: [loong64]
     os: [linux]
@@ -2382,8 +2382,8 @@ packages:
     cpu: [mips64el]
     os: [linux]
 
-  '@esbuild/linux-mips64el@0.25.11':
-    resolution: {integrity: sha512-Osx1nALUJu4pU43o9OyjSCXokFkFbyzjXb6VhGIJZQ5JZi8ylCQ9/LFagolPsHtgw6himDSyb5ETSfmp4rpiKQ==}
+  '@esbuild/linux-mips64el@0.25.12':
+    resolution: {integrity: sha512-iyRrM1Pzy9GFMDLsXn1iHUm18nhKnNMWscjmp4+hpafcZjrr2WbT//d20xaGljXDBYHqRcl8HnxbX6uaA/eGVw==}
     engines: {node: '>=18'}
     cpu: [mips64el]
     os: [linux]
@@ -2394,8 +2394,8 @@ packages:
     cpu: [ppc64]
     os: [linux]
 
-  '@esbuild/linux-ppc64@0.25.11':
-    resolution: {integrity: sha512-nbLFgsQQEsBa8XSgSTSlrnBSrpoWh7ioFDUmwo158gIm5NNP+17IYmNWzaIzWmgCxq56vfr34xGkOcZ7jX6CPw==}
+  '@esbuild/linux-ppc64@0.25.12':
+    resolution: {integrity: sha512-9meM/lRXxMi5PSUqEXRCtVjEZBGwB7P/D4yT8UG/mwIdze2aV4Vo6U5gD3+RsoHXKkHCfSxZKzmDssVlRj1QQA==}
     engines: {node: '>=18'}
     cpu: [ppc64]
     os: [linux]
@@ -2406,8 +2406,8 @@ packages:
     cpu: [riscv64]
     os: [linux]
 
-  '@esbuild/linux-riscv64@0.25.11':
-    resolution: {integrity: sha512-HfyAmqZi9uBAbgKYP1yGuI7tSREXwIb438q0nqvlpxAOs3XnZ8RsisRfmVsgV486NdjD7Mw2UrFSw51lzUk1ww==}
+  '@esbuild/linux-riscv64@0.25.12':
+    resolution: {integrity: sha512-Zr7KR4hgKUpWAwb1f3o5ygT04MzqVrGEGXGLnj15YQDJErYu/BGg+wmFlIDOdJp0PmB0lLvxFIOXZgFRrdjR0w==}
     engines: {node: '>=18'}
     cpu: [riscv64]
     os: [linux]
@@ -2418,8 +2418,8 @@ packages:
     cpu: [s390x]
     os: [linux]
 
-  '@esbuild/linux-s390x@0.25.11':
-    resolution: {integrity: sha512-HjLqVgSSYnVXRisyfmzsH6mXqyvj0SA7pG5g+9W7ESgwA70AXYNpfKBqh1KbTxmQVaYxpzA/SvlB9oclGPbApw==}
+  '@esbuild/linux-s390x@0.25.12':
+    resolution: {integrity: sha512-MsKncOcgTNvdtiISc/jZs/Zf8d0cl/t3gYWX8J9ubBnVOwlk65UIEEvgBORTiljloIWnBzLs4qhzPkJcitIzIg==}
     engines: {node: '>=18'}
     cpu: [s390x]
     os: [linux]
@@ -2430,14 +2430,14 @@ packages:
     cpu: [x64]
     os: [linux]
 
-  '@esbuild/linux-x64@0.25.11':
-    resolution: {integrity: sha512-HSFAT4+WYjIhrHxKBwGmOOSpphjYkcswF449j6EjsjbinTZbp8PJtjsVK1XFJStdzXdy/jaddAep2FGY+wyFAQ==}
+  '@esbuild/linux-x64@0.25.12':
+    resolution: {integrity: sha512-uqZMTLr/zR/ed4jIGnwSLkaHmPjOjJvnm6TVVitAa08SLS9Z0VM8wIRx7gWbJB5/J54YuIMInDquWyYvQLZkgw==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [linux]
 
-  '@esbuild/netbsd-arm64@0.25.11':
-    resolution: {integrity: sha512-hr9Oxj1Fa4r04dNpWr3P8QKVVsjQhqrMSUzZzf+LZcYjZNqhA3IAfPQdEh1FLVUJSiu6sgAwp3OmwBfbFgG2Xg==}
+  '@esbuild/netbsd-arm64@0.25.12':
+    resolution: {integrity: sha512-xXwcTq4GhRM7J9A8Gv5boanHhRa/Q9KLVmcyXHCTaM4wKfIpWkdXiMog/KsnxzJ0A1+nD+zoecuzqPmCRyBGjg==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [netbsd]
@@ -2448,14 +2448,14 @@ packages:
     cpu: [x64]
     os: [netbsd]
 
-  '@esbuild/netbsd-x64@0.25.11':
-    resolution: {integrity: sha512-u7tKA+qbzBydyj0vgpu+5h5AeudxOAGncb8N6C9Kh1N4n7wU1Xw1JDApsRjpShRpXRQlJLb9wY28ELpwdPcZ7A==}
+  '@esbuild/netbsd-x64@0.25.12':
+    resolution: {integrity: sha512-Ld5pTlzPy3YwGec4OuHh1aCVCRvOXdH8DgRjfDy/oumVovmuSzWfnSJg+VtakB9Cm0gxNO9BzWkj6mtO1FMXkQ==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [netbsd]
 
-  '@esbuild/openbsd-arm64@0.25.11':
-    resolution: {integrity: sha512-Qq6YHhayieor3DxFOoYM1q0q1uMFYb7cSpLD2qzDSvK1NAvqFi8Xgivv0cFC6J+hWVw2teCYltyy9/m/14ryHg==}
+  '@esbuild/openbsd-arm64@0.25.12':
+    resolution: {integrity: sha512-fF96T6KsBo/pkQI950FARU9apGNTSlZGsv1jZBAlcLL1MLjLNIWPBkj5NlSz8aAzYKg+eNqknrUJ24QBybeR5A==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [openbsd]
@@ -2466,14 +2466,14 @@ packages:
     cpu: [x64]
     os: [openbsd]
 
-  '@esbuild/openbsd-x64@0.25.11':
-    resolution: {integrity: sha512-CN+7c++kkbrckTOz5hrehxWN7uIhFFlmS/hqziSFVWpAzpWrQoAG4chH+nN3Be+Kzv/uuo7zhX716x3Sn2Jduw==}
+  '@esbuild/openbsd-x64@0.25.12':
+    resolution: {integrity: sha512-MZyXUkZHjQxUvzK7rN8DJ3SRmrVrke8ZyRusHlP+kuwqTcfWLyqMOE3sScPPyeIXN/mDJIfGXvcMqCgYKekoQw==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [openbsd]
 
-  '@esbuild/openharmony-arm64@0.25.11':
-    resolution: {integrity: sha512-rOREuNIQgaiR+9QuNkbkxubbp8MSO9rONmwP5nKncnWJ9v5jQ4JxFnLu4zDSRPf3x4u+2VN4pM4RdyIzDty/wQ==}
+  '@esbuild/openharmony-arm64@0.25.12':
+    resolution: {integrity: sha512-rm0YWsqUSRrjncSXGA7Zv78Nbnw4XL6/dzr20cyrQf7ZmRcsovpcRBdhD43Nuk3y7XIoW2OxMVvwuRvk9XdASg==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [openharmony]
@@ -2484,8 +2484,8 @@ packages:
     cpu: [x64]
     os: [sunos]
 
-  '@esbuild/sunos-x64@0.25.11':
-    resolution: {integrity: sha512-nq2xdYaWxyg9DcIyXkZhcYulC6pQ2FuCgem3LI92IwMgIZ69KHeY8T4Y88pcwoLIjbed8n36CyKoYRDygNSGhA==}
+  '@esbuild/sunos-x64@0.25.12':
+    resolution: {integrity: sha512-3wGSCDyuTHQUzt0nV7bocDy72r2lI33QL3gkDNGkod22EsYl04sMf0qLb8luNKTOmgF/eDEDP5BFNwoBKH441w==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [sunos]
@@ -2496,8 +2496,8 @@ packages:
     cpu: [arm64]
     os: [win32]
 
-  '@esbuild/win32-arm64@0.25.11':
-    resolution: {integrity: sha512-3XxECOWJq1qMZ3MN8srCJ/QfoLpL+VaxD/WfNRm1O3B4+AZ/BnLVgFbUV3eiRYDMXetciH16dwPbbHqwe1uU0Q==}
+  '@esbuild/win32-arm64@0.25.12':
+    resolution: {integrity: sha512-rMmLrur64A7+DKlnSuwqUdRKyd3UE7oPJZmnljqEptesKM8wx9J8gx5u0+9Pq0fQQW8vqeKebwNXdfOyP+8Bsg==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [win32]
@@ -2508,8 +2508,8 @@ packages:
     cpu: [ia32]
     os: [win32]
 
-  '@esbuild/win32-ia32@0.25.11':
-    resolution: {integrity: sha512-3ukss6gb9XZ8TlRyJlgLn17ecsK4NSQTmdIXRASVsiS2sQ6zPPZklNJT5GR5tE/MUarymmy8kCEf5xPCNCqVOA==}
+  '@esbuild/win32-ia32@0.25.12':
+    resolution: {integrity: sha512-HkqnmmBoCbCwxUKKNPBixiWDGCpQGVsrQfJoVGYLPT41XWF8lHuE5N6WhVia2n4o5QK5M4tYr21827fNhi4byQ==}
     engines: {node: '>=18'}
     cpu: [ia32]
     os: [win32]
@@ -2520,8 +2520,8 @@ packages:
     cpu: [x64]
     os: [win32]
 
-  '@esbuild/win32-x64@0.25.11':
-    resolution: {integrity: sha512-D7Hpz6A2L4hzsRpPaCYkQnGOotdUpDzSGRIv9I+1ITdHROSFUWW95ZPZWQmGka1Fg7W3zFJowyn9WGwMJ0+KPA==}
+  '@esbuild/win32-x64@0.25.12':
+    resolution: {integrity: sha512-alJC0uCZpTFrSL0CCDjcgleBXPnCrEAhTBILpeAp7M/OFgoqtAetfBzX0xM00MUsVVPpVjlPuMbREqnZCXaTnA==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [win32]
@@ -3088,8 +3088,8 @@ packages:
     resolution: {integrity: sha512-Es6WcD0nO5l+2BOQS4uLfNPYQaNDfbot3X1XUoloz+x0mPDS3eeORZJl06HXjwBG1fOGwCRnzK88LMdxKRrd6Q==}
     engines: {node: '>=6.0.0'}
 
-  '@maplibre/maplibre-gl-style-spec@24.3.0':
-    resolution: {integrity: sha512-CTJc/Nvldv+GNQuis29VnyV0TYsFTgQBY3SNagTzZ28oHDsDYJ7LwEmfick4Z30wPwI/4gXe3se8PH2IIfLx2g==}
+  '@maplibre/maplibre-gl-style-spec@24.3.1':
+    resolution: {integrity: sha512-TUM5JD40H2mgtVXl5IwWz03BuQabw8oZQLJTmPpJA0YTYF+B+oZppy5lNMO6bMvHzB+/5mxqW9VLG3wFdeqtOw==}
     hasBin: true
 
   '@maplibre/vt-pbf@4.0.3':
@@ -3178,8 +3178,8 @@ packages:
       '@swc/core':
         optional: true
 
-  '@nestjs/common@11.1.7':
-    resolution: {integrity: sha512-lwlObwGgIlpXSXYOTpfzdCepUyWomz6bv9qzGzzvpgspUxkj0Uz0fUJcvD44V8Ps7QhKW3lZBoYbXrH25UZrbA==}
+  '@nestjs/common@11.1.8':
+    resolution: {integrity: sha512-bbsOqwld/GdBfiRNc4nnjyWWENDEicq4SH+R5AuYatvf++vf1x5JIsHB1i1KtfZMD3eRte0D4K9WXuAYil6XAg==}
     peerDependencies:
       class-transformer: '>=0.4.1'
       class-validator: '>=0.13.2'
@@ -3191,8 +3191,8 @@ packages:
       class-validator:
         optional: true
 
-  '@nestjs/core@11.1.7':
-    resolution: {integrity: sha512-TyXFOwjhHv/goSgJ8i20K78jwTM0iSpk9GBcC2h3mf4MxNy+znI8m7nWjfoACjTkb89cTwDQetfTHtSfGLLaiA==}
+  '@nestjs/core@11.1.8':
+    resolution: {integrity: sha512-7riWfmTmMhCJHZ5ZiaG+crj4t85IPCq/wLRuOUSigBYyFT2JZj0lVHtAdf4Davp9ouNI8GINBDt9h9b5Gz9nTw==}
     engines: {node: '>= 20'}
     peerDependencies:
       '@nestjs/common': ^11.0.0
@@ -3222,14 +3222,14 @@ packages:
       class-validator:
         optional: true
 
-  '@nestjs/platform-express@11.1.7':
-    resolution: {integrity: sha512-5T+GLdvTiGPKB4/P4PM9ftKUKNHJy8ThEFhZA3vQnXVL7Vf0rDr07TfVTySVu+XTh85m1lpFVuyFM6u6wLNsRA==}
+  '@nestjs/platform-express@11.1.8':
+    resolution: {integrity: sha512-rL6pZH9BW7BnL5X2eWbJMtt86uloAKjFgyY5+L2UkizgfEp7rgAs0+Z1z0BcW2Pgu5+q8O7RKPNyHJ/9ZNz/ZQ==}
     peerDependencies:
       '@nestjs/common': ^11.0.0
       '@nestjs/core': ^11.0.0
 
-  '@nestjs/platform-socket.io@11.1.7':
-    resolution: {integrity: sha512-suAyy5JWWvqU0fXbRp79Ihy7a1HSfB5rKgecVRmuQQyTi28W/0lsRsJN41plsxOEiXtaZq7sqiQp5Dg4XeUc9g==}
+  '@nestjs/platform-socket.io@11.1.8':
+    resolution: {integrity: sha512-nMUvwcdztso8BjN9czRl4sm0Ewc5xrCcgLvy+QPt6VAnTdu06KcZqtA6Cl3MKxViSQsQ8NBN5foKvZehNt/tug==}
     peerDependencies:
       '@nestjs/common': ^11.0.0
       '@nestjs/websockets': ^11.0.0
@@ -3263,8 +3263,8 @@ packages:
       class-validator:
         optional: true
 
-  '@nestjs/testing@11.1.7':
-    resolution: {integrity: sha512-QbtrgSlc3QVo6RHNxTTlyhaiobLLy8kvhOlgWHsoXRknybuRs7vZg4k5mo3ye6pITGeT3CrWIRpZjUsh5Wps5Q==}
+  '@nestjs/testing@11.1.8':
+    resolution: {integrity: sha512-E6K+0UTKztcPxJzLnQa7S34lFjZbrj3Z1r7c5y5WDrL1m5HD1H4AeyBhicHgdaFmxjLAva2bq0sYKy/S7cdeYA==}
     peerDependencies:
       '@nestjs/common': ^11.0.0
       '@nestjs/core': ^11.0.0
@@ -3276,8 +3276,8 @@ packages:
       '@nestjs/platform-express':
         optional: true
 
-  '@nestjs/websockets@11.1.7':
-    resolution: {integrity: sha512-FWPgZPN7yQWIeonQ7JL64Rbsbw/IQovft0cVC5UX1Jbsovq+rUaTuk3rilimGrawN9VOGcoiQLGNiIbmjjiCew==}
+  '@nestjs/websockets@11.1.8':
+    resolution: {integrity: sha512-RXo2336p/vyAwJ0qPInglzNSQ//qz+JTLr2LE1vlbmN5WcyB7zV6+gY06YgNdsr3oy/cXRh7fnC3Ph/VAu1EVg==}
     peerDependencies:
       '@nestjs/common': ^11.0.0
       '@nestjs/core': ^11.0.0
@@ -4091,8 +4091,8 @@ packages:
       svelte: ^5.0.0
       vite: ^6.3.0 || >=7.0.0
 
-  '@sveltejs/kit@2.47.3':
-    resolution: {integrity: sha512-zN2yzBc2dIES2BSzLhNP2weYhwB77kgM/oAktICZVmmljyEmPZrlUwr14jjdK9/eDu7WdAuf6gTdYIJLTcN3Fw==}
+  '@sveltejs/kit@2.48.3':
+    resolution: {integrity: sha512-jf8mx3yctRXE9hvixgcqqK94YI2hDnbxI/12Upkz99XFMvxnJKCMzvz0j7lmbXSyBSNEycWO5xHvi7b73y9qkQ==}
     engines: {node: '>=18.13'}
     hasBin: true
     peerDependencies:
@@ -4197,68 +4197,68 @@ packages:
     resolution: {integrity: sha512-LnhVjMWyMQV9ZmeEy26maJk+8HTIbd59cH4F2MJ439k9DqejRisfFNGAPvRYlKETuh9LrImlS8aKsBgKjMA8WA==}
     engines: {node: '>=14'}
 
-  '@swc/core-darwin-arm64@1.13.5':
-    resolution: {integrity: sha512-lKNv7SujeXvKn16gvQqUQI5DdyY8v7xcoO3k06/FJbHJS90zEwZdQiMNRiqpYw/orU543tPaWgz7cIYWhbopiQ==}
+  '@swc/core-darwin-arm64@1.14.0':
+    resolution: {integrity: sha512-uHPC8rlCt04nvYNczWzKVdgnRhxCa3ndKTBBbBpResOZsRmiwRAvByIGh599j+Oo6Z5eyTPrgY+XfJzVmXnN7Q==}
     engines: {node: '>=10'}
     cpu: [arm64]
     os: [darwin]
 
-  '@swc/core-darwin-x64@1.13.5':
-    resolution: {integrity: sha512-ILd38Fg/w23vHb0yVjlWvQBoE37ZJTdlLHa8LRCFDdX4WKfnVBiblsCU9ar4QTMNdeTBEX9iUF4IrbNWhaF1Ng==}
+  '@swc/core-darwin-x64@1.14.0':
+    resolution: {integrity: sha512-2SHrlpl68vtePRknv9shvM9YKKg7B9T13tcTg9aFCwR318QTYo+FzsKGmQSv9ox/Ua0Q2/5y2BNjieffJoo4nA==}
     engines: {node: '>=10'}
     cpu: [x64]
     os: [darwin]
 
-  '@swc/core-linux-arm-gnueabihf@1.13.5':
-    resolution: {integrity: sha512-Q6eS3Pt8GLkXxqz9TAw+AUk9HpVJt8Uzm54MvPsqp2yuGmY0/sNaPPNVqctCX9fu/Nu8eaWUen0si6iEiCsazQ==}
+  '@swc/core-linux-arm-gnueabihf@1.14.0':
+    resolution: {integrity: sha512-SMH8zn01dxt809svetnxpeg/jWdpi6dqHKO3Eb11u4OzU2PK7I5uKS6gf2hx5LlTbcJMFKULZiVwjlQLe8eqtg==}
     engines: {node: '>=10'}
     cpu: [arm]
     os: [linux]
 
-  '@swc/core-linux-arm64-gnu@1.13.5':
-    resolution: {integrity: sha512-aNDfeN+9af+y+M2MYfxCzCy/VDq7Z5YIbMqRI739o8Ganz6ST+27kjQFd8Y/57JN/hcnUEa9xqdS3XY7WaVtSw==}
+  '@swc/core-linux-arm64-gnu@1.14.0':
+    resolution: {integrity: sha512-q2JRu2D8LVqGeHkmpVCljVNltG0tB4o4eYg+dElFwCS8l2Mnt9qurMCxIeo9mgoqz0ax+k7jWtIRHktnVCbjvQ==}
     engines: {node: '>=10'}
     cpu: [arm64]
     os: [linux]
 
-  '@swc/core-linux-arm64-musl@1.13.5':
-    resolution: {integrity: sha512-9+ZxFN5GJag4CnYnq6apKTnnezpfJhCumyz0504/JbHLo+Ue+ZtJnf3RhyA9W9TINtLE0bC4hKpWi8ZKoETyOQ==}
+  '@swc/core-linux-arm64-musl@1.14.0':
+    resolution: {integrity: sha512-uofpVoPCEUjYIv454ZEZ3sLgMD17nIwlz2z7bsn7rl301Kt/01umFA7MscUovFfAK2IRGck6XB+uulMu6aFhKQ==}
     engines: {node: '>=10'}
     cpu: [arm64]
     os: [linux]
 
-  '@swc/core-linux-x64-gnu@1.13.5':
-    resolution: {integrity: sha512-WD530qvHrki8Ywt/PloKUjaRKgstQqNGvmZl54g06kA+hqtSE2FTG9gngXr3UJxYu/cNAjJYiBifm7+w4nbHbA==}
+  '@swc/core-linux-x64-gnu@1.14.0':
+    resolution: {integrity: sha512-quTTx1Olm05fBfv66DEBuOsOgqdypnZ/1Bh3yGXWY7ANLFeeRpCDZpljD9BSjdsNdPOlwJmEUZXMHtGm3v1TZQ==}
     engines: {node: '>=10'}
     cpu: [x64]
     os: [linux]
 
-  '@swc/core-linux-x64-musl@1.13.5':
-    resolution: {integrity: sha512-Luj8y4OFYx4DHNQTWjdIuKTq2f5k6uSXICqx+FSabnXptaOBAbJHNbHT/06JZh6NRUouaf0mYXN0mcsqvkhd7Q==}
+  '@swc/core-linux-x64-musl@1.14.0':
+    resolution: {integrity: sha512-caaNAu+aIqT8seLtCf08i8C3/UC5ttQujUjejhMcuS1/LoCKtNiUs4VekJd2UGt+pyuuSrQ6dKl8CbCfWvWeXw==}
     engines: {node: '>=10'}
     cpu: [x64]
     os: [linux]
 
-  '@swc/core-win32-arm64-msvc@1.13.5':
-    resolution: {integrity: sha512-cZ6UpumhF9SDJvv4DA2fo9WIzlNFuKSkZpZmPG1c+4PFSEMy5DFOjBSllCvnqihCabzXzpn6ykCwBmHpy31vQw==}
+  '@swc/core-win32-arm64-msvc@1.14.0':
+    resolution: {integrity: sha512-EeW3jFlT3YNckJ6V/JnTfGcX7UHGyh6/AiCPopZ1HNaGiXVCKHPpVQZicmtyr/UpqxCXLrTgjHOvyMke7YN26A==}
     engines: {node: '>=10'}
     cpu: [arm64]
     os: [win32]
 
-  '@swc/core-win32-ia32-msvc@1.13.5':
-    resolution: {integrity: sha512-C5Yi/xIikrFUzZcyGj9L3RpKljFvKiDMtyDzPKzlsDrKIw2EYY+bF88gB6oGY5RGmv4DAX8dbnpRAqgFD0FMEw==}
+  '@swc/core-win32-ia32-msvc@1.14.0':
+    resolution: {integrity: sha512-dPai3KUIcihV5hfoO4QNQF5HAaw8+2bT7dvi8E5zLtecW2SfL3mUZipzampXq5FHll0RSCLzlrXnSx+dBRZIIQ==}
     engines: {node: '>=10'}
     cpu: [ia32]
     os: [win32]
 
-  '@swc/core-win32-x64-msvc@1.13.5':
-    resolution: {integrity: sha512-YrKdMVxbYmlfybCSbRtrilc6UA8GF5aPmGKBdPvjrarvsmf4i7ZHGCEnLtfOMd3Lwbs2WUZq3WdMbozYeLU93Q==}
+  '@swc/core-win32-x64-msvc@1.14.0':
+    resolution: {integrity: sha512-nm+JajGrTqUA6sEHdghDlHMNfH1WKSiuvljhdmBACW4ta4LC3gKurX2qZuiBARvPkephW9V/i5S8QPY1PzFEqg==}
     engines: {node: '>=10'}
     cpu: [x64]
     os: [win32]
 
-  '@swc/core@1.13.5':
-    resolution: {integrity: sha512-WezcBo8a0Dg2rnR82zhwoR6aRNxeTGfK5QCD6TQ+kg3xx/zNT02s/0o+81h/3zhvFSB24NtqEr8FTw88O5W/JQ==}
+  '@swc/core@1.14.0':
+    resolution: {integrity: sha512-oExhY90bes5pDTVrei0xlMVosTxwd/NMafIpqsC4dMbRYZ5KB981l/CX8tMnGsagTplj/RcG9BeRYmV6/J5m3w==}
     engines: {node: '>=10'}
     peerDependencies:
       '@swc/helpers': '>=0.5.17'
@@ -4650,11 +4650,11 @@ packages:
   '@types/node@20.19.24':
     resolution: {integrity: sha512-FE5u0ezmi6y9OZEzlJfg37mqqf6ZDSF2V/NLjUyGrR9uTZ7Sb9F7bLNZ03S4XVUNRWGA7Ck4c1kK+YnuWjl+DA==}
 
-  '@types/node@22.18.13':
-    resolution: {integrity: sha512-Bo45YKIjnmFtv6I1TuC8AaHBbqXtIo+Om5fE4QiU1Tj8QR/qt+8O3BAtOimG5IFmwaWiPmB3Mv3jtYzBA4Us2A==}
+  '@types/node@22.19.0':
+    resolution: {integrity: sha512-xpr/lmLPQEj+TUnHmR+Ab91/glhJvsqcjB+yY0Ix9GO70H6Lb4FHH5GeqdOE5btAx7eIMwuHkp4H2MSkLcqWbA==}
 
-  '@types/node@24.9.2':
-    resolution: {integrity: sha512-uWN8YqxXxqFMX2RqGOrumsKeti4LlmIMIyV0lgut4jx7KQBcBiW6vkDtIBvHnHIquwNfJhk8v2OtmO8zXWHfPA==}
+  '@types/node@24.10.0':
+    resolution: {integrity: sha512-qzQZRBqkFsYyaSWXuEHc2WR9c0a0CXwiE5FWUvn7ZM+vdy1uZLfCunD38UzhuB7YN/J11ndbDBcTmOdxJo9Q7A==}
 
   '@types/nodemailer@7.0.3':
     resolution: {integrity: sha512-fC8w49YQ868IuPWRXqPfLf+MuTRex5Z1qxMoG8rr70riqqbOp2F5xgOKE9fODEBPzpnvjkJXFgK6IL2xgMSTnA==}
@@ -4671,6 +4671,9 @@ packages:
   '@types/pg@8.15.5':
     resolution: {integrity: sha512-LF7lF6zWEKxuT3/OR8wAZGzkg4ENGXFNyiV/JeOt9z5B+0ZVwbql9McqX5c/WStFq1GaGso7H1AzP/qSzmlCKQ==}
 
+  '@types/pg@8.15.6':
+    resolution: {integrity: sha512-NoaMtzhxOrubeL/7UZuNTrejB4MPAJ0RpxZqXQf2qXuVlTPuG6Y8p4u9dKRaue4yjmC7ZhzVO2/Yyyn25znrPQ==}
+
   '@types/picomatch@4.0.2':
     resolution: {integrity: sha512-qHHxQ+P9PysNEGbALT8f8YOSHW0KJu6l2xU8DYY0fu/EmGxXdVnuTLvFUvBgPJMSqXq29SYHveejeAha+4AYgA==}
 
@@ -4761,8 +4764,8 @@ packages:
   '@types/unist@3.0.3':
     resolution: {integrity: sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==}
 
-  '@types/validator@13.15.3':
-    resolution: {integrity: sha512-7bcUmDyS6PN3EuD9SlGGOxM77F8WLVsrwkxyWxKnxzmXoequ6c7741QBrANq6htVRGOITJ7z72mTP6Z4XyuG+Q==}
+  '@types/validator@13.15.4':
+    resolution: {integrity: sha512-LSFfpSnJJY9wbC0LQxgvfb+ynbHftFo0tMsFOl/J4wexLnYMmDSPaj2ZyDv3TkfL1UePxPrxOWJfbiRS8mQv7A==}
 
   '@types/whatwg-mimetype@3.0.2':
     resolution: {integrity: sha512-c2AKvDT8ToxLIOUlN51gTiHXflsfIFisS4pO7pDPoKouJCESkhZnEy623gwP9laCy5lnLDAw1vAzu2vM2YLOrA==}
@@ -5378,8 +5381,8 @@ packages:
     resolution: {integrity: sha512-bkXY9WsVpY7CvMhKSR6pZilZu9Ln5WDrKVBUXf2S443etkmEO4V58heTecXcUIsNsi4Rx8JUO4NfX1IcQl4deg==}
     engines: {node: '>=18.20'}
 
-  bullmq@5.61.2:
-    resolution: {integrity: sha512-b39hbiq/xXpOTT/OfmKpQYD+4VE4+XUlvdZ6GjbGl9asmRk8cSvUaQWD18jVCn1I0SzIfbrgOf+RAkqjXDUhJg==}
+  bullmq@5.62.1:
+    resolution: {integrity: sha512-FiRxqSquGTf8W8l8OMczKfEFG0BEqJ5NzChwKZ4vbSpZSPFLSmmxXAQlW4imB1rZHnlc7sYq8o+Oy4JavoIEpQ==}
 
   bundle-name@4.1.0:
     resolution: {integrity: sha512-tjwM5exMg6BGRI+kNmTntNsvdZS1X8BFYS6tnJ2hdH0kVxM6/eVZ2xy+FqStSWvYmtfFMDLIxurorHwDKfDz5Q==}
@@ -6410,8 +6413,8 @@ packages:
     engines: {node: '>=12'}
     hasBin: true
 
-  esbuild@0.25.11:
-    resolution: {integrity: sha512-KohQwyzrKTQmhXDW1PjCv3Tyspn9n5GcY2RTDqeORIdIJY8yKIF7sTSopFmn/wpMPW4rdPXI0UE5LJLuq3bx0Q==}
+  esbuild@0.25.12:
+    resolution: {integrity: sha512-bbPBYYrtZbkt6Os6FiTLCTFxvq4tt3JKall1vRwshA3fdVztsLAatFaZobhkBC8/BrPetoa0oksYoKXoG4ryJg==}
     engines: {node: '>=18'}
     hasBin: true
 
@@ -7051,8 +7054,8 @@ packages:
     engines: {node: '>=0.4.7'}
     hasBin: true
 
-  happy-dom@20.0.8:
-    resolution: {integrity: sha512-TlYaNQNtzsZ97rNMBAm8U+e2cUQXNithgfCizkDgc11lgmN4j9CKMhO3FPGKWQYPwwkFcPpoXYF/CqEPLgzfOg==}
+  happy-dom@20.0.10:
+    resolution: {integrity: sha512-6umCCHcjQrhP5oXhrHQQvLB0bwb1UzHAHdsXy+FjtKoYjUhmNZsQL8NivwM1vDvNEChJabVrUYxUnp/ZdYmy2g==}
     engines: {node: '>=20.0.0'}
 
   has-flag@4.0.0:
@@ -8018,8 +8021,8 @@ packages:
     resolution: {integrity: sha512-p8lJFEiqmEQlyv+DQxFAOG/XPWN0Wp7j/Psq93Zywz7qt9CcUKFYDBOoOEKzqe6gudHVJY8/Bhqw6VDpX2lSBg==}
     engines: {node: '>=6.4.0'}
 
-  maplibre-gl@5.9.0:
-    resolution: {integrity: sha512-YxW9glb/YrDXGDhqy1u+aG113+L86ttAUpTd6sCkGHyUKMXOX8qbGHJQVqxOczy+4CtRKnqcCfSura2MzB0nQA==}
+  maplibre-gl@5.10.0:
+    resolution: {integrity: sha512-eLhlX8Fnpaoo7+uGqggZmXmZld6WrbzOJUPB7G8JB8XpminlTnrQTtXilMHduR8fsNVxrzD8yRRqEoajONc8LQ==}
     engines: {node: '>=16.14.0', npm: '>=8.1.0'}
 
   mark.js@8.11.1:
@@ -9673,8 +9676,8 @@ packages:
     peerDependencies:
       react: ^19.2.0
 
-  react-email@4.3.1:
-    resolution: {integrity: sha512-GBgI7fl0fXVFVQ4zlXG+x14egDNX1WVlOrAXKMyc1h9xeTnIAt/u3g1liU4v+7Yv3yprMSkZ1mIO3YPuTKo77A==}
+  react-email@4.3.2:
+    resolution: {integrity: sha512-WaZcnv9OAIRULY236zDRdk+8r511ooJGH5UOb7FnVsV33hGPI+l5aIZ6drVjXi4QrlLTmLm8PsYvmXRSv31MPA==}
     engines: {node: '>=18.0.0'}
     hasBin: true
 
@@ -10168,8 +10171,8 @@ packages:
   simple-get@3.1.1:
     resolution: {integrity: sha512-CQ5LTKGfCpvE1K0n2us+kuMPbk/q0EKl82s4aheV9oXjFEz6W/Y7oQFVJuU6QG77hRT4Ghb5RURteF5vnWjupA==}
 
-  simple-icons@15.17.0:
-    resolution: {integrity: sha512-viOcugYj+JFYVWJvDh4Ph1xHk9iTGhzt+NoPrfAQYSCADvmZFSQUWyKEbSMuqVRUsaRgvADn+Cczysemsf1N3Q==}
+  simple-icons@15.18.0:
+    resolution: {integrity: sha512-lYpvaIuZZr6N50YSdYZQzrKccSSF3dqcgcoz2vMKVQCc/fJWD8nFszJVZz2tCDTSu082rqRYfuYRUPhjdixDAA==}
     engines: {node: '>=0.12.18'}
 
   sirv@2.0.4:
@@ -10480,8 +10483,8 @@ packages:
     peerDependencies:
       svelte: ^3 || ^4 || ^5
 
-  svelte-maplibre@1.2.3:
-    resolution: {integrity: sha512-2EToGWdSlTq9Tr7MLmUlve3J86uDM9D6s5ErY/oc5LEsktd0TCTPXM1HJ1IGSaa+ElxCv/ka/igvGPb6L4BhLw==}
+  svelte-maplibre@1.2.5:
+    resolution: {integrity: sha512-Uklcbi6inW9GA0MuSusbXmFr/MQPmXrjuP8hS1+yFX3ySvCQ477tsM3I7Jo/fUDK3XAxFSIHW6hZfucnM3kXwQ==}
     peerDependencies:
       '@deck.gl/core': ^9
       '@deck.gl/layers': ^9
@@ -10512,8 +10515,8 @@ packages:
     peerDependencies:
       svelte: ^5.30.2
 
-  svelte@5.41.3:
-    resolution: {integrity: sha512-bkHg+whEnVVNcK3XP8Dy4NHujn5mU/+at9z09PXM5THKm+E73AwiKFoRMMTfyAzAj1yExKtudvGHq8UqOh8kMQ==}
+  svelte@5.43.0:
+    resolution: {integrity: sha512-1sRxVbgJAB+UGzwkc3GUoiBSzEOf0jqzccMaVoI2+pI+kASUe9qubslxace8+Mzhqw19k4syTA5niCIJwfXpOA==}
     engines: {node: '>=18'}
 
   svg-parser@2.0.4:
@@ -11714,11 +11717,11 @@ snapshots:
     optionalDependencies:
       chokidar: 4.0.3
 
-  '@angular-devkit/schematics-cli@19.2.15(@types/node@22.18.13)(chokidar@4.0.3)':
+  '@angular-devkit/schematics-cli@19.2.15(@types/node@22.19.0)(chokidar@4.0.3)':
     dependencies:
       '@angular-devkit/core': 19.2.15(chokidar@4.0.3)
       '@angular-devkit/schematics': 19.2.15(chokidar@4.0.3)
-      '@inquirer/prompts': 7.3.2(@types/node@22.18.13)
+      '@inquirer/prompts': 7.3.2(@types/node@22.19.0)
       ansi-colors: 4.1.3
       symbol-observable: 4.0.0
       yargs-parser: 21.1.1
@@ -13968,148 +13971,148 @@ snapshots:
   '@esbuild/aix-ppc64@0.19.12':
     optional: true
 
-  '@esbuild/aix-ppc64@0.25.11':
+  '@esbuild/aix-ppc64@0.25.12':
     optional: true
 
   '@esbuild/android-arm64@0.19.12':
     optional: true
 
-  '@esbuild/android-arm64@0.25.11':
+  '@esbuild/android-arm64@0.25.12':
     optional: true
 
   '@esbuild/android-arm@0.19.12':
     optional: true
 
-  '@esbuild/android-arm@0.25.11':
+  '@esbuild/android-arm@0.25.12':
     optional: true
 
   '@esbuild/android-x64@0.19.12':
     optional: true
 
-  '@esbuild/android-x64@0.25.11':
+  '@esbuild/android-x64@0.25.12':
     optional: true
 
   '@esbuild/darwin-arm64@0.19.12':
     optional: true
 
-  '@esbuild/darwin-arm64@0.25.11':
+  '@esbuild/darwin-arm64@0.25.12':
     optional: true
 
   '@esbuild/darwin-x64@0.19.12':
     optional: true
 
-  '@esbuild/darwin-x64@0.25.11':
+  '@esbuild/darwin-x64@0.25.12':
     optional: true
 
   '@esbuild/freebsd-arm64@0.19.12':
     optional: true
 
-  '@esbuild/freebsd-arm64@0.25.11':
+  '@esbuild/freebsd-arm64@0.25.12':
     optional: true
 
   '@esbuild/freebsd-x64@0.19.12':
     optional: true
 
-  '@esbuild/freebsd-x64@0.25.11':
+  '@esbuild/freebsd-x64@0.25.12':
     optional: true
 
   '@esbuild/linux-arm64@0.19.12':
     optional: true
 
-  '@esbuild/linux-arm64@0.25.11':
+  '@esbuild/linux-arm64@0.25.12':
     optional: true
 
   '@esbuild/linux-arm@0.19.12':
     optional: true
 
-  '@esbuild/linux-arm@0.25.11':
+  '@esbuild/linux-arm@0.25.12':
     optional: true
 
   '@esbuild/linux-ia32@0.19.12':
     optional: true
 
-  '@esbuild/linux-ia32@0.25.11':
+  '@esbuild/linux-ia32@0.25.12':
     optional: true
 
   '@esbuild/linux-loong64@0.19.12':
     optional: true
 
-  '@esbuild/linux-loong64@0.25.11':
+  '@esbuild/linux-loong64@0.25.12':
     optional: true
 
   '@esbuild/linux-mips64el@0.19.12':
     optional: true
 
-  '@esbuild/linux-mips64el@0.25.11':
+  '@esbuild/linux-mips64el@0.25.12':
     optional: true
 
   '@esbuild/linux-ppc64@0.19.12':
     optional: true
 
-  '@esbuild/linux-ppc64@0.25.11':
+  '@esbuild/linux-ppc64@0.25.12':
     optional: true
 
   '@esbuild/linux-riscv64@0.19.12':
     optional: true
 
-  '@esbuild/linux-riscv64@0.25.11':
+  '@esbuild/linux-riscv64@0.25.12':
     optional: true
 
   '@esbuild/linux-s390x@0.19.12':
     optional: true
 
-  '@esbuild/linux-s390x@0.25.11':
+  '@esbuild/linux-s390x@0.25.12':
     optional: true
 
   '@esbuild/linux-x64@0.19.12':
     optional: true
 
-  '@esbuild/linux-x64@0.25.11':
+  '@esbuild/linux-x64@0.25.12':
     optional: true
 
-  '@esbuild/netbsd-arm64@0.25.11':
+  '@esbuild/netbsd-arm64@0.25.12':
     optional: true
 
   '@esbuild/netbsd-x64@0.19.12':
     optional: true
 
-  '@esbuild/netbsd-x64@0.25.11':
+  '@esbuild/netbsd-x64@0.25.12':
     optional: true
 
-  '@esbuild/openbsd-arm64@0.25.11':
+  '@esbuild/openbsd-arm64@0.25.12':
     optional: true
 
   '@esbuild/openbsd-x64@0.19.12':
     optional: true
 
-  '@esbuild/openbsd-x64@0.25.11':
+  '@esbuild/openbsd-x64@0.25.12':
     optional: true
 
-  '@esbuild/openharmony-arm64@0.25.11':
+  '@esbuild/openharmony-arm64@0.25.12':
     optional: true
 
   '@esbuild/sunos-x64@0.19.12':
     optional: true
 
-  '@esbuild/sunos-x64@0.25.11':
+  '@esbuild/sunos-x64@0.25.12':
     optional: true
 
   '@esbuild/win32-arm64@0.19.12':
     optional: true
 
-  '@esbuild/win32-arm64@0.25.11':
+  '@esbuild/win32-arm64@0.25.12':
     optional: true
 
   '@esbuild/win32-ia32@0.19.12':
     optional: true
 
-  '@esbuild/win32-ia32@0.25.11':
+  '@esbuild/win32-ia32@0.25.12':
     optional: true
 
   '@esbuild/win32-x64@0.19.12':
     optional: true
 
-  '@esbuild/win32-x64@0.25.11':
+  '@esbuild/win32-x64@0.25.12':
     optional: true
 
   '@eslint-community/eslint-utils@4.9.0(eslint@9.38.0(jiti@2.6.1))':
@@ -14211,10 +14214,10 @@ snapshots:
     dependencies:
       tslib: 2.8.1
 
-  '@golevelup/nestjs-discovery@5.0.0(@nestjs/common@11.1.7(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.7)':
+  '@golevelup/nestjs-discovery@5.0.0(@nestjs/common@11.1.8(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.8)':
     dependencies:
-      '@nestjs/common': 11.1.7(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2)
-      '@nestjs/core': 11.1.7(@nestjs/common@11.1.7(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/platform-express@11.1.7)(@nestjs/websockets@11.1.7)(reflect-metadata@0.2.2)(rxjs@7.8.2)
+      '@nestjs/common': 11.1.8(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2)
+      '@nestjs/core': 11.1.8(@nestjs/common@11.1.8(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/platform-express@11.1.8)(@nestjs/websockets@11.1.8)(reflect-metadata@0.2.2)(rxjs@7.8.2)
       lodash: 4.17.21
 
   '@grpc/grpc-js@1.14.0':
@@ -14343,18 +14346,18 @@ snapshots:
 
   '@immich/justified-layout-wasm@0.4.3': {}
 
-  '@immich/svelte-markdown-preprocess@0.0.1(svelte@5.41.3)':
+  '@immich/svelte-markdown-preprocess@0.0.1(svelte@5.43.0)':
     dependencies:
-      svelte: 5.41.3
+      svelte: 5.43.0
 
-  '@immich/ui@0.40.2(@internationalized/date@3.8.2)(svelte@5.41.3)':
+  '@immich/ui@0.40.2(@internationalized/date@3.8.2)(svelte@5.43.0)':
     dependencies:
-      '@immich/svelte-markdown-preprocess': 0.0.1(svelte@5.41.3)
+      '@immich/svelte-markdown-preprocess': 0.0.1(svelte@5.43.0)
       '@mdi/js': 7.4.47
-      bits-ui: 2.9.8(@internationalized/date@3.8.2)(svelte@5.41.3)
+      bits-ui: 2.9.8(@internationalized/date@3.8.2)(svelte@5.43.0)
       luxon: 3.7.2
-      simple-icons: 15.17.0
-      svelte: 5.41.3
+      simple-icons: 15.18.0
+      svelte: 5.43.0
       svelte-highlight: 7.8.4
       tailwind-merge: 3.3.1
       tailwind-variants: 3.1.1(tailwind-merge@3.3.1)(tailwindcss@4.1.16)
@@ -14362,27 +14365,27 @@ snapshots:
     transitivePeerDependencies:
       - '@internationalized/date'
 
-  '@inquirer/checkbox@4.2.1(@types/node@22.18.13)':
+  '@inquirer/checkbox@4.2.1(@types/node@22.19.0)':
     dependencies:
-      '@inquirer/core': 10.1.15(@types/node@22.18.13)
+      '@inquirer/core': 10.1.15(@types/node@22.19.0)
       '@inquirer/figures': 1.0.13
-      '@inquirer/type': 3.0.8(@types/node@22.18.13)
+      '@inquirer/type': 3.0.8(@types/node@22.19.0)
       ansi-escapes: 4.3.2
       yoctocolors-cjs: 2.1.2
     optionalDependencies:
-      '@types/node': 22.18.13
+      '@types/node': 22.19.0
 
-  '@inquirer/confirm@5.1.15(@types/node@22.18.13)':
+  '@inquirer/confirm@5.1.15(@types/node@22.19.0)':
     dependencies:
-      '@inquirer/core': 10.1.15(@types/node@22.18.13)
-      '@inquirer/type': 3.0.8(@types/node@22.18.13)
+      '@inquirer/core': 10.1.15(@types/node@22.19.0)
+      '@inquirer/type': 3.0.8(@types/node@22.19.0)
     optionalDependencies:
-      '@types/node': 22.18.13
+      '@types/node': 22.19.0
 
-  '@inquirer/core@10.1.15(@types/node@22.18.13)':
+  '@inquirer/core@10.1.15(@types/node@22.19.0)':
     dependencies:
       '@inquirer/figures': 1.0.13
-      '@inquirer/type': 3.0.8(@types/node@22.18.13)
+      '@inquirer/type': 3.0.8(@types/node@22.19.0)
       ansi-escapes: 4.3.2
       cli-width: 4.1.0
       mute-stream: 2.0.0
@@ -14390,115 +14393,115 @@ snapshots:
       wrap-ansi: 6.2.0
       yoctocolors-cjs: 2.1.2
     optionalDependencies:
-      '@types/node': 22.18.13
+      '@types/node': 22.19.0
 
-  '@inquirer/editor@4.2.17(@types/node@22.18.13)':
+  '@inquirer/editor@4.2.17(@types/node@22.19.0)':
     dependencies:
-      '@inquirer/core': 10.1.15(@types/node@22.18.13)
-      '@inquirer/external-editor': 1.0.2(@types/node@22.18.13)
-      '@inquirer/type': 3.0.8(@types/node@22.18.13)
+      '@inquirer/core': 10.1.15(@types/node@22.19.0)
+      '@inquirer/external-editor': 1.0.2(@types/node@22.19.0)
+      '@inquirer/type': 3.0.8(@types/node@22.19.0)
     optionalDependencies:
-      '@types/node': 22.18.13
+      '@types/node': 22.19.0
 
-  '@inquirer/expand@4.0.17(@types/node@22.18.13)':
+  '@inquirer/expand@4.0.17(@types/node@22.19.0)':
     dependencies:
-      '@inquirer/core': 10.1.15(@types/node@22.18.13)
-      '@inquirer/type': 3.0.8(@types/node@22.18.13)
+      '@inquirer/core': 10.1.15(@types/node@22.19.0)
+      '@inquirer/type': 3.0.8(@types/node@22.19.0)
       yoctocolors-cjs: 2.1.2
     optionalDependencies:
-      '@types/node': 22.18.13
+      '@types/node': 22.19.0
 
-  '@inquirer/external-editor@1.0.2(@types/node@22.18.13)':
+  '@inquirer/external-editor@1.0.2(@types/node@22.19.0)':
     dependencies:
       chardet: 2.1.0
       iconv-lite: 0.7.0
     optionalDependencies:
-      '@types/node': 22.18.13
+      '@types/node': 22.19.0
 
   '@inquirer/figures@1.0.13': {}
 
-  '@inquirer/input@4.2.1(@types/node@22.18.13)':
+  '@inquirer/input@4.2.1(@types/node@22.19.0)':
     dependencies:
-      '@inquirer/core': 10.1.15(@types/node@22.18.13)
-      '@inquirer/type': 3.0.8(@types/node@22.18.13)
+      '@inquirer/core': 10.1.15(@types/node@22.19.0)
+      '@inquirer/type': 3.0.8(@types/node@22.19.0)
     optionalDependencies:
-      '@types/node': 22.18.13
+      '@types/node': 22.19.0
 
-  '@inquirer/number@3.0.17(@types/node@22.18.13)':
+  '@inquirer/number@3.0.17(@types/node@22.19.0)':
     dependencies:
-      '@inquirer/core': 10.1.15(@types/node@22.18.13)
-      '@inquirer/type': 3.0.8(@types/node@22.18.13)
+      '@inquirer/core': 10.1.15(@types/node@22.19.0)
+      '@inquirer/type': 3.0.8(@types/node@22.19.0)
     optionalDependencies:
-      '@types/node': 22.18.13
+      '@types/node': 22.19.0
 
-  '@inquirer/password@4.0.17(@types/node@22.18.13)':
+  '@inquirer/password@4.0.17(@types/node@22.19.0)':
     dependencies:
-      '@inquirer/core': 10.1.15(@types/node@22.18.13)
-      '@inquirer/type': 3.0.8(@types/node@22.18.13)
+      '@inquirer/core': 10.1.15(@types/node@22.19.0)
+      '@inquirer/type': 3.0.8(@types/node@22.19.0)
       ansi-escapes: 4.3.2
     optionalDependencies:
-      '@types/node': 22.18.13
+      '@types/node': 22.19.0
 
-  '@inquirer/prompts@7.3.2(@types/node@22.18.13)':
+  '@inquirer/prompts@7.3.2(@types/node@22.19.0)':
     dependencies:
-      '@inquirer/checkbox': 4.2.1(@types/node@22.18.13)
-      '@inquirer/confirm': 5.1.15(@types/node@22.18.13)
-      '@inquirer/editor': 4.2.17(@types/node@22.18.13)
-      '@inquirer/expand': 4.0.17(@types/node@22.18.13)
-      '@inquirer/input': 4.2.1(@types/node@22.18.13)
-      '@inquirer/number': 3.0.17(@types/node@22.18.13)
-      '@inquirer/password': 4.0.17(@types/node@22.18.13)
-      '@inquirer/rawlist': 4.1.5(@types/node@22.18.13)
-      '@inquirer/search': 3.1.0(@types/node@22.18.13)
-      '@inquirer/select': 4.3.1(@types/node@22.18.13)
+      '@inquirer/checkbox': 4.2.1(@types/node@22.19.0)
+      '@inquirer/confirm': 5.1.15(@types/node@22.19.0)
+      '@inquirer/editor': 4.2.17(@types/node@22.19.0)
+      '@inquirer/expand': 4.0.17(@types/node@22.19.0)
+      '@inquirer/input': 4.2.1(@types/node@22.19.0)
+      '@inquirer/number': 3.0.17(@types/node@22.19.0)
+      '@inquirer/password': 4.0.17(@types/node@22.19.0)
+      '@inquirer/rawlist': 4.1.5(@types/node@22.19.0)
+      '@inquirer/search': 3.1.0(@types/node@22.19.0)
+      '@inquirer/select': 4.3.1(@types/node@22.19.0)
     optionalDependencies:
-      '@types/node': 22.18.13
+      '@types/node': 22.19.0
 
-  '@inquirer/prompts@7.8.0(@types/node@22.18.13)':
+  '@inquirer/prompts@7.8.0(@types/node@22.19.0)':
     dependencies:
-      '@inquirer/checkbox': 4.2.1(@types/node@22.18.13)
-      '@inquirer/confirm': 5.1.15(@types/node@22.18.13)
-      '@inquirer/editor': 4.2.17(@types/node@22.18.13)
-      '@inquirer/expand': 4.0.17(@types/node@22.18.13)
-      '@inquirer/input': 4.2.1(@types/node@22.18.13)
-      '@inquirer/number': 3.0.17(@types/node@22.18.13)
-      '@inquirer/password': 4.0.17(@types/node@22.18.13)
-      '@inquirer/rawlist': 4.1.5(@types/node@22.18.13)
-      '@inquirer/search': 3.1.0(@types/node@22.18.13)
-      '@inquirer/select': 4.3.1(@types/node@22.18.13)
+      '@inquirer/checkbox': 4.2.1(@types/node@22.19.0)
+      '@inquirer/confirm': 5.1.15(@types/node@22.19.0)
+      '@inquirer/editor': 4.2.17(@types/node@22.19.0)
+      '@inquirer/expand': 4.0.17(@types/node@22.19.0)
+      '@inquirer/input': 4.2.1(@types/node@22.19.0)
+      '@inquirer/number': 3.0.17(@types/node@22.19.0)
+      '@inquirer/password': 4.0.17(@types/node@22.19.0)
+      '@inquirer/rawlist': 4.1.5(@types/node@22.19.0)
+      '@inquirer/search': 3.1.0(@types/node@22.19.0)
+      '@inquirer/select': 4.3.1(@types/node@22.19.0)
     optionalDependencies:
-      '@types/node': 22.18.13
+      '@types/node': 22.19.0
 
-  '@inquirer/rawlist@4.1.5(@types/node@22.18.13)':
+  '@inquirer/rawlist@4.1.5(@types/node@22.19.0)':
     dependencies:
-      '@inquirer/core': 10.1.15(@types/node@22.18.13)
-      '@inquirer/type': 3.0.8(@types/node@22.18.13)
+      '@inquirer/core': 10.1.15(@types/node@22.19.0)
+      '@inquirer/type': 3.0.8(@types/node@22.19.0)
       yoctocolors-cjs: 2.1.2
     optionalDependencies:
-      '@types/node': 22.18.13
+      '@types/node': 22.19.0
 
-  '@inquirer/search@3.1.0(@types/node@22.18.13)':
+  '@inquirer/search@3.1.0(@types/node@22.19.0)':
     dependencies:
-      '@inquirer/core': 10.1.15(@types/node@22.18.13)
+      '@inquirer/core': 10.1.15(@types/node@22.19.0)
       '@inquirer/figures': 1.0.13
-      '@inquirer/type': 3.0.8(@types/node@22.18.13)
+      '@inquirer/type': 3.0.8(@types/node@22.19.0)
       yoctocolors-cjs: 2.1.2
     optionalDependencies:
-      '@types/node': 22.18.13
+      '@types/node': 22.19.0
 
-  '@inquirer/select@4.3.1(@types/node@22.18.13)':
+  '@inquirer/select@4.3.1(@types/node@22.19.0)':
     dependencies:
-      '@inquirer/core': 10.1.15(@types/node@22.18.13)
+      '@inquirer/core': 10.1.15(@types/node@22.19.0)
       '@inquirer/figures': 1.0.13
-      '@inquirer/type': 3.0.8(@types/node@22.18.13)
+      '@inquirer/type': 3.0.8(@types/node@22.19.0)
       ansi-escapes: 4.3.2
       yoctocolors-cjs: 2.1.2
     optionalDependencies:
-      '@types/node': 22.18.13
+      '@types/node': 22.19.0
 
-  '@inquirer/type@3.0.8(@types/node@22.18.13)':
+  '@inquirer/type@3.0.8(@types/node@22.19.0)':
     optionalDependencies:
-      '@types/node': 22.18.13
+      '@types/node': 22.19.0
 
   '@internationalized/date@3.8.2':
     dependencies:
@@ -14536,7 +14539,7 @@ snapshots:
       '@jest/schemas': 29.6.3
       '@types/istanbul-lib-coverage': 2.0.6
       '@types/istanbul-reports': 3.0.4
-      '@types/node': 22.18.13
+      '@types/node': 22.19.0
       '@types/yargs': 17.0.34
       chalk: 4.1.2
 
@@ -14702,7 +14705,7 @@ snapshots:
 
   '@mapbox/whoots-js@3.1.0': {}
 
-  '@maplibre/maplibre-gl-style-spec@24.3.0':
+  '@maplibre/maplibre-gl-style-spec@24.3.1':
     dependencies:
       '@mapbox/jsonlint-lines-primitives': 2.0.2
       '@mapbox/unitbezier': 0.0.1
@@ -14790,32 +14793,32 @@ snapshots:
 
   '@namnode/store@0.1.0': {}
 
-  '@nestjs/bull-shared@11.0.4(@nestjs/common@11.1.7(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.7)':
+  '@nestjs/bull-shared@11.0.4(@nestjs/common@11.1.8(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.8)':
     dependencies:
-      '@nestjs/common': 11.1.7(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2)
-      '@nestjs/core': 11.1.7(@nestjs/common@11.1.7(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/platform-express@11.1.7)(@nestjs/websockets@11.1.7)(reflect-metadata@0.2.2)(rxjs@7.8.2)
+      '@nestjs/common': 11.1.8(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2)
+      '@nestjs/core': 11.1.8(@nestjs/common@11.1.8(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/platform-express@11.1.8)(@nestjs/websockets@11.1.8)(reflect-metadata@0.2.2)(rxjs@7.8.2)
       tslib: 2.8.1
 
-  '@nestjs/bullmq@11.0.4(@nestjs/common@11.1.7(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.7)(bullmq@5.61.2)':
+  '@nestjs/bullmq@11.0.4(@nestjs/common@11.1.8(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.8)(bullmq@5.62.1)':
     dependencies:
-      '@nestjs/bull-shared': 11.0.4(@nestjs/common@11.1.7(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.7)
-      '@nestjs/common': 11.1.7(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2)
-      '@nestjs/core': 11.1.7(@nestjs/common@11.1.7(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/platform-express@11.1.7)(@nestjs/websockets@11.1.7)(reflect-metadata@0.2.2)(rxjs@7.8.2)
-      bullmq: 5.61.2
+      '@nestjs/bull-shared': 11.0.4(@nestjs/common@11.1.8(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.8)
+      '@nestjs/common': 11.1.8(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2)
+      '@nestjs/core': 11.1.8(@nestjs/common@11.1.8(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/platform-express@11.1.8)(@nestjs/websockets@11.1.8)(reflect-metadata@0.2.2)(rxjs@7.8.2)
+      bullmq: 5.62.1
       tslib: 2.8.1
 
-  '@nestjs/cli@11.0.10(@swc/core@1.13.5(@swc/helpers@0.5.17))(@types/node@22.18.13)':
+  '@nestjs/cli@11.0.10(@swc/core@1.14.0(@swc/helpers@0.5.17))(@types/node@22.19.0)':
     dependencies:
       '@angular-devkit/core': 19.2.15(chokidar@4.0.3)
       '@angular-devkit/schematics': 19.2.15(chokidar@4.0.3)
-      '@angular-devkit/schematics-cli': 19.2.15(@types/node@22.18.13)(chokidar@4.0.3)
-      '@inquirer/prompts': 7.8.0(@types/node@22.18.13)
+      '@angular-devkit/schematics-cli': 19.2.15(@types/node@22.19.0)(chokidar@4.0.3)
+      '@inquirer/prompts': 7.8.0(@types/node@22.19.0)
       '@nestjs/schematics': 11.0.9(chokidar@4.0.3)(typescript@5.8.3)
       ansis: 4.1.0
       chokidar: 4.0.3
       cli-table3: 0.6.5
       commander: 4.1.1
-      fork-ts-checker-webpack-plugin: 9.1.0(typescript@5.8.3)(webpack@5.100.2(@swc/core@1.13.5(@swc/helpers@0.5.17)))
+      fork-ts-checker-webpack-plugin: 9.1.0(typescript@5.8.3)(webpack@5.100.2(@swc/core@1.14.0(@swc/helpers@0.5.17)))
       glob: 11.0.3
       node-emoji: 1.11.0
       ora: 5.4.1
@@ -14823,17 +14826,17 @@ snapshots:
       tsconfig-paths: 4.2.0
       tsconfig-paths-webpack-plugin: 4.2.0
       typescript: 5.8.3
-      webpack: 5.100.2(@swc/core@1.13.5(@swc/helpers@0.5.17))
+      webpack: 5.100.2(@swc/core@1.14.0(@swc/helpers@0.5.17))
       webpack-node-externals: 3.0.0
     optionalDependencies:
-      '@swc/core': 1.13.5(@swc/helpers@0.5.17)
+      '@swc/core': 1.14.0(@swc/helpers@0.5.17)
     transitivePeerDependencies:
       - '@types/node'
       - esbuild
       - uglify-js
       - webpack-cli
 
-  '@nestjs/common@11.1.7(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2)':
+  '@nestjs/common@11.1.8(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2)':
     dependencies:
       file-type: 21.0.0
       iterare: 1.2.1
@@ -14848,9 +14851,9 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@nestjs/core@11.1.7(@nestjs/common@11.1.7(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/platform-express@11.1.7)(@nestjs/websockets@11.1.7)(reflect-metadata@0.2.2)(rxjs@7.8.2)':
+  '@nestjs/core@11.1.8(@nestjs/common@11.1.8(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/platform-express@11.1.8)(@nestjs/websockets@11.1.8)(reflect-metadata@0.2.2)(rxjs@7.8.2)':
     dependencies:
-      '@nestjs/common': 11.1.7(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2)
+      '@nestjs/common': 11.1.8(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2)
       '@nuxt/opencollective': 0.4.1
       fast-safe-stringify: 2.1.1
       iterare: 1.2.1
@@ -14860,21 +14863,21 @@ snapshots:
       tslib: 2.8.1
       uid: 2.0.2
     optionalDependencies:
-      '@nestjs/platform-express': 11.1.7(@nestjs/common@11.1.7(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.7)
-      '@nestjs/websockets': 11.1.7(@nestjs/common@11.1.7(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.7)(@nestjs/platform-socket.io@11.1.7)(reflect-metadata@0.2.2)(rxjs@7.8.2)
+      '@nestjs/platform-express': 11.1.8(@nestjs/common@11.1.8(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.8)
+      '@nestjs/websockets': 11.1.8(@nestjs/common@11.1.8(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.8)(@nestjs/platform-socket.io@11.1.8)(reflect-metadata@0.2.2)(rxjs@7.8.2)
 
-  '@nestjs/mapped-types@2.1.0(@nestjs/common@11.1.7(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)':
+  '@nestjs/mapped-types@2.1.0(@nestjs/common@11.1.8(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)':
     dependencies:
-      '@nestjs/common': 11.1.7(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2)
+      '@nestjs/common': 11.1.8(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2)
       reflect-metadata: 0.2.2
     optionalDependencies:
       class-transformer: 0.5.1
       class-validator: 0.14.2
 
-  '@nestjs/platform-express@11.1.7(@nestjs/common@11.1.7(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.7)':
+  '@nestjs/platform-express@11.1.8(@nestjs/common@11.1.8(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.8)':
     dependencies:
-      '@nestjs/common': 11.1.7(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2)
-      '@nestjs/core': 11.1.7(@nestjs/common@11.1.7(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/platform-express@11.1.7)(@nestjs/websockets@11.1.7)(reflect-metadata@0.2.2)(rxjs@7.8.2)
+      '@nestjs/common': 11.1.8(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2)
+      '@nestjs/core': 11.1.8(@nestjs/common@11.1.8(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/platform-express@11.1.8)(@nestjs/websockets@11.1.8)(reflect-metadata@0.2.2)(rxjs@7.8.2)
       cors: 2.8.5
       express: 5.1.0
       multer: 2.0.2
@@ -14883,10 +14886,10 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@nestjs/platform-socket.io@11.1.7(@nestjs/common@11.1.7(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/websockets@11.1.7)(rxjs@7.8.2)':
+  '@nestjs/platform-socket.io@11.1.8(@nestjs/common@11.1.8(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/websockets@11.1.8)(rxjs@7.8.2)':
     dependencies:
-      '@nestjs/common': 11.1.7(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2)
-      '@nestjs/websockets': 11.1.7(@nestjs/common@11.1.7(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.7)(@nestjs/platform-socket.io@11.1.7)(reflect-metadata@0.2.2)(rxjs@7.8.2)
+      '@nestjs/common': 11.1.8(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2)
+      '@nestjs/websockets': 11.1.8(@nestjs/common@11.1.8(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.8)(@nestjs/platform-socket.io@11.1.8)(reflect-metadata@0.2.2)(rxjs@7.8.2)
       rxjs: 7.8.2
       socket.io: 4.8.1
       tslib: 2.8.1
@@ -14895,10 +14898,10 @@ snapshots:
       - supports-color
       - utf-8-validate
 
-  '@nestjs/schedule@6.0.1(@nestjs/common@11.1.7(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.7)':
+  '@nestjs/schedule@6.0.1(@nestjs/common@11.1.8(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.8)':
     dependencies:
-      '@nestjs/common': 11.1.7(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2)
-      '@nestjs/core': 11.1.7(@nestjs/common@11.1.7(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/platform-express@11.1.7)(@nestjs/websockets@11.1.7)(reflect-metadata@0.2.2)(rxjs@7.8.2)
+      '@nestjs/common': 11.1.8(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2)
+      '@nestjs/core': 11.1.8(@nestjs/common@11.1.8(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/platform-express@11.1.8)(@nestjs/websockets@11.1.8)(reflect-metadata@0.2.2)(rxjs@7.8.2)
       cron: 4.3.3
 
   '@nestjs/schematics@11.0.9(chokidar@4.0.3)(typescript@5.8.3)':
@@ -14923,12 +14926,12 @@ snapshots:
     transitivePeerDependencies:
       - chokidar
 
-  '@nestjs/swagger@11.2.1(@nestjs/common@11.1.7(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.7)(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)':
+  '@nestjs/swagger@11.2.1(@nestjs/common@11.1.8(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.8)(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)':
     dependencies:
       '@microsoft/tsdoc': 0.15.1
-      '@nestjs/common': 11.1.7(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2)
-      '@nestjs/core': 11.1.7(@nestjs/common@11.1.7(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/platform-express@11.1.7)(@nestjs/websockets@11.1.7)(reflect-metadata@0.2.2)(rxjs@7.8.2)
-      '@nestjs/mapped-types': 2.1.0(@nestjs/common@11.1.7(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)
+      '@nestjs/common': 11.1.8(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2)
+      '@nestjs/core': 11.1.8(@nestjs/common@11.1.8(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/platform-express@11.1.8)(@nestjs/websockets@11.1.8)(reflect-metadata@0.2.2)(rxjs@7.8.2)
+      '@nestjs/mapped-types': 2.1.0(@nestjs/common@11.1.8(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)
       js-yaml: 4.1.0
       lodash: 4.17.21
       path-to-regexp: 8.3.0
@@ -14938,25 +14941,25 @@ snapshots:
       class-transformer: 0.5.1
       class-validator: 0.14.2
 
-  '@nestjs/testing@11.1.7(@nestjs/common@11.1.7(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.7)(@nestjs/platform-express@11.1.7)':
+  '@nestjs/testing@11.1.8(@nestjs/common@11.1.8(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.8)(@nestjs/platform-express@11.1.8)':
     dependencies:
-      '@nestjs/common': 11.1.7(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2)
-      '@nestjs/core': 11.1.7(@nestjs/common@11.1.7(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/platform-express@11.1.7)(@nestjs/websockets@11.1.7)(reflect-metadata@0.2.2)(rxjs@7.8.2)
+      '@nestjs/common': 11.1.8(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2)
+      '@nestjs/core': 11.1.8(@nestjs/common@11.1.8(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/platform-express@11.1.8)(@nestjs/websockets@11.1.8)(reflect-metadata@0.2.2)(rxjs@7.8.2)
       tslib: 2.8.1
     optionalDependencies:
-      '@nestjs/platform-express': 11.1.7(@nestjs/common@11.1.7(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.7)
+      '@nestjs/platform-express': 11.1.8(@nestjs/common@11.1.8(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.8)
 
-  '@nestjs/websockets@11.1.7(@nestjs/common@11.1.7(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.7)(@nestjs/platform-socket.io@11.1.7)(reflect-metadata@0.2.2)(rxjs@7.8.2)':
+  '@nestjs/websockets@11.1.8(@nestjs/common@11.1.8(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.8)(@nestjs/platform-socket.io@11.1.8)(reflect-metadata@0.2.2)(rxjs@7.8.2)':
     dependencies:
-      '@nestjs/common': 11.1.7(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2)
-      '@nestjs/core': 11.1.7(@nestjs/common@11.1.7(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/platform-express@11.1.7)(@nestjs/websockets@11.1.7)(reflect-metadata@0.2.2)(rxjs@7.8.2)
+      '@nestjs/common': 11.1.8(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2)
+      '@nestjs/core': 11.1.8(@nestjs/common@11.1.8(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/platform-express@11.1.8)(@nestjs/websockets@11.1.8)(reflect-metadata@0.2.2)(rxjs@7.8.2)
       iterare: 1.2.1
       object-hash: 3.0.0
       reflect-metadata: 0.2.2
       rxjs: 7.8.2
       tslib: 2.8.1
     optionalDependencies:
-      '@nestjs/platform-socket.io': 11.1.7(@nestjs/common@11.1.7(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/websockets@11.1.7)(rxjs@7.8.2)
+      '@nestjs/platform-socket.io': 11.1.8(@nestjs/common@11.1.8(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/websockets@11.1.8)(rxjs@7.8.2)
 
   '@noble/hashes@1.8.0': {}
 
@@ -15859,29 +15862,29 @@ snapshots:
     dependencies:
       acorn: 8.15.0
 
-  '@sveltejs/adapter-static@3.0.10(@sveltejs/kit@2.47.3(@opentelemetry/api@1.9.0)(@sveltejs/vite-plugin-svelte@6.2.1(svelte@5.41.3)(vite@7.1.12(@types/node@24.9.2)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)))(svelte@5.41.3)(vite@7.1.12(@types/node@24.9.2)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)))':
+  '@sveltejs/adapter-static@3.0.10(@sveltejs/kit@2.48.3(@opentelemetry/api@1.9.0)(@sveltejs/vite-plugin-svelte@6.2.1(svelte@5.43.0)(vite@7.1.12(@types/node@24.10.0)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)))(svelte@5.43.0)(vite@7.1.12(@types/node@24.10.0)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)))':
     dependencies:
-      '@sveltejs/kit': 2.47.3(@opentelemetry/api@1.9.0)(@sveltejs/vite-plugin-svelte@6.2.1(svelte@5.41.3)(vite@7.1.12(@types/node@24.9.2)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)))(svelte@5.41.3)(vite@7.1.12(@types/node@24.9.2)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1))
+      '@sveltejs/kit': 2.48.3(@opentelemetry/api@1.9.0)(@sveltejs/vite-plugin-svelte@6.2.1(svelte@5.43.0)(vite@7.1.12(@types/node@24.10.0)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)))(svelte@5.43.0)(vite@7.1.12(@types/node@24.10.0)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1))
 
-  '@sveltejs/enhanced-img@0.8.4(@sveltejs/vite-plugin-svelte@6.2.1(svelte@5.41.3)(vite@7.1.12(@types/node@24.9.2)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)))(rollup@4.52.5)(svelte@5.41.3)(vite@7.1.12(@types/node@24.9.2)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1))':
+  '@sveltejs/enhanced-img@0.8.4(@sveltejs/vite-plugin-svelte@6.2.1(svelte@5.43.0)(vite@7.1.12(@types/node@24.10.0)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)))(rollup@4.52.5)(svelte@5.43.0)(vite@7.1.12(@types/node@24.10.0)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1))':
     dependencies:
-      '@sveltejs/vite-plugin-svelte': 6.2.1(svelte@5.41.3)(vite@7.1.12(@types/node@24.9.2)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1))
+      '@sveltejs/vite-plugin-svelte': 6.2.1(svelte@5.43.0)(vite@7.1.12(@types/node@24.10.0)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1))
       magic-string: 0.30.21
       sharp: 0.34.4
-      svelte: 5.41.3
-      svelte-parse-markup: 0.1.5(svelte@5.41.3)
-      vite: 7.1.12(@types/node@24.9.2)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)
+      svelte: 5.43.0
+      svelte-parse-markup: 0.1.5(svelte@5.43.0)
+      vite: 7.1.12(@types/node@24.10.0)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)
       vite-imagetools: 8.0.0(rollup@4.52.5)
       zimmerframe: 1.1.4
     transitivePeerDependencies:
       - rollup
       - supports-color
 
-  '@sveltejs/kit@2.47.3(@opentelemetry/api@1.9.0)(@sveltejs/vite-plugin-svelte@6.2.1(svelte@5.41.3)(vite@7.1.12(@types/node@24.9.2)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)))(svelte@5.41.3)(vite@7.1.12(@types/node@24.9.2)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1))':
+  '@sveltejs/kit@2.48.3(@opentelemetry/api@1.9.0)(@sveltejs/vite-plugin-svelte@6.2.1(svelte@5.43.0)(vite@7.1.12(@types/node@24.10.0)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)))(svelte@5.43.0)(vite@7.1.12(@types/node@24.10.0)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1))':
     dependencies:
       '@standard-schema/spec': 1.0.0
       '@sveltejs/acorn-typescript': 1.0.6(acorn@8.15.0)
-      '@sveltejs/vite-plugin-svelte': 6.2.1(svelte@5.41.3)(vite@7.1.12(@types/node@24.9.2)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1))
+      '@sveltejs/vite-plugin-svelte': 6.2.1(svelte@5.43.0)(vite@7.1.12(@types/node@24.10.0)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1))
       '@types/cookie': 0.6.0
       acorn: 8.15.0
       cookie: 0.6.0
@@ -15893,29 +15896,29 @@ snapshots:
       sade: 1.8.1
       set-cookie-parser: 2.7.2
       sirv: 3.0.2
-      svelte: 5.41.3
-      vite: 7.1.12(@types/node@24.9.2)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)
+      svelte: 5.43.0
+      vite: 7.1.12(@types/node@24.10.0)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)
     optionalDependencies:
       '@opentelemetry/api': 1.9.0
 
-  '@sveltejs/vite-plugin-svelte-inspector@5.0.0(@sveltejs/vite-plugin-svelte@6.2.1(svelte@5.41.3)(vite@7.1.12(@types/node@24.9.2)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)))(svelte@5.41.3)(vite@7.1.12(@types/node@24.9.2)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1))':
+  '@sveltejs/vite-plugin-svelte-inspector@5.0.0(@sveltejs/vite-plugin-svelte@6.2.1(svelte@5.43.0)(vite@7.1.12(@types/node@24.10.0)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)))(svelte@5.43.0)(vite@7.1.12(@types/node@24.10.0)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1))':
     dependencies:
-      '@sveltejs/vite-plugin-svelte': 6.2.1(svelte@5.41.3)(vite@7.1.12(@types/node@24.9.2)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1))
+      '@sveltejs/vite-plugin-svelte': 6.2.1(svelte@5.43.0)(vite@7.1.12(@types/node@24.10.0)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1))
       debug: 4.4.3
-      svelte: 5.41.3
-      vite: 7.1.12(@types/node@24.9.2)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)
+      svelte: 5.43.0
+      vite: 7.1.12(@types/node@24.10.0)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)
     transitivePeerDependencies:
       - supports-color
 
-  '@sveltejs/vite-plugin-svelte@6.2.1(svelte@5.41.3)(vite@7.1.12(@types/node@24.9.2)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1))':
+  '@sveltejs/vite-plugin-svelte@6.2.1(svelte@5.43.0)(vite@7.1.12(@types/node@24.10.0)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1))':
     dependencies:
-      '@sveltejs/vite-plugin-svelte-inspector': 5.0.0(@sveltejs/vite-plugin-svelte@6.2.1(svelte@5.41.3)(vite@7.1.12(@types/node@24.9.2)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)))(svelte@5.41.3)(vite@7.1.12(@types/node@24.9.2)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1))
+      '@sveltejs/vite-plugin-svelte-inspector': 5.0.0(@sveltejs/vite-plugin-svelte@6.2.1(svelte@5.43.0)(vite@7.1.12(@types/node@24.10.0)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)))(svelte@5.43.0)(vite@7.1.12(@types/node@24.10.0)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1))
       debug: 4.4.3
       deepmerge: 4.3.1
       magic-string: 0.30.21
-      svelte: 5.41.3
-      vite: 7.1.12(@types/node@24.9.2)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)
-      vitefu: 1.1.1(vite@7.1.12(@types/node@24.9.2)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1))
+      svelte: 5.43.0
+      vite: 7.1.12(@types/node@24.10.0)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)
+      vitefu: 1.1.1(vite@7.1.12(@types/node@24.10.0)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1))
     transitivePeerDependencies:
       - supports-color
 
@@ -16012,51 +16015,51 @@ snapshots:
       - supports-color
       - typescript
 
-  '@swc/core-darwin-arm64@1.13.5':
+  '@swc/core-darwin-arm64@1.14.0':
     optional: true
 
-  '@swc/core-darwin-x64@1.13.5':
+  '@swc/core-darwin-x64@1.14.0':
     optional: true
 
-  '@swc/core-linux-arm-gnueabihf@1.13.5':
+  '@swc/core-linux-arm-gnueabihf@1.14.0':
     optional: true
 
-  '@swc/core-linux-arm64-gnu@1.13.5':
+  '@swc/core-linux-arm64-gnu@1.14.0':
     optional: true
 
-  '@swc/core-linux-arm64-musl@1.13.5':
+  '@swc/core-linux-arm64-musl@1.14.0':
     optional: true
 
-  '@swc/core-linux-x64-gnu@1.13.5':
+  '@swc/core-linux-x64-gnu@1.14.0':
     optional: true
 
-  '@swc/core-linux-x64-musl@1.13.5':
+  '@swc/core-linux-x64-musl@1.14.0':
     optional: true
 
-  '@swc/core-win32-arm64-msvc@1.13.5':
+  '@swc/core-win32-arm64-msvc@1.14.0':
     optional: true
 
-  '@swc/core-win32-ia32-msvc@1.13.5':
+  '@swc/core-win32-ia32-msvc@1.14.0':
     optional: true
 
-  '@swc/core-win32-x64-msvc@1.13.5':
+  '@swc/core-win32-x64-msvc@1.14.0':
     optional: true
 
-  '@swc/core@1.13.5(@swc/helpers@0.5.17)':
+  '@swc/core@1.14.0(@swc/helpers@0.5.17)':
     dependencies:
       '@swc/counter': 0.1.3
       '@swc/types': 0.1.25
     optionalDependencies:
-      '@swc/core-darwin-arm64': 1.13.5
-      '@swc/core-darwin-x64': 1.13.5
-      '@swc/core-linux-arm-gnueabihf': 1.13.5
-      '@swc/core-linux-arm64-gnu': 1.13.5
-      '@swc/core-linux-arm64-musl': 1.13.5
-      '@swc/core-linux-x64-gnu': 1.13.5
-      '@swc/core-linux-x64-musl': 1.13.5
-      '@swc/core-win32-arm64-msvc': 1.13.5
-      '@swc/core-win32-ia32-msvc': 1.13.5
-      '@swc/core-win32-x64-msvc': 1.13.5
+      '@swc/core-darwin-arm64': 1.14.0
+      '@swc/core-darwin-x64': 1.14.0
+      '@swc/core-linux-arm-gnueabihf': 1.14.0
+      '@swc/core-linux-arm64-gnu': 1.14.0
+      '@swc/core-linux-arm64-musl': 1.14.0
+      '@swc/core-linux-x64-gnu': 1.14.0
+      '@swc/core-linux-x64-musl': 1.14.0
+      '@swc/core-win32-arm64-msvc': 1.14.0
+      '@swc/core-win32-ia32-msvc': 1.14.0
+      '@swc/core-win32-x64-msvc': 1.14.0
       '@swc/helpers': 0.5.17
 
   '@swc/counter@0.1.3': {}
@@ -16134,12 +16137,12 @@ snapshots:
       '@tailwindcss/oxide-win32-arm64-msvc': 4.1.16
       '@tailwindcss/oxide-win32-x64-msvc': 4.1.16
 
-  '@tailwindcss/vite@4.1.16(vite@7.1.12(@types/node@24.9.2)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1))':
+  '@tailwindcss/vite@4.1.16(vite@7.1.12(@types/node@24.10.0)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1))':
     dependencies:
       '@tailwindcss/node': 4.1.16
       '@tailwindcss/oxide': 4.1.16
       tailwindcss: 4.1.16
-      vite: 7.1.12(@types/node@24.9.2)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)
+      vite: 7.1.12(@types/node@24.10.0)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)
 
   '@testing-library/dom@10.4.0':
     dependencies:
@@ -16161,13 +16164,13 @@ snapshots:
       picocolors: 1.1.1
       redent: 3.0.0
 
-  '@testing-library/svelte@5.2.8(svelte@5.41.3)(vite@7.1.12(@types/node@24.9.2)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1))(vitest@3.2.4(@types/debug@4.1.12)(@types/node@24.9.2)(happy-dom@20.0.8)(jiti@2.6.1)(jsdom@26.1.0(canvas@2.11.2))(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1))':
+  '@testing-library/svelte@5.2.8(svelte@5.43.0)(vite@7.1.12(@types/node@24.10.0)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1))(vitest@3.2.4(@types/debug@4.1.12)(@types/node@24.10.0)(happy-dom@20.0.10)(jiti@2.6.1)(jsdom@26.1.0(canvas@2.11.2))(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1))':
     dependencies:
       '@testing-library/dom': 10.4.0
-      svelte: 5.41.3
+      svelte: 5.43.0
     optionalDependencies:
-      vite: 7.1.12(@types/node@24.9.2)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)
-      vitest: 3.2.4(@types/debug@4.1.12)(@types/node@24.9.2)(happy-dom@20.0.8)(jiti@2.6.1)(jsdom@26.1.0(canvas@2.11.2))(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)
+      vite: 7.1.12(@types/node@24.10.0)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)
+      vitest: 3.2.4(@types/debug@4.1.12)(@types/node@24.10.0)(happy-dom@20.0.10)(jiti@2.6.1)(jsdom@26.1.0(canvas@2.11.2))(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)
 
   '@testing-library/user-event@14.6.1(@testing-library/dom@10.4.0)':
     dependencies:
@@ -16209,7 +16212,7 @@ snapshots:
 
   '@types/accepts@1.3.7':
     dependencies:
-      '@types/node': 22.18.13
+      '@types/node': 22.19.0
 
   '@types/archiver@6.0.4':
     dependencies:
@@ -16221,16 +16224,16 @@ snapshots:
 
   '@types/bcrypt@6.0.0':
     dependencies:
-      '@types/node': 22.18.13
+      '@types/node': 22.19.0
 
   '@types/body-parser@1.19.6':
     dependencies:
       '@types/connect': 3.4.38
-      '@types/node': 22.18.13
+      '@types/node': 22.19.0
 
   '@types/bonjour@3.5.13':
     dependencies:
-      '@types/node': 22.18.13
+      '@types/node': 22.19.0
 
   '@types/braces@3.0.5': {}
 
@@ -16251,21 +16254,21 @@ snapshots:
 
   '@types/cli-progress@3.11.6':
     dependencies:
-      '@types/node': 22.18.13
+      '@types/node': 22.19.0
 
   '@types/compression@1.8.1':
     dependencies:
       '@types/express': 5.0.5
-      '@types/node': 22.18.13
+      '@types/node': 22.19.0
 
   '@types/connect-history-api-fallback@1.5.4':
     dependencies:
       '@types/express-serve-static-core': 5.1.0
-      '@types/node': 22.18.13
+      '@types/node': 22.19.0
 
   '@types/connect@3.4.38':
     dependencies:
-      '@types/node': 22.18.13
+      '@types/node': 22.19.0
 
   '@types/content-disposition@0.5.9': {}
 
@@ -16282,11 +16285,11 @@ snapshots:
       '@types/connect': 3.4.38
       '@types/express': 5.0.5
       '@types/keygrip': 1.0.6
-      '@types/node': 22.18.13
+      '@types/node': 22.19.0
 
   '@types/cors@2.8.19':
     dependencies:
-      '@types/node': 22.18.13
+      '@types/node': 22.19.0
 
   '@types/debug@4.1.12':
     dependencies:
@@ -16296,13 +16299,13 @@ snapshots:
 
   '@types/docker-modem@3.0.6':
     dependencies:
-      '@types/node': 22.18.13
+      '@types/node': 22.19.0
       '@types/ssh2': 1.15.5
 
   '@types/dockerode@3.3.45':
     dependencies:
       '@types/docker-modem': 3.0.6
-      '@types/node': 22.18.13
+      '@types/node': 22.19.0
       '@types/ssh2': 1.15.5
 
   '@types/dom-to-image@2.6.7': {}
@@ -16325,14 +16328,14 @@ snapshots:
 
   '@types/express-serve-static-core@4.19.7':
     dependencies:
-      '@types/node': 22.18.13
+      '@types/node': 22.19.0
       '@types/qs': 6.14.0
       '@types/range-parser': 1.2.7
       '@types/send': 1.2.1
 
   '@types/express-serve-static-core@5.1.0':
     dependencies:
-      '@types/node': 22.18.13
+      '@types/node': 22.19.0
       '@types/qs': 6.14.0
       '@types/range-parser': 1.2.7
       '@types/send': 1.2.1
@@ -16358,7 +16361,7 @@ snapshots:
 
   '@types/fluent-ffmpeg@2.1.28':
     dependencies:
-      '@types/node': 22.18.13
+      '@types/node': 22.19.0
 
   '@types/geojson-vt@3.2.5':
     dependencies:
@@ -16390,7 +16393,7 @@ snapshots:
 
   '@types/http-proxy@1.17.17':
     dependencies:
-      '@types/node': 22.18.13
+      '@types/node': 22.19.0
 
   '@types/inquirer@8.2.11':
     dependencies:
@@ -16428,7 +16431,7 @@ snapshots:
       '@types/http-errors': 2.0.5
       '@types/keygrip': 1.0.6
       '@types/koa-compose': 3.2.8
-      '@types/node': 22.18.13
+      '@types/node': 22.19.0
 
   '@types/leaflet@1.9.21':
     dependencies:
@@ -16458,7 +16461,7 @@ snapshots:
 
   '@types/mock-fs@4.13.4':
     dependencies:
-      '@types/node': 22.18.13
+      '@types/node': 22.19.0
 
   '@types/ms@2.1.0': {}
 
@@ -16468,7 +16471,7 @@ snapshots:
 
   '@types/node-forge@1.3.14':
     dependencies:
-      '@types/node': 22.18.13
+      '@types/node': 22.19.0
 
   '@types/node@17.0.45': {}
 
@@ -16480,11 +16483,11 @@ snapshots:
     dependencies:
       undici-types: 6.21.0
 
-  '@types/node@22.18.13':
+  '@types/node@22.19.0':
     dependencies:
       undici-types: 6.21.0
 
-  '@types/node@24.9.2':
+  '@types/node@24.10.0':
     dependencies:
       undici-types: 7.16.0
     optional: true
@@ -16492,7 +16495,7 @@ snapshots:
   '@types/nodemailer@7.0.3':
     dependencies:
       '@aws-sdk/client-sesv2': 3.919.0
-      '@types/node': 22.18.13
+      '@types/node': 22.19.0
     transitivePeerDependencies:
       - aws-crt
 
@@ -16500,17 +16503,23 @@ snapshots:
     dependencies:
       '@types/keygrip': 1.0.6
       '@types/koa': 3.0.0
-      '@types/node': 22.18.13
+      '@types/node': 22.19.0
 
   '@types/parse5@5.0.3': {}
 
   '@types/pg-pool@2.0.6':
     dependencies:
-      '@types/pg': 8.15.5
+      '@types/pg': 8.15.6
 
   '@types/pg@8.15.5':
     dependencies:
-      '@types/node': 22.18.13
+      '@types/node': 22.19.0
+      pg-protocol: 1.10.3
+      pg-types: 2.2.0
+
+  '@types/pg@8.15.6':
+    dependencies:
+      '@types/node': 22.19.0
       pg-protocol: 1.10.3
       pg-types: 2.2.0
 
@@ -16518,13 +16527,13 @@ snapshots:
 
   '@types/pngjs@6.0.5':
     dependencies:
-      '@types/node': 22.18.13
+      '@types/node': 22.19.0
 
   '@types/prismjs@1.26.5': {}
 
   '@types/qrcode@1.5.6':
     dependencies:
-      '@types/node': 22.18.13
+      '@types/node': 22.19.0
 
   '@types/qs@6.14.0': {}
 
@@ -16553,7 +16562,7 @@ snapshots:
 
   '@types/readdir-glob@1.1.5':
     dependencies:
-      '@types/node': 22.18.13
+      '@types/node': 22.19.0
 
   '@types/retry@0.12.2': {}
 
@@ -16563,18 +16572,18 @@ snapshots:
 
   '@types/sax@1.2.7':
     dependencies:
-      '@types/node': 22.18.13
+      '@types/node': 22.19.0
 
   '@types/semver@7.7.1': {}
 
   '@types/send@0.17.6':
     dependencies:
       '@types/mime': 1.3.5
-      '@types/node': 22.18.13
+      '@types/node': 22.19.0
 
   '@types/send@1.2.1':
     dependencies:
-      '@types/node': 22.18.13
+      '@types/node': 22.19.0
 
   '@types/serve-index@1.9.4':
     dependencies:
@@ -16583,20 +16592,20 @@ snapshots:
   '@types/serve-static@1.15.10':
     dependencies:
       '@types/http-errors': 2.0.5
-      '@types/node': 22.18.13
+      '@types/node': 22.19.0
       '@types/send': 0.17.6
 
   '@types/sockjs@0.3.36':
     dependencies:
-      '@types/node': 22.18.13
+      '@types/node': 22.19.0
 
   '@types/ssh2-streams@0.1.13':
     dependencies:
-      '@types/node': 22.18.13
+      '@types/node': 22.19.0
 
   '@types/ssh2@0.5.52':
     dependencies:
-      '@types/node': 22.18.13
+      '@types/node': 22.19.0
       '@types/ssh2-streams': 0.1.13
 
   '@types/ssh2@1.15.5':
@@ -16607,7 +16616,7 @@ snapshots:
     dependencies:
       '@types/cookiejar': 2.1.5
       '@types/methods': 1.1.4
-      '@types/node': 22.18.13
+      '@types/node': 22.19.0
       form-data: 4.0.4
 
   '@types/supercluster@7.1.3':
@@ -16621,7 +16630,7 @@ snapshots:
 
   '@types/through@0.0.33':
     dependencies:
-      '@types/node': 22.18.13
+      '@types/node': 22.19.0
 
   '@types/ua-parser-js@0.7.39': {}
 
@@ -16629,13 +16638,13 @@ snapshots:
 
   '@types/unist@3.0.3': {}
 
-  '@types/validator@13.15.3': {}
+  '@types/validator@13.15.4': {}
 
   '@types/whatwg-mimetype@3.0.2': {}
 
   '@types/ws@8.18.1':
     dependencies:
-      '@types/node': 22.18.13
+      '@types/node': 22.19.0
 
   '@types/yargs-parser@21.0.3': {}
 
@@ -16740,7 +16749,7 @@ snapshots:
 
   '@vercel/oidc@3.0.3': {}
 
-  '@vitest/coverage-v8@3.2.4(vitest@3.2.4(@types/debug@4.1.12)(@types/node@22.18.13)(happy-dom@20.0.8)(jiti@2.6.1)(jsdom@26.1.0(canvas@2.11.2))(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1))':
+  '@vitest/coverage-v8@3.2.4(vitest@3.2.4(@types/debug@4.1.12)(@types/node@22.19.0)(happy-dom@20.0.10)(jiti@2.6.1)(jsdom@26.1.0(canvas@2.11.2))(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1))':
     dependencies:
       '@ampproject/remapping': 2.3.0
       '@bcoe/v8-coverage': 1.0.2
@@ -16755,11 +16764,11 @@ snapshots:
       std-env: 3.10.0
       test-exclude: 7.0.1
       tinyrainbow: 2.0.0
-      vitest: 3.2.4(@types/debug@4.1.12)(@types/node@22.18.13)(happy-dom@20.0.8)(jiti@2.6.1)(jsdom@26.1.0(canvas@2.11.2))(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)
+      vitest: 3.2.4(@types/debug@4.1.12)(@types/node@22.19.0)(happy-dom@20.0.10)(jiti@2.6.1)(jsdom@26.1.0(canvas@2.11.2))(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)
     transitivePeerDependencies:
       - supports-color
 
-  '@vitest/coverage-v8@3.2.4(vitest@3.2.4(@types/debug@4.1.12)(@types/node@24.9.2)(happy-dom@20.0.8)(jiti@2.6.1)(jsdom@26.1.0(canvas@2.11.2))(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1))':
+  '@vitest/coverage-v8@3.2.4(vitest@3.2.4(@types/debug@4.1.12)(@types/node@24.10.0)(happy-dom@20.0.10)(jiti@2.6.1)(jsdom@26.1.0(canvas@2.11.2))(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1))':
     dependencies:
       '@ampproject/remapping': 2.3.0
       '@bcoe/v8-coverage': 1.0.2
@@ -16774,7 +16783,7 @@ snapshots:
       std-env: 3.10.0
       test-exclude: 7.0.1
       tinyrainbow: 2.0.0
-      vitest: 3.2.4(@types/debug@4.1.12)(@types/node@24.9.2)(happy-dom@20.0.8)(jiti@2.6.1)(jsdom@26.1.0(canvas@2.11.2))(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)
+      vitest: 3.2.4(@types/debug@4.1.12)(@types/node@24.10.0)(happy-dom@20.0.10)(jiti@2.6.1)(jsdom@26.1.0(canvas@2.11.2))(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -16786,21 +16795,21 @@ snapshots:
       chai: 5.2.0
       tinyrainbow: 2.0.0
 
-  '@vitest/mocker@3.2.4(vite@7.1.12(@types/node@22.18.13)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1))':
+  '@vitest/mocker@3.2.4(vite@7.1.12(@types/node@22.19.0)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1))':
     dependencies:
       '@vitest/spy': 3.2.4
       estree-walker: 3.0.3
       magic-string: 0.30.21
     optionalDependencies:
-      vite: 7.1.12(@types/node@22.18.13)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)
+      vite: 7.1.12(@types/node@22.19.0)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)
 
-  '@vitest/mocker@3.2.4(vite@7.1.12(@types/node@24.9.2)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1))':
+  '@vitest/mocker@3.2.4(vite@7.1.12(@types/node@24.10.0)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1))':
     dependencies:
       '@vitest/spy': 3.2.4
       estree-walker: 3.0.3
       magic-string: 0.30.21
     optionalDependencies:
-      vite: 7.1.12(@types/node@24.9.2)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)
+      vite: 7.1.12(@types/node@24.10.0)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)
 
   '@vitest/pretty-format@3.2.4':
     dependencies:
@@ -16912,10 +16921,10 @@ snapshots:
     dependencies:
       '@namnode/store': 0.1.0
 
-  '@zoom-image/svelte@0.3.7(svelte@5.41.3)':
+  '@zoom-image/svelte@0.3.7(svelte@5.43.0)':
     dependencies:
       '@zoom-image/core': 0.41.3
-      svelte: 5.41.3
+      svelte: 5.43.0
 
   abab@2.0.6:
     optional: true
@@ -17275,15 +17284,15 @@ snapshots:
 
   binary-extensions@2.3.0: {}
 
-  bits-ui@2.9.8(@internationalized/date@3.8.2)(svelte@5.41.3):
+  bits-ui@2.9.8(@internationalized/date@3.8.2)(svelte@5.43.0):
     dependencies:
       '@floating-ui/core': 1.7.3
       '@floating-ui/dom': 1.7.4
       '@internationalized/date': 3.8.2
       esm-env: 1.2.2
-      runed: 0.29.2(svelte@5.41.3)
-      svelte: 5.41.3
-      svelte-toolbelt: 0.9.3(svelte@5.41.3)
+      runed: 0.29.2(svelte@5.43.0)
+      svelte: 5.43.0
+      svelte-toolbelt: 0.9.3(svelte@5.43.0)
       tabbable: 6.3.0
 
   bl@4.1.0:
@@ -17394,7 +17403,7 @@ snapshots:
 
   builtin-modules@5.0.0: {}
 
-  bullmq@5.61.2:
+  bullmq@5.62.1:
     dependencies:
       cron-parser: 4.9.0
       ioredis: 5.8.2
@@ -17602,7 +17611,7 @@ snapshots:
 
   class-validator@0.14.2:
     dependencies:
-      '@types/validator': 13.15.3
+      '@types/validator': 13.15.4
       libphonenumber-js: 1.12.9
       validator: 13.15.15
 
@@ -18375,7 +18384,7 @@ snapshots:
   engine.io@6.6.4:
     dependencies:
       '@types/cors': 2.8.19
-      '@types/node': 22.18.13
+      '@types/node': 22.19.0
       accepts: 1.3.8
       base64id: 2.0.0
       cookie: 0.7.2
@@ -18489,34 +18498,34 @@ snapshots:
       '@esbuild/win32-ia32': 0.19.12
       '@esbuild/win32-x64': 0.19.12
 
-  esbuild@0.25.11:
+  esbuild@0.25.12:
     optionalDependencies:
-      '@esbuild/aix-ppc64': 0.25.11
-      '@esbuild/android-arm': 0.25.11
-      '@esbuild/android-arm64': 0.25.11
-      '@esbuild/android-x64': 0.25.11
-      '@esbuild/darwin-arm64': 0.25.11
-      '@esbuild/darwin-x64': 0.25.11
-      '@esbuild/freebsd-arm64': 0.25.11
-      '@esbuild/freebsd-x64': 0.25.11
-      '@esbuild/linux-arm': 0.25.11
-      '@esbuild/linux-arm64': 0.25.11
-      '@esbuild/linux-ia32': 0.25.11
-      '@esbuild/linux-loong64': 0.25.11
-      '@esbuild/linux-mips64el': 0.25.11
-      '@esbuild/linux-ppc64': 0.25.11
-      '@esbuild/linux-riscv64': 0.25.11
-      '@esbuild/linux-s390x': 0.25.11
-      '@esbuild/linux-x64': 0.25.11
-      '@esbuild/netbsd-arm64': 0.25.11
-      '@esbuild/netbsd-x64': 0.25.11
-      '@esbuild/openbsd-arm64': 0.25.11
-      '@esbuild/openbsd-x64': 0.25.11
-      '@esbuild/openharmony-arm64': 0.25.11
-      '@esbuild/sunos-x64': 0.25.11
-      '@esbuild/win32-arm64': 0.25.11
-      '@esbuild/win32-ia32': 0.25.11
-      '@esbuild/win32-x64': 0.25.11
+      '@esbuild/aix-ppc64': 0.25.12
+      '@esbuild/android-arm': 0.25.12
+      '@esbuild/android-arm64': 0.25.12
+      '@esbuild/android-x64': 0.25.12
+      '@esbuild/darwin-arm64': 0.25.12
+      '@esbuild/darwin-x64': 0.25.12
+      '@esbuild/freebsd-arm64': 0.25.12
+      '@esbuild/freebsd-x64': 0.25.12
+      '@esbuild/linux-arm': 0.25.12
+      '@esbuild/linux-arm64': 0.25.12
+      '@esbuild/linux-ia32': 0.25.12
+      '@esbuild/linux-loong64': 0.25.12
+      '@esbuild/linux-mips64el': 0.25.12
+      '@esbuild/linux-ppc64': 0.25.12
+      '@esbuild/linux-riscv64': 0.25.12
+      '@esbuild/linux-s390x': 0.25.12
+      '@esbuild/linux-x64': 0.25.12
+      '@esbuild/netbsd-arm64': 0.25.12
+      '@esbuild/netbsd-x64': 0.25.12
+      '@esbuild/openbsd-arm64': 0.25.12
+      '@esbuild/openbsd-x64': 0.25.12
+      '@esbuild/openharmony-arm64': 0.25.12
+      '@esbuild/sunos-x64': 0.25.12
+      '@esbuild/win32-arm64': 0.25.12
+      '@esbuild/win32-ia32': 0.25.12
+      '@esbuild/win32-x64': 0.25.12
 
   escalade@3.2.0: {}
 
@@ -18565,7 +18574,7 @@ snapshots:
       '@types/eslint': 9.6.1
       eslint-config-prettier: 10.1.8(eslint@9.38.0(jiti@2.6.1))
 
-  eslint-plugin-svelte@3.12.5(eslint@9.38.0(jiti@2.6.1))(svelte@5.41.3):
+  eslint-plugin-svelte@3.12.5(eslint@9.38.0(jiti@2.6.1))(svelte@5.43.0):
     dependencies:
       '@eslint-community/eslint-utils': 4.9.0(eslint@9.38.0(jiti@2.6.1))
       '@jridgewell/sourcemap-codec': 1.5.5
@@ -18577,9 +18586,9 @@ snapshots:
       postcss-load-config: 3.1.4(postcss@8.5.6)
       postcss-safe-parser: 7.0.1(postcss@8.5.6)
       semver: 7.7.3
-      svelte-eslint-parser: 1.4.0(svelte@5.41.3)
+      svelte-eslint-parser: 1.4.0(svelte@5.43.0)
     optionalDependencies:
-      svelte: 5.41.3
+      svelte: 5.43.0
     transitivePeerDependencies:
       - ts-node
 
@@ -18764,7 +18773,7 @@ snapshots:
 
   eval@0.1.8:
     dependencies:
-      '@types/node': 22.18.13
+      '@types/node': 22.19.0
       require-like: 0.1.2
 
   event-emitter@0.3.5:
@@ -19060,7 +19069,7 @@ snapshots:
       cross-spawn: 7.0.6
       signal-exit: 4.1.0
 
-  fork-ts-checker-webpack-plugin@9.1.0(typescript@5.8.3)(webpack@5.100.2(@swc/core@1.13.5(@swc/helpers@0.5.17))):
+  fork-ts-checker-webpack-plugin@9.1.0(typescript@5.8.3)(webpack@5.100.2(@swc/core@1.14.0(@swc/helpers@0.5.17))):
     dependencies:
       '@babel/code-frame': 7.27.1
       chalk: 4.1.2
@@ -19075,7 +19084,7 @@ snapshots:
       semver: 7.7.3
       tapable: 2.3.0
       typescript: 5.8.3
-      webpack: 5.100.2(@swc/core@1.13.5(@swc/helpers@0.5.17))
+      webpack: 5.100.2(@swc/core@1.14.0(@swc/helpers@0.5.17))
 
   form-data-encoder@2.1.4: {}
 
@@ -19324,7 +19333,7 @@ snapshots:
     optionalDependencies:
       uglify-js: 3.19.3
 
-  happy-dom@20.0.8:
+  happy-dom@20.0.10:
     dependencies:
       '@types/node': 20.19.24
       '@types/whatwg-mimetype': 3.0.2
@@ -19753,9 +19762,9 @@ snapshots:
 
   inline-style-parser@0.2.4: {}
 
-  inquirer@8.2.7(@types/node@22.18.13):
+  inquirer@8.2.7(@types/node@22.19.0):
     dependencies:
-      '@inquirer/external-editor': 1.0.2(@types/node@22.18.13)
+      '@inquirer/external-editor': 1.0.2(@types/node@22.19.0)
       ansi-escapes: 4.3.2
       chalk: 4.1.2
       cli-cursor: 3.1.0
@@ -19969,7 +19978,7 @@ snapshots:
   jest-util@29.7.0:
     dependencies:
       '@jest/types': 29.6.3
-      '@types/node': 22.18.13
+      '@types/node': 22.19.0
       chalk: 4.1.2
       ci-info: 3.9.0
       graceful-fs: 4.2.11
@@ -19977,13 +19986,13 @@ snapshots:
 
   jest-worker@27.5.1:
     dependencies:
-      '@types/node': 22.18.13
+      '@types/node': 22.19.0
       merge-stream: 2.0.0
       supports-color: 8.1.1
 
   jest-worker@29.7.0:
     dependencies:
-      '@types/node': 22.18.13
+      '@types/node': 22.19.0
       jest-util: 29.7.0
       merge-stream: 2.0.0
       supports-color: 8.1.1
@@ -20435,7 +20444,7 @@ snapshots:
       tinyqueue: 2.0.3
       vt-pbf: 3.1.3
 
-  maplibre-gl@5.9.0:
+  maplibre-gl@5.10.0:
     dependencies:
       '@mapbox/geojson-rewind': 0.5.2
       '@mapbox/jsonlint-lines-primitives': 2.0.2
@@ -20444,7 +20453,7 @@ snapshots:
       '@mapbox/unitbezier': 0.0.1
       '@mapbox/vector-tile': 2.0.4
       '@mapbox/whoots-js': 3.1.0
-      '@maplibre/maplibre-gl-style-spec': 24.3.0
+      '@maplibre/maplibre-gl-style-spec': 24.3.1
       '@maplibre/vt-pbf': 4.0.3
       '@types/geojson': 7946.0.16
       '@types/geojson-vt': 3.2.5
@@ -21203,39 +21212,39 @@ snapshots:
 
   neo-async@2.6.2: {}
 
-  nest-commander@3.20.1(@nestjs/common@11.1.7(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.7)(@types/inquirer@8.2.11)(@types/node@22.18.13)(typescript@5.9.3):
+  nest-commander@3.20.1(@nestjs/common@11.1.8(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.8)(@types/inquirer@8.2.11)(@types/node@22.19.0)(typescript@5.9.3):
     dependencies:
       '@fig/complete-commander': 3.2.0(commander@11.1.0)
-      '@golevelup/nestjs-discovery': 5.0.0(@nestjs/common@11.1.7(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.7)
-      '@nestjs/common': 11.1.7(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2)
-      '@nestjs/core': 11.1.7(@nestjs/common@11.1.7(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/platform-express@11.1.7)(@nestjs/websockets@11.1.7)(reflect-metadata@0.2.2)(rxjs@7.8.2)
+      '@golevelup/nestjs-discovery': 5.0.0(@nestjs/common@11.1.8(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.8)
+      '@nestjs/common': 11.1.8(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2)
+      '@nestjs/core': 11.1.8(@nestjs/common@11.1.8(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/platform-express@11.1.8)(@nestjs/websockets@11.1.8)(reflect-metadata@0.2.2)(rxjs@7.8.2)
       '@types/inquirer': 8.2.11
       commander: 11.1.0
       cosmiconfig: 8.3.6(typescript@5.9.3)
-      inquirer: 8.2.7(@types/node@22.18.13)
+      inquirer: 8.2.7(@types/node@22.19.0)
     transitivePeerDependencies:
       - '@types/node'
       - typescript
 
-  nestjs-cls@5.4.3(@nestjs/common@11.1.7(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.7)(reflect-metadata@0.2.2)(rxjs@7.8.2):
+  nestjs-cls@5.4.3(@nestjs/common@11.1.8(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.8)(reflect-metadata@0.2.2)(rxjs@7.8.2):
     dependencies:
-      '@nestjs/common': 11.1.7(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2)
-      '@nestjs/core': 11.1.7(@nestjs/common@11.1.7(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/platform-express@11.1.7)(@nestjs/websockets@11.1.7)(reflect-metadata@0.2.2)(rxjs@7.8.2)
+      '@nestjs/common': 11.1.8(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2)
+      '@nestjs/core': 11.1.8(@nestjs/common@11.1.8(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/platform-express@11.1.8)(@nestjs/websockets@11.1.8)(reflect-metadata@0.2.2)(rxjs@7.8.2)
       reflect-metadata: 0.2.2
       rxjs: 7.8.2
 
-  nestjs-kysely@3.1.2(@nestjs/common@11.1.7(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.7)(kysely@0.28.2)(reflect-metadata@0.2.2):
+  nestjs-kysely@3.1.2(@nestjs/common@11.1.8(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.8)(kysely@0.28.2)(reflect-metadata@0.2.2):
     dependencies:
-      '@nestjs/common': 11.1.7(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2)
-      '@nestjs/core': 11.1.7(@nestjs/common@11.1.7(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/platform-express@11.1.7)(@nestjs/websockets@11.1.7)(reflect-metadata@0.2.2)(rxjs@7.8.2)
+      '@nestjs/common': 11.1.8(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2)
+      '@nestjs/core': 11.1.8(@nestjs/common@11.1.8(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/platform-express@11.1.8)(@nestjs/websockets@11.1.8)(reflect-metadata@0.2.2)(rxjs@7.8.2)
       kysely: 0.28.2
       reflect-metadata: 0.2.2
       tslib: 2.8.1
 
-  nestjs-otel@7.0.1(@nestjs/common@11.1.7(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.7):
+  nestjs-otel@7.0.1(@nestjs/common@11.1.8(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/core@11.1.8):
     dependencies:
-      '@nestjs/common': 11.1.7(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2)
-      '@nestjs/core': 11.1.7(@nestjs/common@11.1.7(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/platform-express@11.1.7)(@nestjs/websockets@11.1.7)(reflect-metadata@0.2.2)(rxjs@7.8.2)
+      '@nestjs/common': 11.1.8(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2)
+      '@nestjs/core': 11.1.8(@nestjs/common@11.1.8(class-transformer@0.5.1)(class-validator@0.14.2)(reflect-metadata@0.2.2)(rxjs@7.8.2))(@nestjs/platform-express@11.1.8)(@nestjs/websockets@11.1.8)(reflect-metadata@0.2.2)(rxjs@7.8.2)
       '@opentelemetry/api': 1.9.0
       '@opentelemetry/host-metrics': 0.36.0(@opentelemetry/api@1.9.0)
       response-time: 2.3.4
@@ -22228,10 +22237,10 @@ snapshots:
     dependencies:
       prettier: 3.6.2
 
-  prettier-plugin-svelte@3.4.0(prettier@3.6.2)(svelte@5.41.3):
+  prettier-plugin-svelte@3.4.0(prettier@3.6.2)(svelte@5.43.0):
     dependencies:
       prettier: 3.6.2
-      svelte: 5.41.3
+      svelte: 5.43.0
 
   prettier@3.6.2: {}
 
@@ -22310,7 +22319,7 @@ snapshots:
       '@protobufjs/path': 1.1.2
       '@protobufjs/pool': 1.1.0
       '@protobufjs/utf8': 1.1.0
-      '@types/node': 22.18.13
+      '@types/node': 22.19.0
       long: 5.3.2
 
   protocol-buffers-schema@3.6.0: {}
@@ -22418,14 +22427,14 @@ snapshots:
       react: 19.2.0
       scheduler: 0.27.0
 
-  react-email@4.3.1:
+  react-email@4.3.2:
     dependencies:
       '@babel/parser': 7.28.5
       '@babel/traverse': 7.28.5
       chokidar: 4.0.3
       commander: 13.1.0
       debounce: 2.2.0
-      esbuild: 0.25.11
+      esbuild: 0.25.12
       glob: 11.0.3
       jiti: 2.4.2
       log-symbols: 7.0.1
@@ -22841,10 +22850,10 @@ snapshots:
     dependencies:
       queue-microtask: 1.2.3
 
-  runed@0.29.2(svelte@5.41.3):
+  runed@0.29.2(svelte@5.43.0):
     dependencies:
       esm-env: 1.2.2
-      svelte: 5.41.3
+      svelte: 5.43.0
 
   rw@1.3.3: {}
 
@@ -23128,7 +23137,7 @@ snapshots:
       simple-concat: 1.0.1
     optional: true
 
-  simple-icons@15.17.0: {}
+  simple-icons@15.18.0: {}
 
   sirv@2.0.4:
     dependencies:
@@ -23460,19 +23469,19 @@ snapshots:
 
   supports-preserve-symlinks-flag@1.0.0: {}
 
-  svelte-check@4.3.3(picomatch@4.0.3)(svelte@5.41.3)(typescript@5.9.3):
+  svelte-check@4.3.3(picomatch@4.0.3)(svelte@5.43.0)(typescript@5.9.3):
     dependencies:
       '@jridgewell/trace-mapping': 0.3.31
       chokidar: 4.0.3
       fdir: 6.5.0(picomatch@4.0.3)
       picocolors: 1.1.1
       sade: 1.8.1
-      svelte: 5.41.3
+      svelte: 5.43.0
       typescript: 5.9.3
     transitivePeerDependencies:
       - picomatch
 
-  svelte-eslint-parser@1.4.0(svelte@5.41.3):
+  svelte-eslint-parser@1.4.0(svelte@5.43.0):
     dependencies:
       eslint-scope: 8.4.0
       eslint-visitor-keys: 4.2.1
@@ -23481,7 +23490,7 @@ snapshots:
       postcss-scss: 4.0.9(postcss@8.5.6)
       postcss-selector-parser: 7.1.0
     optionalDependencies:
-      svelte: 5.41.3
+      svelte: 5.43.0
 
   svelte-gestures@5.2.2: {}
 
@@ -23489,7 +23498,7 @@ snapshots:
     dependencies:
       highlight.js: 11.11.1
 
-  svelte-i18n@4.0.1(svelte@5.41.3):
+  svelte-i18n@4.0.1(svelte@5.43.0):
     dependencies:
       cli-color: 2.0.4
       deepmerge: 4.3.1
@@ -23497,34 +23506,34 @@ snapshots:
       estree-walker: 2.0.2
       intl-messageformat: 10.7.18
       sade: 1.8.1
-      svelte: 5.41.3
+      svelte: 5.43.0
       tiny-glob: 0.2.9
 
-  svelte-maplibre@1.2.3(svelte@5.41.3):
+  svelte-maplibre@1.2.5(svelte@5.43.0):
     dependencies:
       d3-geo: 3.1.1
       dequal: 2.0.3
       just-compare: 2.3.0
-      maplibre-gl: 5.9.0
+      maplibre-gl: 5.10.0
       pmtiles: 3.2.1
-      svelte: 5.41.3
+      svelte: 5.43.0
 
-  svelte-parse-markup@0.1.5(svelte@5.41.3):
+  svelte-parse-markup@0.1.5(svelte@5.43.0):
     dependencies:
-      svelte: 5.41.3
+      svelte: 5.43.0
 
-  svelte-persisted-store@0.12.0(svelte@5.41.3):
+  svelte-persisted-store@0.12.0(svelte@5.43.0):
     dependencies:
-      svelte: 5.41.3
+      svelte: 5.43.0
 
-  svelte-toolbelt@0.9.3(svelte@5.41.3):
+  svelte-toolbelt@0.9.3(svelte@5.43.0):
     dependencies:
       clsx: 2.1.1
-      runed: 0.29.2(svelte@5.41.3)
+      runed: 0.29.2(svelte@5.43.0)
       style-to-object: 1.0.11
-      svelte: 5.41.3
+      svelte: 5.43.0
 
-  svelte@5.41.3:
+  svelte@5.43.0:
     dependencies:
       '@jridgewell/remapping': 2.3.5
       '@jridgewell/sourcemap-codec': 1.5.5
@@ -23681,16 +23690,16 @@ snapshots:
       minizlib: 3.1.0
       yallist: 5.0.0
 
-  terser-webpack-plugin@5.3.14(@swc/core@1.13.5(@swc/helpers@0.5.17))(webpack@5.100.2(@swc/core@1.13.5(@swc/helpers@0.5.17))):
+  terser-webpack-plugin@5.3.14(@swc/core@1.14.0(@swc/helpers@0.5.17))(webpack@5.100.2(@swc/core@1.14.0(@swc/helpers@0.5.17))):
     dependencies:
       '@jridgewell/trace-mapping': 0.3.31
       jest-worker: 27.5.1
       schema-utils: 4.3.3
       serialize-javascript: 6.0.2
       terser: 5.44.0
-      webpack: 5.100.2(@swc/core@1.13.5(@swc/helpers@0.5.17))
+      webpack: 5.100.2(@swc/core@1.14.0(@swc/helpers@0.5.17))
     optionalDependencies:
-      '@swc/core': 1.13.5(@swc/helpers@0.5.17)
+      '@swc/core': 1.14.0(@swc/helpers@0.5.17)
 
   terser-webpack-plugin@5.3.14(webpack@5.102.1):
     dependencies:
@@ -24070,10 +24079,10 @@ snapshots:
 
   unpipe@1.0.0: {}
 
-  unplugin-swc@1.5.8(@swc/core@1.13.5(@swc/helpers@0.5.17))(rollup@4.52.5):
+  unplugin-swc@1.5.8(@swc/core@1.14.0(@swc/helpers@0.5.17))(rollup@4.52.5):
     dependencies:
       '@rollup/pluginutils': 5.3.0(rollup@4.52.5)
-      '@swc/core': 1.13.5(@swc/helpers@0.5.17)
+      '@swc/core': 1.14.0(@swc/helpers@0.5.17)
       load-tsconfig: 0.2.5
       unplugin: 2.3.10
     transitivePeerDependencies:
@@ -24205,13 +24214,13 @@ snapshots:
       - rollup
       - supports-color
 
-  vite-node@3.2.4(@types/node@22.18.13)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1):
+  vite-node@3.2.4(@types/node@22.19.0)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1):
     dependencies:
       cac: 6.7.14
       debug: 4.4.3
       es-module-lexer: 1.7.0
       pathe: 2.0.3
-      vite: 7.1.12(@types/node@22.18.13)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)
+      vite: 7.1.12(@types/node@22.19.0)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)
     transitivePeerDependencies:
       - '@types/node'
       - jiti
@@ -24226,13 +24235,13 @@ snapshots:
       - tsx
       - yaml
 
-  vite-node@3.2.4(@types/node@24.9.2)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1):
+  vite-node@3.2.4(@types/node@24.10.0)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1):
     dependencies:
       cac: 6.7.14
       debug: 4.4.3
       es-module-lexer: 1.7.0
       pathe: 2.0.3
-      vite: 7.1.12(@types/node@24.9.2)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)
+      vite: 7.1.12(@types/node@24.10.0)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)
     transitivePeerDependencies:
       - '@types/node'
       - jiti
@@ -24247,62 +24256,62 @@ snapshots:
       - tsx
       - yaml
 
-  vite-tsconfig-paths@5.1.4(typescript@5.9.3)(vite@7.1.12(@types/node@22.18.13)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)):
+  vite-tsconfig-paths@5.1.4(typescript@5.9.3)(vite@7.1.12(@types/node@22.19.0)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)):
     dependencies:
       debug: 4.4.3
       globrex: 0.1.2
       tsconfck: 3.1.6(typescript@5.9.3)
     optionalDependencies:
-      vite: 7.1.12(@types/node@22.18.13)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)
+      vite: 7.1.12(@types/node@22.19.0)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)
     transitivePeerDependencies:
       - supports-color
       - typescript
 
-  vite@7.1.12(@types/node@22.18.13)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1):
+  vite@7.1.12(@types/node@22.19.0)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1):
     dependencies:
-      esbuild: 0.25.11
+      esbuild: 0.25.12
       fdir: 6.5.0(picomatch@4.0.3)
       picomatch: 4.0.3
       postcss: 8.5.6
       rollup: 4.52.5
       tinyglobby: 0.2.15
     optionalDependencies:
-      '@types/node': 22.18.13
+      '@types/node': 22.19.0
       fsevents: 2.3.3
       jiti: 2.6.1
       lightningcss: 1.30.2
       terser: 5.44.0
       yaml: 2.8.1
 
-  vite@7.1.12(@types/node@24.9.2)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1):
+  vite@7.1.12(@types/node@24.10.0)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1):
     dependencies:
-      esbuild: 0.25.11
+      esbuild: 0.25.12
       fdir: 6.5.0(picomatch@4.0.3)
       picomatch: 4.0.3
       postcss: 8.5.6
       rollup: 4.52.5
       tinyglobby: 0.2.15
     optionalDependencies:
-      '@types/node': 24.9.2
+      '@types/node': 24.10.0
       fsevents: 2.3.3
       jiti: 2.6.1
       lightningcss: 1.30.2
       terser: 5.44.0
       yaml: 2.8.1
 
-  vitefu@1.1.1(vite@7.1.12(@types/node@24.9.2)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)):
+  vitefu@1.1.1(vite@7.1.12(@types/node@24.10.0)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)):
     optionalDependencies:
-      vite: 7.1.12(@types/node@24.9.2)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)
+      vite: 7.1.12(@types/node@24.10.0)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)
 
-  vitest-fetch-mock@0.4.5(vitest@3.2.4(@types/debug@4.1.12)(@types/node@22.18.13)(happy-dom@20.0.8)(jiti@2.6.1)(jsdom@26.1.0(canvas@2.11.2))(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)):
+  vitest-fetch-mock@0.4.5(vitest@3.2.4(@types/debug@4.1.12)(@types/node@22.19.0)(happy-dom@20.0.10)(jiti@2.6.1)(jsdom@26.1.0(canvas@2.11.2))(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)):
     dependencies:
-      vitest: 3.2.4(@types/debug@4.1.12)(@types/node@22.18.13)(happy-dom@20.0.8)(jiti@2.6.1)(jsdom@26.1.0(canvas@2.11.2))(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)
+      vitest: 3.2.4(@types/debug@4.1.12)(@types/node@22.19.0)(happy-dom@20.0.10)(jiti@2.6.1)(jsdom@26.1.0(canvas@2.11.2))(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)
 
-  vitest@3.2.4(@types/debug@4.1.12)(@types/node@22.18.13)(happy-dom@20.0.8)(jiti@2.6.1)(jsdom@26.1.0(canvas@2.11.2(encoding@0.1.13)))(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1):
+  vitest@3.2.4(@types/debug@4.1.12)(@types/node@22.19.0)(happy-dom@20.0.10)(jiti@2.6.1)(jsdom@26.1.0(canvas@2.11.2(encoding@0.1.13)))(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1):
     dependencies:
       '@types/chai': 5.2.2
       '@vitest/expect': 3.2.4
-      '@vitest/mocker': 3.2.4(vite@7.1.12(@types/node@22.18.13)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1))
+      '@vitest/mocker': 3.2.4(vite@7.1.12(@types/node@22.19.0)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1))
       '@vitest/pretty-format': 3.2.4
       '@vitest/runner': 3.2.4
       '@vitest/snapshot': 3.2.4
@@ -24320,13 +24329,13 @@ snapshots:
       tinyglobby: 0.2.15
       tinypool: 1.1.1
       tinyrainbow: 2.0.0
-      vite: 7.1.12(@types/node@22.18.13)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)
-      vite-node: 3.2.4(@types/node@22.18.13)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)
+      vite: 7.1.12(@types/node@22.19.0)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)
+      vite-node: 3.2.4(@types/node@22.19.0)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)
       why-is-node-running: 2.3.0
     optionalDependencies:
       '@types/debug': 4.1.12
-      '@types/node': 22.18.13
-      happy-dom: 20.0.8
+      '@types/node': 22.19.0
+      happy-dom: 20.0.10
       jsdom: 26.1.0(canvas@2.11.2(encoding@0.1.13))
     transitivePeerDependencies:
       - jiti
@@ -24342,11 +24351,11 @@ snapshots:
       - tsx
       - yaml
 
-  vitest@3.2.4(@types/debug@4.1.12)(@types/node@22.18.13)(happy-dom@20.0.8)(jiti@2.6.1)(jsdom@26.1.0(canvas@2.11.2))(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1):
+  vitest@3.2.4(@types/debug@4.1.12)(@types/node@22.19.0)(happy-dom@20.0.10)(jiti@2.6.1)(jsdom@26.1.0(canvas@2.11.2))(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1):
     dependencies:
       '@types/chai': 5.2.2
       '@vitest/expect': 3.2.4
-      '@vitest/mocker': 3.2.4(vite@7.1.12(@types/node@22.18.13)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1))
+      '@vitest/mocker': 3.2.4(vite@7.1.12(@types/node@22.19.0)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1))
       '@vitest/pretty-format': 3.2.4
       '@vitest/runner': 3.2.4
       '@vitest/snapshot': 3.2.4
@@ -24364,13 +24373,13 @@ snapshots:
       tinyglobby: 0.2.15
       tinypool: 1.1.1
       tinyrainbow: 2.0.0
-      vite: 7.1.12(@types/node@22.18.13)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)
-      vite-node: 3.2.4(@types/node@22.18.13)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)
+      vite: 7.1.12(@types/node@22.19.0)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)
+      vite-node: 3.2.4(@types/node@22.19.0)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)
       why-is-node-running: 2.3.0
     optionalDependencies:
       '@types/debug': 4.1.12
-      '@types/node': 22.18.13
-      happy-dom: 20.0.8
+      '@types/node': 22.19.0
+      happy-dom: 20.0.10
       jsdom: 26.1.0(canvas@2.11.2)
     transitivePeerDependencies:
       - jiti
@@ -24386,11 +24395,11 @@ snapshots:
       - tsx
       - yaml
 
-  vitest@3.2.4(@types/debug@4.1.12)(@types/node@24.9.2)(happy-dom@20.0.8)(jiti@2.6.1)(jsdom@26.1.0(canvas@2.11.2))(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1):
+  vitest@3.2.4(@types/debug@4.1.12)(@types/node@24.10.0)(happy-dom@20.0.10)(jiti@2.6.1)(jsdom@26.1.0(canvas@2.11.2))(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1):
     dependencies:
       '@types/chai': 5.2.2
       '@vitest/expect': 3.2.4
-      '@vitest/mocker': 3.2.4(vite@7.1.12(@types/node@24.9.2)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1))
+      '@vitest/mocker': 3.2.4(vite@7.1.12(@types/node@24.10.0)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1))
       '@vitest/pretty-format': 3.2.4
       '@vitest/runner': 3.2.4
       '@vitest/snapshot': 3.2.4
@@ -24408,13 +24417,13 @@ snapshots:
       tinyglobby: 0.2.15
       tinypool: 1.1.1
       tinyrainbow: 2.0.0
-      vite: 7.1.12(@types/node@24.9.2)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)
-      vite-node: 3.2.4(@types/node@24.9.2)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)
+      vite: 7.1.12(@types/node@24.10.0)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)
+      vite-node: 3.2.4(@types/node@24.10.0)(jiti@2.6.1)(lightningcss@1.30.2)(terser@5.44.0)(yaml@2.8.1)
       why-is-node-running: 2.3.0
     optionalDependencies:
       '@types/debug': 4.1.12
-      '@types/node': 24.9.2
-      happy-dom: 20.0.8
+      '@types/node': 24.10.0
+      happy-dom: 20.0.10
       jsdom: 26.1.0(canvas@2.11.2)
     transitivePeerDependencies:
       - jiti
@@ -24553,7 +24562,7 @@ snapshots:
 
   webpack-virtual-modules@0.6.2: {}
 
-  webpack@5.100.2(@swc/core@1.13.5(@swc/helpers@0.5.17)):
+  webpack@5.100.2(@swc/core@1.14.0(@swc/helpers@0.5.17)):
     dependencies:
       '@types/eslint-scope': 3.7.7
       '@types/estree': 1.0.8
@@ -24577,7 +24586,7 @@ snapshots:
       neo-async: 2.6.2
       schema-utils: 4.3.3
       tapable: 2.3.0
-      terser-webpack-plugin: 5.3.14(@swc/core@1.13.5(@swc/helpers@0.5.17))(webpack@5.100.2(@swc/core@1.13.5(@swc/helpers@0.5.17)))
+      terser-webpack-plugin: 5.3.14(@swc/core@1.14.0(@swc/helpers@0.5.17))(webpack@5.100.2(@swc/core@1.14.0(@swc/helpers@0.5.17)))
       watchpack: 2.4.4
       webpack-sources: 3.3.3
     transitivePeerDependencies:
diff --git a/web/package.json b/web/package.json
index 24d489a7d8..b9ec394b5d 100644
--- a/web/package.json
+++ b/web/package.json
@@ -57,7 +57,7 @@
     "socket.io-client": "~4.8.0",
     "svelte-gestures": "^5.2.2",
     "svelte-i18n": "^4.0.1",
-    "svelte-maplibre": "^1.2.0",
+    "svelte-maplibre": "^1.2.5",
     "svelte-persisted-store": "^0.12.0",
     "tabbable": "^6.2.0",
     "thumbhash": "^0.1.1"
@@ -96,7 +96,7 @@
     "prettier-plugin-sort-json": "^4.1.1",
     "prettier-plugin-svelte": "^3.3.3",
     "rollup-plugin-visualizer": "^6.0.0",
-    "svelte": "5.41.3",
+    "svelte": "5.43.0",
     "svelte-check": "^4.1.5",
     "svelte-eslint-parser": "^1.3.3",
     "tailwindcss": "^4.1.7",

From 7a2c8e0662648b2a5a6d98fed9bb6e4944138991 Mon Sep 17 00:00:00 2001
From: exelix <13405476+exelix11@users.noreply.github.com>
Date: Mon, 10 Nov 2025 20:55:09 +0100
Subject: [PATCH 67/84] feat(mobile): Quick date picker in the search page
 (#22653)

* Quick date picker

* Include current year in quick date picker

* Quick date picker: localization, fix datetime overflows

* Properly localized 'last_months'

* Move quick_date_picker.dart to lib/presentation/widgets/search

* Wrap the quick date picker state into its own class, improve the interaction patterns

* Fix last9Months value

* Improve method naming

* Subtitle for "custom range" in quick date picker

* Fix style warnings

* Fix lint warning

* fix:  mobile unawaited_futures lint (#21661)

* chore: add unawaited_futures lint as warning

* remove unused dcm lints

They will be added back later on a case by case basis

* fix warning

* auto gen file

* review changes

* conflict resolution

---------

Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>

* Quick date picker

* Wrap the quick date picker state into its own class, improve the interaction patterns

* chore: delete file from rebase

---------

Co-authored-by: shenlong <139912620+shenlong-tanwen@users.noreply.github.com>
Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>
Co-authored-by: bwees <brandonwees@gmail.com>
---
 i18n/en.json                                  |   5 +
 .../pages/search/drift_search.page.dart       | 101 ++++++---
 .../widgets/search/quick_date_picker.dart     | 208 ++++++++++++++++++
 .../filter_bottom_sheet_scaffold.dart         |  23 +-
 4 files changed, 290 insertions(+), 47 deletions(-)
 create mode 100644 mobile/lib/presentation/widgets/search/quick_date_picker.dart

diff --git a/i18n/en.json b/i18n/en.json
index 644b74e715..6117e30106 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1197,6 +1197,8 @@
   "import_path": "Import path",
   "in_albums": "In {count, plural, one {# album} other {# albums}}",
   "in_archive": "In archive",
+  "in_year": "In {year}",
+  "in_year_selector": "In",
   "include_archived": "Include archived",
   "include_shared_albums": "Include shared albums",
   "include_shared_partner_assets": "Include shared partner assets",
@@ -1233,6 +1235,7 @@
   "language_setting_description": "Select your preferred language",
   "large_files": "Large Files",
   "last": "Last",
+  "last_months": "{count, plural, one {Last month} other {Last # months}}",
   "last_seen": "Last seen",
   "latest_version": "Latest Version",
   "latitude": "Latitude",
@@ -1554,6 +1557,8 @@
   "photos_count": "{count, plural, one {{count, number} Photo} other {{count, number} Photos}}",
   "photos_from_previous_years": "Photos from previous years",
   "pick_a_location": "Pick a location",
+  "pick_custom_range": "Custom range",
+  "pick_date_range": "Select a date range",
   "pin_code_changed_successfully": "Successfully changed PIN code",
   "pin_code_reset_successfully": "Successfully reset PIN code",
   "pin_code_setup_successfully": "Successfully setup a PIN code",
diff --git a/mobile/lib/presentation/pages/search/drift_search.page.dart b/mobile/lib/presentation/pages/search/drift_search.page.dart
index 5ded685e21..58ca892f5f 100644
--- a/mobile/lib/presentation/pages/search/drift_search.page.dart
+++ b/mobile/lib/presentation/pages/search/drift_search.page.dart
@@ -15,6 +15,7 @@ import 'package:immich_mobile/extensions/translate_extensions.dart';
 import 'package:immich_mobile/models/search/search_filter.model.dart';
 import 'package:immich_mobile/presentation/pages/search/paginated_search.provider.dart';
 import 'package:immich_mobile/presentation/widgets/bottom_sheet/general_bottom_sheet.widget.dart';
+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/search/search_input_focus.provider.dart';
@@ -54,6 +55,7 @@ class DriftSearchPage extends HookConsumerWidget {
     );
 
     final previousFilter = useState<SearchFilter?>(null);
+    final dateInputFilter = useState<DateFilterInputModel?>(null);
 
     final peopleCurrentFilterWidget = useState<Widget?>(null);
     final dateRangeCurrentFilterWidget = useState<Widget?>(null);
@@ -245,19 +247,54 @@ class DriftSearchPage extends HookConsumerWidget {
       );
     }
 
+    datePicked(DateFilterInputModel? selectedDate) {
+      dateInputFilter.value = selectedDate;
+      if (selectedDate == null) {
+        filter.value = filter.value.copyWith(date: SearchDateFilter());
+
+        dateRangeCurrentFilterWidget.value = null;
+        unawaited(search());
+        return;
+      }
+
+      final date = selectedDate.asDateTimeRange();
+
+      filter.value = filter.value.copyWith(
+        date: SearchDateFilter(
+          takenAfter: date.start,
+          takenBefore: date.end.add(const Duration(hours: 23, minutes: 59, seconds: 59)),
+        ),
+      );
+
+      dateRangeCurrentFilterWidget.value = Text(
+        selectedDate.asHumanReadable(context),
+        style: context.textTheme.labelLarge,
+      );
+
+      unawaited(search());
+    }
+
     showDatePicker() async {
       final firstDate = DateTime(1900);
       final lastDate = DateTime.now();
 
+      var dateRange = DateTimeRange(
+        start: filter.value.date.takenAfter ?? lastDate,
+        end: filter.value.date.takenBefore ?? lastDate,
+      );
+
+      // datePicked() may increase the date, this will make the date picker fail an assertion
+      // Fixup the end date to be at most now.
+      if (dateRange.end.isAfter(lastDate)) {
+        dateRange = DateTimeRange(start: dateRange.start, end: lastDate);
+      }
+
       final date = await showDateRangePicker(
         context: context,
         firstDate: firstDate,
         lastDate: lastDate,
         currentDate: DateTime.now(),
-        initialDateRange: DateTimeRange(
-          start: filter.value.date.takenAfter ?? lastDate,
-          end: filter.value.date.takenBefore ?? lastDate,
-        ),
+        initialDateRange: dateRange,
         helpText: 'search_filter_date_title'.t(context: context),
         cancelText: 'cancel'.t(context: context),
         confirmText: 'select'.t(context: context),
@@ -271,40 +308,32 @@ class DriftSearchPage extends HookConsumerWidget {
       );
 
       if (date == null) {
-        filter.value = filter.value.copyWith(date: SearchDateFilter());
-
-        dateRangeCurrentFilterWidget.value = null;
-        unawaited(search());
-        return;
-      }
-
-      filter.value = filter.value.copyWith(
-        date: SearchDateFilter(
-          takenAfter: date.start,
-          takenBefore: date.end.add(const Duration(hours: 23, minutes: 59, seconds: 59)),
-        ),
-      );
-
-      // If date range is less than 24 hours, set the end date to the end of the day
-      if (date.end.difference(date.start).inHours < 24) {
-        dateRangeCurrentFilterWidget.value = Text(
-          DateFormat.yMMMd().format(date.start.toLocal()),
-          style: context.textTheme.labelLarge,
-        );
+        datePicked(null);
       } else {
-        dateRangeCurrentFilterWidget.value = Text(
-          'search_filter_date_interval'.t(
-            context: context,
-            args: {
-              "start": DateFormat.yMMMd().format(date.start.toLocal()),
-              "end": DateFormat.yMMMd().format(date.end.toLocal()),
+        datePicked(CustomDateFilter.fromRange(date));
+      }
+    }
+
+    showQuickDatePicker() {
+      showFilterBottomSheet(
+        context: context,
+        child: FilterBottomSheetScaffold(
+          title: "pick_date_range".tr(),
+          expanded: true,
+          onClear: () => datePicked(null),
+          child: QuickDatePicker(
+            currentInput: dateInputFilter.value,
+            onRequestPicker: () {
+              context.pop();
+              showDatePicker();
+            },
+            onSelect: (date) {
+              context.pop();
+              datePicked(date);
             },
           ),
-          style: context.textTheme.labelLarge,
-        );
-      }
-
-      unawaited(search());
+        ),
+      );
     }
 
     // MEDIA PICKER
@@ -589,7 +618,7 @@ class DriftSearchPage extends HookConsumerWidget {
                     ),
                     SearchFilterChip(
                       icon: Icons.date_range_outlined,
-                      onTap: showDatePicker,
+                      onTap: showQuickDatePicker,
                       label: 'search_filter_date'.t(context: context),
                       currentFilter: dateRangeCurrentFilterWidget.value,
                     ),
diff --git a/mobile/lib/presentation/widgets/search/quick_date_picker.dart b/mobile/lib/presentation/widgets/search/quick_date_picker.dart
new file mode 100644
index 0000000000..09b1cee700
--- /dev/null
+++ b/mobile/lib/presentation/widgets/search/quick_date_picker.dart
@@ -0,0 +1,208 @@
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_hooks/flutter_hooks.dart';
+import 'package:immich_mobile/extensions/translate_extensions.dart';
+
+sealed class DateFilterInputModel {
+  DateTimeRange<DateTime> asDateTimeRange();
+
+  String asHumanReadable(BuildContext context) {
+    // General implementation for arbitrary date and time ranges
+    // If date range is less than 24 hours, set the end date to the end of the day
+    final date = asDateTimeRange();
+    if (date.end.difference(date.start).inHours < 24) {
+      return DateFormat.yMMMd().format(date.start.toLocal());
+    } else {
+      return 'search_filter_date_interval'.t(
+        context: context,
+        args: {
+          "start": DateFormat.yMMMd().format(date.start.toLocal()),
+          "end": DateFormat.yMMMd().format(date.end.toLocal()),
+        },
+      );
+    }
+  }
+}
+
+class RecentMonthRangeFilter extends DateFilterInputModel {
+  final int monthDelta;
+  RecentMonthRangeFilter(this.monthDelta);
+
+  @override
+  DateTimeRange<DateTime> asDateTimeRange() {
+    final now = DateTime.now();
+    // Note that DateTime's constructor properly handles month overflow.
+    final from = DateTime(now.year, now.month - monthDelta, 1);
+    return DateTimeRange<DateTime>(start: from, end: now);
+  }
+
+  @override
+  String asHumanReadable(BuildContext context) {
+    return 'last_months'.t(context: context, args: {"count": monthDelta.toString()});
+  }
+}
+
+class YearFilter extends DateFilterInputModel {
+  final int year;
+  YearFilter(this.year);
+
+  @override
+  DateTimeRange<DateTime> asDateTimeRange() {
+    final now = DateTime.now();
+    final from = DateTime(year, 1, 1);
+
+    if (now.year == year) {
+      // To not go beyond today if the user picks the current year
+      return DateTimeRange<DateTime>(start: from, end: now);
+    }
+
+    final to = DateTime(year, 12, 31, 23, 59, 59);
+    return DateTimeRange<DateTime>(start: from, end: to);
+  }
+
+  @override
+  String asHumanReadable(BuildContext context) {
+    return 'in_year'.tr(namedArgs: {"year": year.toString()});
+  }
+}
+
+class CustomDateFilter extends DateFilterInputModel {
+  final DateTime start;
+  final DateTime end;
+
+  CustomDateFilter(this.start, this.end);
+
+  factory CustomDateFilter.fromRange(DateTimeRange<DateTime> range) {
+    return CustomDateFilter(range.start, range.end);
+  }
+
+  @override
+  DateTimeRange<DateTime> asDateTimeRange() {
+    return DateTimeRange<DateTime>(start: start, end: end);
+  }
+}
+
+enum _QuickPickerType { last1Month, last3Months, last9Months, year, custom }
+
+class QuickDatePicker extends HookWidget {
+  QuickDatePicker({super.key, required this.currentInput, required this.onSelect, required this.onRequestPicker})
+    : _selection = _selectionFromModel(currentInput),
+      _initialYear = _initialYearFromModel(currentInput);
+
+  final Function() onRequestPicker;
+  final Function(DateFilterInputModel range) onSelect;
+
+  final DateFilterInputModel? currentInput;
+  final _QuickPickerType? _selection;
+  final int _initialYear;
+
+  // Generate a list of recent years from 2000 to the current year (including the current one)
+  final List<int> _recentYears = List.generate(1 + DateTime.now().year - 2000, (index) {
+    return index + 2000;
+  });
+
+  static int _initialYearFromModel(DateFilterInputModel? model) {
+    return model?.asDateTimeRange().start.year ?? DateTime.now().year;
+  }
+
+  static _QuickPickerType? _selectionFromModel(DateFilterInputModel? model) {
+    if (model is RecentMonthRangeFilter) {
+      return switch (model.monthDelta) {
+        1 => _QuickPickerType.last1Month,
+        3 => _QuickPickerType.last3Months,
+        9 => _QuickPickerType.last9Months,
+        _ => _QuickPickerType.custom,
+      };
+    } else if (model is YearFilter) {
+      return _QuickPickerType.year;
+    } else if (model is CustomDateFilter) {
+      return _QuickPickerType.custom;
+    }
+    return null;
+  }
+
+  Text _monthLabel(BuildContext context, int monthsFromNow) =>
+      const Text('last_months').t(context: context, args: {"count": monthsFromNow.toString()});
+
+  Widget _yearPicker(BuildContext context) {
+    final size = MediaQuery.of(context).size;
+    return Row(
+      children: [
+        const Text("in_year_selector").tr(),
+        const SizedBox(width: 15),
+        Expanded(
+          child: DropdownMenu(
+            initialSelection: _initialYear,
+            menuStyle: MenuStyle(maximumSize: WidgetStateProperty.all(Size(size.width, size.height * 0.5))),
+            dropdownMenuEntries: _recentYears.map((e) => DropdownMenuEntry(value: e, label: e.toString())).toList(),
+            onSelected: (year) {
+              if (year == null) return;
+              onSelect(YearFilter(year));
+            },
+          ),
+        ),
+      ],
+    );
+  }
+
+  // We want the exact date picker to always be selectable.
+  // Even if it's already toggled it should always open the full date picker, RadioListTiles don't do that by default
+  // so we wrap it in a InkWell
+  Widget _exactPicker(BuildContext context) {
+    final hasPreviousInput = currentInput != null && currentInput is CustomDateFilter;
+
+    return InkWell(
+      onTap: onRequestPicker,
+      child: IgnorePointer(
+        ignoring: true,
+        child: RadioListTile(
+          title: const Text('pick_custom_range').tr(),
+          subtitle: hasPreviousInput ? Text(currentInput!.asHumanReadable(context)) : null,
+          secondary: hasPreviousInput ? const Icon(Icons.edit) : null,
+          value: _QuickPickerType.custom,
+          toggleable: true,
+        ),
+      ),
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: EdgeInsets.only(bottom: MediaQuery.of(context).viewInsets.bottom),
+      child: Scrollbar(
+        // Depending on the screen size the last option might get cut off
+        // Add a clear visual cue that there are more options when scrolling
+        // When the screen size is large enough the scrollbar is hidden automatically
+        trackVisibility: true,
+        thumbVisibility: true,
+        child: SingleChildScrollView(
+          child: RadioGroup(
+            onChanged: (value) {
+              if (value == null) return;
+              final _ = switch (value) {
+                _QuickPickerType.custom => onRequestPicker(),
+                _QuickPickerType.last1Month => onSelect(RecentMonthRangeFilter(1)),
+                _QuickPickerType.last3Months => onSelect(RecentMonthRangeFilter(3)),
+                _QuickPickerType.last9Months => onSelect(RecentMonthRangeFilter(9)),
+                // When a year is selected the combobox triggers onSelect() on its own.
+                // Here we handle the radio button being selected which can only ever be the initial year
+                _QuickPickerType.year => onSelect(YearFilter(_initialYear)),
+              };
+            },
+            groupValue: _selection,
+            child: Column(
+              children: [
+                RadioListTile(title: _monthLabel(context, 1), value: _QuickPickerType.last1Month, toggleable: true),
+                RadioListTile(title: _monthLabel(context, 3), value: _QuickPickerType.last3Months, toggleable: true),
+                RadioListTile(title: _monthLabel(context, 9), value: _QuickPickerType.last9Months, toggleable: true),
+                RadioListTile(title: _yearPicker(context), value: _QuickPickerType.year, toggleable: true),
+                _exactPicker(context),
+              ],
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}
diff --git a/mobile/lib/widgets/search/search_filter/filter_bottom_sheet_scaffold.dart b/mobile/lib/widgets/search/search_filter/filter_bottom_sheet_scaffold.dart
index e8226b5b3a..dee42ec5a0 100644
--- a/mobile/lib/widgets/search/search_filter/filter_bottom_sheet_scaffold.dart
+++ b/mobile/lib/widgets/search/search_filter/filter_bottom_sheet_scaffold.dart
@@ -6,7 +6,7 @@ class FilterBottomSheetScaffold extends StatelessWidget {
   const FilterBottomSheetScaffold({
     super.key,
     required this.child,
-    required this.onSearch,
+    this.onSearch,
     required this.onClear,
     required this.title,
     this.expanded,
@@ -15,7 +15,7 @@ class FilterBottomSheetScaffold extends StatelessWidget {
   final bool? expanded;
   final String title;
   final Widget child;
-  final Function() onSearch;
+  final Function()? onSearch;
   final Function() onClear;
 
   @override
@@ -48,15 +48,16 @@ class FilterBottomSheetScaffold extends StatelessWidget {
                   },
                   child: const Text('clear').tr(),
                 ),
-                const SizedBox(width: 8),
-                ElevatedButton(
-                  key: const Key('search_filter_apply'),
-                  onPressed: () {
-                    onSearch();
-                    context.pop();
-                  },
-                  child: const Text('search_filter_apply').tr(),
-                ),
+                if (onSearch != null) const SizedBox(width: 8),
+                if (onSearch != null)
+                  ElevatedButton(
+                    key: const Key('search_filter_apply'),
+                    onPressed: () {
+                      onSearch!();
+                      context.pop();
+                    },
+                    child: const Text('search_filter_apply').tr(),
+                  ),
               ],
             ),
           ),

From 6922a92b69e8cccb06a5300f4976213371eac13a Mon Sep 17 00:00:00 2001
From: Alex <alex.tran1502@gmail.com>
Date: Mon, 10 Nov 2025 14:19:27 -0600
Subject: [PATCH 68/84] feat: show update version info (#23698)

* feat: show update version info

* Apply suggestions from code review

Co-authored-by: Daniel Dietzler <36593685+danieldietzler@users.noreply.github.com>

---------

Co-authored-by: Daniel Dietzler <36593685+danieldietzler@users.noreply.github.com>
---
 i18n/en.json                                  |  1 +
 .../side-bar/server-status.svelte             | 48 +++++++++++++++++--
 web/src/lib/utils.ts                          |  2 +
 web/src/routes/+layout.svelte                 |  4 +-
 4 files changed, 48 insertions(+), 7 deletions(-)

diff --git a/i18n/en.json b/i18n/en.json
index 6117e30106..f0b10d2ac1 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1414,6 +1414,7 @@
   "new_pin_code": "New PIN code",
   "new_pin_code_subtitle": "This is your first time accessing the locked folder. Create a PIN code to securely access this page",
   "new_timeline": "New Timeline",
+  "new_update": "New update",
   "new_user_created": "New user created",
   "new_version_available": "NEW VERSION AVAILABLE",
   "newest_first": "Newest first",
diff --git a/web/src/lib/components/shared-components/side-bar/server-status.svelte b/web/src/lib/components/shared-components/side-bar/server-status.svelte
index 5c70955f60..b678bc5507 100644
--- a/web/src/lib/components/shared-components/side-bar/server-status.svelte
+++ b/web/src/lib/components/shared-components/side-bar/server-status.svelte
@@ -1,7 +1,9 @@
 <script lang="ts">
   import ServerAboutModal from '$lib/modals/ServerAboutModal.svelte';
+  import { user } from '$lib/stores/user.store';
   import { userInteraction } from '$lib/stores/user.svelte';
   import { websocketStore } from '$lib/stores/websocket';
+  import { semverToName } from '$lib/utils';
   import { requestServerInfo } from '$lib/utils/auth';
   import {
     getAboutInfo,
@@ -9,12 +11,12 @@
     type ServerAboutResponseDto,
     type ServerVersionHistoryResponseDto,
   } from '@immich/sdk';
-  import { Icon, modalManager } from '@immich/ui';
-  import { mdiAlert } from '@mdi/js';
+  import { Icon, modalManager, Text } from '@immich/ui';
+  import { mdiAlert, mdiNewBox } from '@mdi/js';
   import { onMount } from 'svelte';
   import { t } from 'svelte-i18n';
 
-  const { serverVersion, connected } = websocketStore;
+  const { serverVersion, connected, release } = websocketStore;
 
   let info: ServerAboutResponseDto | undefined = $state();
   let versions: ServerVersionHistoryResponseDto[] = $state([]);
@@ -34,6 +36,21 @@
   let version = $derived(
     $serverVersion ? `v${$serverVersion.major}.${$serverVersion.minor}.${$serverVersion.patch}` : null,
   );
+
+  const releaseInfo = $derived.by(() => {
+    if ($release == undefined || $release?.isAvailable || !$user.isAdmin) {
+      return;
+    }
+
+    const availableVersion = semverToName($release.releaseVersion);
+    const serverVersion = semverToName($release.serverVersion);
+
+    if (serverVersion === availableVersion) {
+      return;
+    }
+
+    return { availableVersion, releaseUrl: `https://github.com/immich-app/immich/releases/tag/${availableVersion}` };
+  });
 </script>
 
 <div
@@ -56,7 +73,7 @@
       <button
         type="button"
         onclick={() => info && modalManager.show(ServerAboutModal, { versions, info })}
-        class="dark:text-immich-gray flex gap-1"
+        class="dark:text-immich-gray flex gap-1 place-items-center place-content-center"
       >
         {#if isMain}
           <Icon icon={mdiAlert} size="1.5em" color="#ffcc4d" /> {info?.sourceRef}
@@ -69,3 +86,26 @@
     {/if}
   </div>
 </div>
+
+{#if releaseInfo}
+  <a
+    href={releaseInfo.releaseUrl}
+    target="_blank"
+    rel="noopener noreferrer"
+    class="mt-3 p-2.5 ms-4 rounded-lg text-sm min-w-52 border border-gray-200/50 dark:border-gray-700/50 bg-white/50 dark:bg-gray-800/50 hover:border-immich-primary/40 dark:hover:border-immich-dark-primary/40 hover:bg-immich-primary/5 dark:hover:bg-immich-dark-primary/5 transition-all duration-200 group block"
+  >
+    <div class="flex items-center justify-between gap-2">
+      <div class="flex items-center gap-2">
+        <Icon icon={mdiNewBox} size="16" class="text-immich-primary dark:text-immich-dark-primary opacity-80" />
+        <Text size="tiny" class="font-medium text-gray-700 dark:text-gray-300">
+          {releaseInfo.availableVersion}
+        </Text>
+      </div>
+      <span
+        class="text-[11px] text-gray-500 dark:text-gray-400 group-hover:text-immich-primary dark:group-hover:text-immich-dark-primary transition-colors opacity-70 group-hover:opacity-100"
+      >
+        {$t('new_update')}!
+      </span>
+    </div>
+  </a>
+{/if}
diff --git a/web/src/lib/utils.ts b/web/src/lib/utils.ts
index 65510352c1..6e0a216477 100644
--- a/web/src/lib/utils.ts
+++ b/web/src/lib/utils.ts
@@ -400,3 +400,5 @@ export const getReleaseType = (
 
   return 'none';
 };
+
+export const semverToName = ({ major, minor, patch }: ServerVersionResponseDto) => `v${major}.${minor}.${patch}`;
diff --git a/web/src/routes/+layout.svelte b/web/src/routes/+layout.svelte
index f5d4619943..bd0029735c 100644
--- a/web/src/routes/+layout.svelte
+++ b/web/src/routes/+layout.svelte
@@ -17,9 +17,8 @@
     websocketStore,
     type ReleaseEvent,
   } from '$lib/stores/websocket';
-  import { copyToClipboard, getReleaseType } from '$lib/utils';
+  import { copyToClipboard, getReleaseType, semverToName } from '$lib/utils';
   import { isAssetViewerRoute } from '$lib/utils/navigation';
-  import type { ServerVersionResponseDto } from '@immich/sdk';
   import { modalManager, setTranslations } from '@immich/ui';
   import { onMount, type Snippet } from 'svelte';
   import { t } from 'svelte-i18n';
@@ -78,7 +77,6 @@
     }
   });
 
-  const semverToName = ({ major, minor, patch }: ServerVersionResponseDto) => `v${major}.${minor}.${patch}`;
   const { release } = websocketStore;
 
   const handleRelease = async (release?: ReleaseEvent) => {

From 9e2208b8dd4c327e5fca7c8d77f89f6904f2ec0e Mon Sep 17 00:00:00 2001
From: Mert <101130780+mertalev@users.noreply.github.com>
Date: Mon, 10 Nov 2025 15:21:08 -0500
Subject: [PATCH 69/84] chore(mobile): add table schemas to swift (#23749)

* add schemas

* handle json, improve type safety

* formatting

* sync variants

* formatting
---
 mobile/ios/Runner.xcodeproj/project.pbxproj   |  66 ++++-
 .../xcshareddata/swiftpm/Package.resolved     | 150 +++++++++++
 mobile/ios/Runner/Schemas/Constants.swift     | 177 +++++++++++++
 mobile/ios/Runner/Schemas/Store.swift         | 146 +++++++++++
 mobile/ios/Runner/Schemas/Tables.swift        | 237 ++++++++++++++++++
 5 files changed, 772 insertions(+), 4 deletions(-)
 create mode 100644 mobile/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved
 create mode 100644 mobile/ios/Runner/Schemas/Constants.swift
 create mode 100644 mobile/ios/Runner/Schemas/Store.swift
 create mode 100644 mobile/ios/Runner/Schemas/Tables.swift

diff --git a/mobile/ios/Runner.xcodeproj/project.pbxproj b/mobile/ios/Runner.xcodeproj/project.pbxproj
index 15130702bc..d2d9e8f0b7 100644
--- a/mobile/ios/Runner.xcodeproj/project.pbxproj
+++ b/mobile/ios/Runner.xcodeproj/project.pbxproj
@@ -32,6 +32,9 @@
 		FEAFA8732E4D42F4001E47FE /* Thumbhash.swift in Sources */ = {isa = PBXBuildFile; fileRef = FEAFA8722E4D42F4001E47FE /* Thumbhash.swift */; };
 		FED3B1962E253E9B0030FD97 /* ThumbnailsImpl.swift in Sources */ = {isa = PBXBuildFile; fileRef = FED3B1942E253E9B0030FD97 /* ThumbnailsImpl.swift */; };
 		FED3B1972E253E9B0030FD97 /* Thumbnails.g.swift in Sources */ = {isa = PBXBuildFile; fileRef = FED3B1932E253E9B0030FD97 /* Thumbnails.g.swift */; };
+		FEE084F82EC172460045228E /* SQLiteData in Frameworks */ = {isa = PBXBuildFile; productRef = FEE084F72EC172460045228E /* SQLiteData */; };
+		FEE084FB2EC1725A0045228E /* RawStructuredFieldValues in Frameworks */ = {isa = PBXBuildFile; productRef = FEE084FA2EC1725A0045228E /* RawStructuredFieldValues */; };
+		FEE084FD2EC1725A0045228E /* StructuredFieldValues in Frameworks */ = {isa = PBXBuildFile; productRef = FEE084FC2EC1725A0045228E /* StructuredFieldValues */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -133,15 +136,11 @@
 /* Begin PBXFileSystemSynchronizedRootGroup section */
 		B231F52D2E93A44A00BC45D1 /* Core */ = {
 			isa = PBXFileSystemSynchronizedRootGroup;
-			exceptions = (
-			);
 			path = Core;
 			sourceTree = "<group>";
 		};
 		B2CF7F8C2DDE4EBB00744BF6 /* Sync */ = {
 			isa = PBXFileSystemSynchronizedRootGroup;
-			exceptions = (
-			);
 			path = Sync;
 			sourceTree = "<group>";
 		};
@@ -153,6 +152,11 @@
 			path = WidgetExtension;
 			sourceTree = "<group>";
 		};
+		FEE084F22EC172080045228E /* Schemas */ = {
+			isa = PBXFileSystemSynchronizedRootGroup;
+			path = Schemas;
+			sourceTree = "<group>";
+		};
 /* End PBXFileSystemSynchronizedRootGroup section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -160,6 +164,9 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				FEE084F82EC172460045228E /* SQLiteData in Frameworks */,
+				FEE084FB2EC1725A0045228E /* RawStructuredFieldValues in Frameworks */,
+				FEE084FD2EC1725A0045228E /* StructuredFieldValues in Frameworks */,
 				D218389C4A4C4693F141F7D1 /* Pods_Runner.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -254,6 +261,7 @@
 		97C146F01CF9000F007C117D /* Runner */ = {
 			isa = PBXGroup;
 			children = (
+				FEE084F22EC172080045228E /* Schemas */,
 				B231F52D2E93A44A00BC45D1 /* Core */,
 				B25D37792E72CA15008B6CA7 /* Connectivity */,
 				B21E34A62E5AF9760031FDB9 /* Background */,
@@ -341,6 +349,7 @@
 			fileSystemSynchronizedGroups = (
 				B231F52D2E93A44A00BC45D1 /* Core */,
 				B2CF7F8C2DDE4EBB00744BF6 /* Sync */,
+				FEE084F22EC172080045228E /* Schemas */,
 			);
 			name = Runner;
 			productName = Runner;
@@ -419,6 +428,10 @@
 				Base,
 			);
 			mainGroup = 97C146E51CF9000F007C117D;
+			packageReferences = (
+				FEE084F62EC172460045228E /* XCRemoteSwiftPackageReference "sqlite-data" */,
+				FEE084F92EC1725A0045228E /* XCRemoteSwiftPackageReference "swift-http-structured-headers" */,
+			);
 			preferredProjectObjectVersion = 77;
 			productRefGroup = 97C146EF1CF9000F007C117D /* Products */;
 			projectDirPath = "";
@@ -530,10 +543,14 @@
 			inputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
 			);
+			inputPaths = (
+			);
 			name = "[CP] Copy Pods Resources";
 			outputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
 			);
+			outputPaths = (
+			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
@@ -562,10 +579,14 @@
 			inputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
 			);
+			inputPaths = (
+			);
 			name = "[CP] Embed Pods Frameworks";
 			outputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
 			);
+			outputPaths = (
+			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
@@ -1201,6 +1222,43 @@
 			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
+
+/* Begin XCRemoteSwiftPackageReference section */
+		FEE084F62EC172460045228E /* XCRemoteSwiftPackageReference "sqlite-data" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/pointfreeco/sqlite-data";
+			requirement = {
+				kind = upToNextMajorVersion;
+				minimumVersion = 1.3.0;
+			};
+		};
+		FEE084F92EC1725A0045228E /* XCRemoteSwiftPackageReference "swift-http-structured-headers" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/apple/swift-http-structured-headers.git";
+			requirement = {
+				kind = upToNextMajorVersion;
+				minimumVersion = 1.5.0;
+			};
+		};
+/* End XCRemoteSwiftPackageReference section */
+
+/* Begin XCSwiftPackageProductDependency section */
+		FEE084F72EC172460045228E /* SQLiteData */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = FEE084F62EC172460045228E /* XCRemoteSwiftPackageReference "sqlite-data" */;
+			productName = SQLiteData;
+		};
+		FEE084FA2EC1725A0045228E /* RawStructuredFieldValues */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = FEE084F92EC1725A0045228E /* XCRemoteSwiftPackageReference "swift-http-structured-headers" */;
+			productName = RawStructuredFieldValues;
+		};
+		FEE084FC2EC1725A0045228E /* StructuredFieldValues */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = FEE084F92EC1725A0045228E /* XCRemoteSwiftPackageReference "swift-http-structured-headers" */;
+			productName = StructuredFieldValues;
+		};
+/* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = 97C146E61CF9000F007C117D /* Project object */;
 }
diff --git a/mobile/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved b/mobile/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved
new file mode 100644
index 0000000000..af8b19fa89
--- /dev/null
+++ b/mobile/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -0,0 +1,150 @@
+{
+  "originHash" : "9be33bfaa68721646604aefff3cabbdaf9a193da192aae024c265065671f6c49",
+  "pins" : [
+    {
+      "identity" : "combine-schedulers",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/pointfreeco/combine-schedulers",
+      "state" : {
+        "revision" : "5928286acce13def418ec36d05a001a9641086f2",
+        "version" : "1.0.3"
+      }
+    },
+    {
+      "identity" : "grdb.swift",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/groue/GRDB.swift",
+      "state" : {
+        "revision" : "18497b68fdbb3a09528d260a0a0e1e7e61c8c53d",
+        "version" : "7.8.0"
+      }
+    },
+    {
+      "identity" : "sqlite-data",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/pointfreeco/sqlite-data",
+      "state" : {
+        "revision" : "b66b894b9a5710f1072c8eb6448a7edfc2d743d9",
+        "version" : "1.3.0"
+      }
+    },
+    {
+      "identity" : "swift-clocks",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/pointfreeco/swift-clocks",
+      "state" : {
+        "revision" : "cc46202b53476d64e824e0b6612da09d84ffde8e",
+        "version" : "1.0.6"
+      }
+    },
+    {
+      "identity" : "swift-collections",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/apple/swift-collections",
+      "state" : {
+        "revision" : "7b847a3b7008b2dc2f47ca3110d8c782fb2e5c7e",
+        "version" : "1.3.0"
+      }
+    },
+    {
+      "identity" : "swift-concurrency-extras",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/pointfreeco/swift-concurrency-extras",
+      "state" : {
+        "revision" : "5a3825302b1a0d744183200915a47b508c828e6f",
+        "version" : "1.3.2"
+      }
+    },
+    {
+      "identity" : "swift-custom-dump",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/pointfreeco/swift-custom-dump",
+      "state" : {
+        "revision" : "82645ec760917961cfa08c9c0c7104a57a0fa4b1",
+        "version" : "1.3.3"
+      }
+    },
+    {
+      "identity" : "swift-dependencies",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/pointfreeco/swift-dependencies",
+      "state" : {
+        "revision" : "a10f9feeb214bc72b5337b6ef6d5a029360db4cc",
+        "version" : "1.10.0"
+      }
+    },
+    {
+      "identity" : "swift-http-structured-headers",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/apple/swift-http-structured-headers.git",
+      "state" : {
+        "revision" : "a9f3c352f4d46afd155e00b3c6e85decae6bcbeb",
+        "version" : "1.5.0"
+      }
+    },
+    {
+      "identity" : "swift-identified-collections",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/pointfreeco/swift-identified-collections",
+      "state" : {
+        "revision" : "322d9ffeeba85c9f7c4984b39422ec7cc3c56597",
+        "version" : "1.1.1"
+      }
+    },
+    {
+      "identity" : "swift-perception",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/pointfreeco/swift-perception",
+      "state" : {
+        "revision" : "4f47ebafed5f0b0172cf5c661454fa8e28fb2ac4",
+        "version" : "2.0.9"
+      }
+    },
+    {
+      "identity" : "swift-sharing",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/pointfreeco/swift-sharing",
+      "state" : {
+        "revision" : "3bfc408cc2d0bee2287c174da6b1c76768377818",
+        "version" : "2.7.4"
+      }
+    },
+    {
+      "identity" : "swift-snapshot-testing",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/pointfreeco/swift-snapshot-testing",
+      "state" : {
+        "revision" : "a8b7c5e0ed33d8ab8887d1654d9b59f2cbad529b",
+        "version" : "1.18.7"
+      }
+    },
+    {
+      "identity" : "swift-structured-queries",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/pointfreeco/swift-structured-queries",
+      "state" : {
+        "revision" : "1447ea20550f6f02c4b48cc80931c3ed40a9c756",
+        "version" : "0.25.0"
+      }
+    },
+    {
+      "identity" : "swift-syntax",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/swiftlang/swift-syntax",
+      "state" : {
+        "revision" : "4799286537280063c85a32f09884cfbca301b1a1",
+        "version" : "602.0.0"
+      }
+    },
+    {
+      "identity" : "xctest-dynamic-overlay",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/pointfreeco/xctest-dynamic-overlay",
+      "state" : {
+        "revision" : "4c27acf5394b645b70d8ba19dc249c0472d5f618",
+        "version" : "1.7.0"
+      }
+    }
+  ],
+  "version" : 3
+}
diff --git a/mobile/ios/Runner/Schemas/Constants.swift b/mobile/ios/Runner/Schemas/Constants.swift
new file mode 100644
index 0000000000..a4b0f701a1
--- /dev/null
+++ b/mobile/ios/Runner/Schemas/Constants.swift
@@ -0,0 +1,177 @@
+import SQLiteData
+
+struct Endpoint: Codable {
+  let url: URL
+  let status: Status
+
+  enum Status: String, Codable {
+    case loading, valid, error, unknown
+  }
+}
+
+enum StoreKey: Int, CaseIterable, QueryBindable {
+  // MARK: - Int
+  case _version = 0
+  static let version = Typed<Int>(rawValue: ._version)
+  case _deviceIdHash = 3
+  static let deviceIdHash = Typed<Int>(rawValue: ._deviceIdHash)
+  case _backupTriggerDelay = 8
+  static let backupTriggerDelay = Typed<Int>(rawValue: ._backupTriggerDelay)
+  case _tilesPerRow = 103
+  static let tilesPerRow = Typed<Int>(rawValue: ._tilesPerRow)
+  case _groupAssetsBy = 105
+  static let groupAssetsBy = Typed<Int>(rawValue: ._groupAssetsBy)
+  case _uploadErrorNotificationGracePeriod = 106
+  static let uploadErrorNotificationGracePeriod = Typed<Int>(rawValue: ._uploadErrorNotificationGracePeriod)
+  case _thumbnailCacheSize = 110
+  static let thumbnailCacheSize = Typed<Int>(rawValue: ._thumbnailCacheSize)
+  case _imageCacheSize = 111
+  static let imageCacheSize = Typed<Int>(rawValue: ._imageCacheSize)
+  case _albumThumbnailCacheSize = 112
+  static let albumThumbnailCacheSize = Typed<Int>(rawValue: ._albumThumbnailCacheSize)
+  case _selectedAlbumSortOrder = 113
+  static let selectedAlbumSortOrder = Typed<Int>(rawValue: ._selectedAlbumSortOrder)
+  case _logLevel = 115
+  static let logLevel = Typed<Int>(rawValue: ._logLevel)
+  case _mapRelativeDate = 119
+  static let mapRelativeDate = Typed<Int>(rawValue: ._mapRelativeDate)
+  case _mapThemeMode = 124
+  static let mapThemeMode = Typed<Int>(rawValue: ._mapThemeMode)
+
+  // MARK: - String
+  case _assetETag = 1
+  static let assetETag = Typed<String>(rawValue: ._assetETag)
+  case _currentUser = 2
+  static let currentUser = Typed<String>(rawValue: ._currentUser)
+  case _deviceId = 4
+  static let deviceId = Typed<String>(rawValue: ._deviceId)
+  case _accessToken = 11
+  static let accessToken = Typed<String>(rawValue: ._accessToken)
+  case _serverEndpoint = 12
+  static let serverEndpoint = Typed<String>(rawValue: ._serverEndpoint)
+  case _sslClientCertData = 15
+  static let sslClientCertData = Typed<String>(rawValue: ._sslClientCertData)
+  case _sslClientPasswd = 16
+  static let sslClientPasswd = Typed<String>(rawValue: ._sslClientPasswd)
+  case _themeMode = 102
+  static let themeMode = Typed<String>(rawValue: ._themeMode)
+  case _customHeaders = 127
+  static let customHeaders = Typed<[String: String]>(rawValue: ._customHeaders)
+  case _primaryColor = 128
+  static let primaryColor = Typed<String>(rawValue: ._primaryColor)
+  case _preferredWifiName = 133
+  static let preferredWifiName = Typed<String>(rawValue: ._preferredWifiName)
+
+  // MARK: - Endpoint
+  case _externalEndpointList = 135
+  static let externalEndpointList = Typed<[Endpoint]>(rawValue: ._externalEndpointList)
+
+  // MARK: - URL
+  case _localEndpoint = 134
+  static let localEndpoint = Typed<URL>(rawValue: ._localEndpoint)
+  case _serverUrl = 10
+  static let serverUrl = Typed<URL>(rawValue: ._serverUrl)
+
+  // MARK: - Date
+  case _backupFailedSince = 5
+  static let backupFailedSince = Typed<Date>(rawValue: ._backupFailedSince)
+
+  // MARK: - Bool
+  case _backupRequireWifi = 6
+  static let backupRequireWifi = Typed<Bool>(rawValue: ._backupRequireWifi)
+  case _backupRequireCharging = 7
+  static let backupRequireCharging = Typed<Bool>(rawValue: ._backupRequireCharging)
+  case _autoBackup = 13
+  static let autoBackup = Typed<Bool>(rawValue: ._autoBackup)
+  case _backgroundBackup = 14
+  static let backgroundBackup = Typed<Bool>(rawValue: ._backgroundBackup)
+  case _loadPreview = 100
+  static let loadPreview = Typed<Bool>(rawValue: ._loadPreview)
+  case _loadOriginal = 101
+  static let loadOriginal = Typed<Bool>(rawValue: ._loadOriginal)
+  case _dynamicLayout = 104
+  static let dynamicLayout = Typed<Bool>(rawValue: ._dynamicLayout)
+  case _backgroundBackupTotalProgress = 107
+  static let backgroundBackupTotalProgress = Typed<Bool>(rawValue: ._backgroundBackupTotalProgress)
+  case _backgroundBackupSingleProgress = 108
+  static let backgroundBackupSingleProgress = Typed<Bool>(rawValue: ._backgroundBackupSingleProgress)
+  case _storageIndicator = 109
+  static let storageIndicator = Typed<Bool>(rawValue: ._storageIndicator)
+  case _advancedTroubleshooting = 114
+  static let advancedTroubleshooting = Typed<Bool>(rawValue: ._advancedTroubleshooting)
+  case _preferRemoteImage = 116
+  static let preferRemoteImage = Typed<Bool>(rawValue: ._preferRemoteImage)
+  case _loopVideo = 117
+  static let loopVideo = Typed<Bool>(rawValue: ._loopVideo)
+  case _mapShowFavoriteOnly = 118
+  static let mapShowFavoriteOnly = Typed<Bool>(rawValue: ._mapShowFavoriteOnly)
+  case _selfSignedCert = 120
+  static let selfSignedCert = Typed<Bool>(rawValue: ._selfSignedCert)
+  case _mapIncludeArchived = 121
+  static let mapIncludeArchived = Typed<Bool>(rawValue: ._mapIncludeArchived)
+  case _ignoreIcloudAssets = 122
+  static let ignoreIcloudAssets = Typed<Bool>(rawValue: ._ignoreIcloudAssets)
+  case _selectedAlbumSortReverse = 123
+  static let selectedAlbumSortReverse = Typed<Bool>(rawValue: ._selectedAlbumSortReverse)
+  case _mapwithPartners = 125
+  static let mapwithPartners = Typed<Bool>(rawValue: ._mapwithPartners)
+  case _enableHapticFeedback = 126
+  static let enableHapticFeedback = Typed<Bool>(rawValue: ._enableHapticFeedback)
+  case _dynamicTheme = 129
+  static let dynamicTheme = Typed<Bool>(rawValue: ._dynamicTheme)
+  case _colorfulInterface = 130
+  static let colorfulInterface = Typed<Bool>(rawValue: ._colorfulInterface)
+  case _syncAlbums = 131
+  static let syncAlbums = Typed<Bool>(rawValue: ._syncAlbums)
+  case _autoEndpointSwitching = 132
+  static let autoEndpointSwitching = Typed<Bool>(rawValue: ._autoEndpointSwitching)
+  case _loadOriginalVideo = 136
+  static let loadOriginalVideo = Typed<Bool>(rawValue: ._loadOriginalVideo)
+  case _manageLocalMediaAndroid = 137
+  static let manageLocalMediaAndroid = Typed<Bool>(rawValue: ._manageLocalMediaAndroid)
+  case _readonlyModeEnabled = 138
+  static let readonlyModeEnabled = Typed<Bool>(rawValue: ._readonlyModeEnabled)
+  case _autoPlayVideo = 139
+  static let autoPlayVideo = Typed<Bool>(rawValue: ._autoPlayVideo)
+  case _photoManagerCustomFilter = 1000
+  static let photoManagerCustomFilter = Typed<Bool>(rawValue: ._photoManagerCustomFilter)
+  case _betaPromptShown = 1001
+  static let betaPromptShown = Typed<Bool>(rawValue: ._betaPromptShown)
+  case _betaTimeline = 1002
+  static let betaTimeline = Typed<Bool>(rawValue: ._betaTimeline)
+  case _enableBackup = 1003
+  static let enableBackup = Typed<Bool>(rawValue: ._enableBackup)
+  case _useWifiForUploadVideos = 1004
+  static let useWifiForUploadVideos = Typed<Bool>(rawValue: ._useWifiForUploadVideos)
+  case _useWifiForUploadPhotos = 1005
+  static let useWifiForUploadPhotos = Typed<Bool>(rawValue: ._useWifiForUploadPhotos)
+  case _needBetaMigration = 1006
+  static let needBetaMigration = Typed<Bool>(rawValue: ._needBetaMigration)
+  case _shouldResetSync = 1007
+  static let shouldResetSync = Typed<Bool>(rawValue: ._shouldResetSync)
+
+  struct Typed<T>: RawRepresentable {
+    let rawValue: StoreKey
+
+    @_transparent
+    init(rawValue value: StoreKey) {
+      self.rawValue = value
+    }
+  }
+}
+
+enum BackupSelection: Int, QueryBindable {
+  case selected, none, excluded
+}
+
+enum AvatarColor: Int, QueryBindable {
+  case primary, pink, red, yellow, blue, green, purple, orange, gray, amber
+}
+
+enum AlbumUserRole: Int, QueryBindable {
+  case editor, viewer
+}
+
+enum MemoryType: Int, QueryBindable {
+  case onThisDay
+}
diff --git a/mobile/ios/Runner/Schemas/Store.swift b/mobile/ios/Runner/Schemas/Store.swift
new file mode 100644
index 0000000000..ee5280b6c0
--- /dev/null
+++ b/mobile/ios/Runner/Schemas/Store.swift
@@ -0,0 +1,146 @@
+import SQLiteData
+
+enum StoreError: Error {
+  case invalidJSON(String)
+  case invalidURL(String)
+  case encodingFailed
+}
+
+protocol StoreConvertible {
+  associatedtype StorageType
+  static func fromValue(_ value: StorageType) throws(StoreError) -> Self
+  static func toValue(_ value: Self) throws(StoreError) -> StorageType
+}
+
+extension Int: StoreConvertible {
+  static func fromValue(_ value: Int) -> Int { value }
+  static func toValue(_ value: Int) -> Int { value }
+}
+
+extension Bool: StoreConvertible {
+  static func fromValue(_ value: Int) -> Bool { value == 1 }
+  static func toValue(_ value: Bool) -> Int { value ? 1 : 0 }
+}
+
+extension Date: StoreConvertible {
+  static func fromValue(_ value: Int) -> Date { Date(timeIntervalSince1970: TimeInterval(value) / 1000) }
+  static func toValue(_ value: Date) -> Int { Int(value.timeIntervalSince1970 * 1000) }
+}
+
+extension String: StoreConvertible {
+  static func fromValue(_ value: String) -> String { value }
+  static func toValue(_ value: String) -> String { value }
+}
+
+extension URL: StoreConvertible {
+  static func fromValue(_ value: String) throws(StoreError) -> URL {
+    guard let url = URL(string: value) else {
+      throw StoreError.invalidURL(value)
+    }
+    return url
+  }
+  static func toValue(_ value: URL) -> String { value.absoluteString }
+}
+
+extension StoreConvertible where Self: Codable, StorageType == String {
+  static var jsonDecoder: JSONDecoder { JSONDecoder() }
+  static var jsonEncoder: JSONEncoder { JSONEncoder() }
+
+  static func fromValue(_ value: String) throws(StoreError) -> Self {
+    do {
+      return try jsonDecoder.decode(Self.self, from: Data(value.utf8))
+    } catch {
+      throw StoreError.invalidJSON(value)
+    }
+  }
+
+  static func toValue(_ value: Self) throws(StoreError) -> String {
+    let encoded: Data
+    do {
+      encoded = try jsonEncoder.encode(value)
+    } catch {
+      throw StoreError.encodingFailed
+    }
+
+    guard let string = String(data: encoded, encoding: .utf8) else {
+      throw StoreError.encodingFailed
+    }
+    return string
+  }
+}
+
+extension Array: StoreConvertible where Element: Codable {
+  typealias StorageType = String
+}
+
+extension Dictionary: StoreConvertible where Key == String, Value: Codable {
+  typealias StorageType = String
+}
+
+class StoreRepository {
+  private let db: DatabasePool
+
+  init(db: DatabasePool) {
+    self.db = db
+  }
+
+  func get<T: StoreConvertible>(_ key: StoreKey.Typed<T>) throws -> T? where T.StorageType == Int {
+    let query = Store.select(\.intValue).where { $0.id.eq(key.rawValue) }
+    if let value = try db.read({ conn in try query.fetchOne(conn) }) ?? nil {
+      return try T.fromValue(value)
+    }
+    return nil
+  }
+
+  func get<T: StoreConvertible>(_ key: StoreKey.Typed<T>) throws -> T? where T.StorageType == String {
+    let query = Store.select(\.stringValue).where { $0.id.eq(key.rawValue) }
+    if let value = try db.read({ conn in try query.fetchOne(conn) }) ?? nil {
+      return try T.fromValue(value)
+    }
+    return nil
+  }
+
+  func get<T: StoreConvertible>(_ key: StoreKey.Typed<T>) async throws -> T? where T.StorageType == Int {
+    let query = Store.select(\.intValue).where { $0.id.eq(key.rawValue) }
+    if let value = try await db.read({ conn in try query.fetchOne(conn) }) ?? nil {
+      return try T.fromValue(value)
+    }
+    return nil
+  }
+
+  func get<T: StoreConvertible>(_ key: StoreKey.Typed<T>) async throws -> T? where T.StorageType == String {
+    let query = Store.select(\.stringValue).where { $0.id.eq(key.rawValue) }
+    if let value = try await db.read({ conn in try query.fetchOne(conn) }) ?? nil {
+      return try T.fromValue(value)
+    }
+    return nil
+  }
+
+  func set<T: StoreConvertible>(_ key: StoreKey.Typed<T>, value: T) throws where T.StorageType == Int {
+    let value = try T.toValue(value)
+    try db.write { conn in
+      try Store.upsert { Store(id: key.rawValue, stringValue: nil, intValue: value) }.execute(conn)
+    }
+  }
+
+  func set<T: StoreConvertible>(_ key: StoreKey.Typed<T>, value: T) throws where T.StorageType == String {
+    let value = try T.toValue(value)
+    try db.write { conn in
+      try Store.upsert { Store(id: key.rawValue, stringValue: value, intValue: nil) }.execute(conn)
+    }
+  }
+
+  func set<T: StoreConvertible>(_ key: StoreKey.Typed<T>, value: T) async throws where T.StorageType == Int {
+    let value = try T.toValue(value)
+    try await db.write { conn in
+      try Store.upsert { Store(id: key.rawValue, stringValue: nil, intValue: value) }.execute(conn)
+    }
+  }
+
+  func set<T: StoreConvertible>(_ key: StoreKey.Typed<T>, value: T) async throws where T.StorageType == String {
+    let value = try T.toValue(value)
+    try await db.write { conn in
+      try Store.upsert { Store(id: key.rawValue, stringValue: value, intValue: nil) }.execute(conn)
+    }
+  }
+}
diff --git a/mobile/ios/Runner/Schemas/Tables.swift b/mobile/ios/Runner/Schemas/Tables.swift
new file mode 100644
index 0000000000..c256b0d0ed
--- /dev/null
+++ b/mobile/ios/Runner/Schemas/Tables.swift
@@ -0,0 +1,237 @@
+import GRDB
+import SQLiteData
+
+@Table("asset_face_entity")
+struct AssetFace {
+  let id: String
+  let assetId: String
+  let personId: String?
+  let imageWidth: Int
+  let imageHeight: Int
+  let boundingBoxX1: Int
+  let boundingBoxY1: Int
+  let boundingBoxX2: Int
+  let boundingBoxY2: Int
+  let sourceType: String
+}
+
+@Table("auth_user_entity")
+struct AuthUser {
+  let id: String
+  let name: String
+  let email: String
+  let isAdmin: Bool
+  let hasProfileImage: Bool
+  let profileChangedAt: Date
+  let avatarColor: AvatarColor
+  let quotaSizeInBytes: Int
+  let quotaUsageInBytes: Int
+  let pinCode: String?
+}
+
+@Table("local_album_entity")
+struct LocalAlbum {
+  let id: String
+  let backupSelection: BackupSelection
+  let linkedRemoteAlbumId: String?
+  let marker_: Bool?
+  let name: String
+  let isIosSharedAlbum: Bool
+  let updatedAt: Date
+}
+
+@Table("local_album_asset_entity")
+struct LocalAlbumAsset {
+  let id: ID
+  let marker_: String?
+
+  @Selection
+  struct ID {
+    let assetId: String
+    let albumId: String
+  }
+}
+
+@Table("local_asset_entity")
+struct LocalAsset {
+  let id: String
+  let checksum: String?
+  let createdAt: Date
+  let durationInSeconds: Int?
+  let height: Int?
+  let isFavorite: Bool
+  let name: String
+  let orientation: String
+  let type: Int
+  let updatedAt: Date
+  let width: Int?
+}
+
+@Table("memory_asset_entity")
+struct MemoryAsset {
+  let id: ID
+
+  @Selection
+  struct ID {
+    let assetId: String
+    let albumId: String
+  }
+}
+
+@Table("memory_entity")
+struct Memory {
+  let id: String
+  let createdAt: Date
+  let updatedAt: Date
+  let deletedAt: Date?
+  let ownerId: String
+  let type: MemoryType
+  let data: String
+  let isSaved: Bool
+  let memoryAt: Date
+  let seenAt: Date?
+  let showAt: Date?
+  let hideAt: Date?
+}
+
+@Table("partner_entity")
+struct Partner {
+  let id: ID
+  let inTimeline: Bool
+
+  @Selection
+  struct ID {
+    let sharedById: String
+    let sharedWithId: String
+  }
+}
+
+@Table("person_entity")
+struct Person {
+  let id: String
+  let createdAt: Date
+  let updatedAt: Date
+  let ownerId: String
+  let name: String
+  let faceAssetId: String?
+  let isFavorite: Bool
+  let isHidden: Bool
+  let color: String?
+  let birthDate: Date?
+}
+
+@Table("remote_album_entity")
+struct RemoteAlbum {
+  let id: String
+  let createdAt: Date
+  let description: String?
+  let isActivityEnabled: Bool
+  let name: String
+  let order: Int
+  let ownerId: String
+  let thumbnailAssetId: String?
+  let updatedAt: Date
+}
+
+@Table("remote_album_asset_entity")
+struct RemoteAlbumAsset {
+  let id: ID
+
+  @Selection
+  struct ID {
+    let assetId: String
+    let albumId: String
+  }
+}
+
+@Table("remote_album_user_entity")
+struct RemoteAlbumUser {
+  let id: ID
+  let role: AlbumUserRole
+
+  @Selection
+  struct ID {
+    let albumId: String
+    let userId: String
+  }
+}
+
+@Table("remote_asset_entity")
+struct RemoteAsset {
+  let id: String
+  let checksum: String?
+  let deletedAt: Date?
+  let isFavorite: Int
+  let libraryId: String?
+  let livePhotoVideoId: String?
+  let localDateTime: Date?
+  let orientation: String
+  let ownerId: String
+  let stackId: String?
+  let visibility: Int
+}
+
+@Table("remote_exif_entity")
+struct RemoteExif {
+  @Column(primaryKey: true)
+  let assetId: String
+  let city: String?
+  let state: String?
+  let country: String?
+  let dateTimeOriginal: Date?
+  let description: String?
+  let height: Int?
+  let width: Int?
+  let exposureTime: String?
+  let fNumber: Double?
+  let fileSize: Int?
+  let focalLength: Double?
+  let latitude: Double?
+  let longitude: Double?
+  let iso: Int?
+  let make: String?
+  let model: String?
+  let lens: String?
+  let orientation: String?
+  let timeZone: String?
+  let rating: Int?
+  let projectionType: String?
+}
+
+@Table("stack_entity")
+struct Stack {
+  let id: String
+  let createdAt: Date
+  let updatedAt: Date
+  let ownerId: String
+  let primaryAssetId: String
+}
+
+@Table("store_entity")
+struct Store {
+  let id: StoreKey
+  let stringValue: String?
+  let intValue: Int?
+}
+
+@Table("user_entity")
+struct User {
+  let id: String
+  let name: String
+  let email: String
+  let hasProfileImage: Bool
+  let profileChangedAt: Date
+  let avatarColor: AvatarColor
+}
+
+@Table("user_metadata_entity")
+struct UserMetadata {
+  let id: ID
+  let value: Data
+
+  @Selection
+  struct ID {
+    let userId: String
+    let key: Date
+  }
+}

From dea95ac2e6ee3e41441886ca59376200978c1b55 Mon Sep 17 00:00:00 2001
From: Jason Rasmussen <jason@rasm.me>
Date: Mon, 10 Nov 2025 15:49:02 -0500
Subject: [PATCH 70/84] refactor: shared-link service (#23770)

---
 pnpm-lock.yaml                                | 18 ++---
 web/package.json                              |  2 +-
 web/src/lib/components/ActionButton.svelte    | 19 +++++
 .../album-page/album-shared-link.svelte       | 20 ++---
 .../search-bar/search-bar.svelte              |  2 +-
 .../actions/shared-link-copy.svelte           | 28 -------
 .../actions/shared-link-delete.svelte         | 26 ------
 .../actions/shared-link-edit.svelte           | 33 --------
 .../sharedlinks-page/shared-link-card.svelte  | 30 +++----
 web/src/lib/managers/event-manager.svelte.ts  |  1 +
 web/src/lib/services/shared-link.service.ts   | 80 +++++++++++++++++--
 .../shared-links/[[id=id]]/+page.svelte       | 32 ++------
 12 files changed, 128 insertions(+), 163 deletions(-)
 create mode 100644 web/src/lib/components/ActionButton.svelte
 delete mode 100644 web/src/lib/components/sharedlinks-page/actions/shared-link-copy.svelte
 delete mode 100644 web/src/lib/components/sharedlinks-page/actions/shared-link-delete.svelte
 delete mode 100644 web/src/lib/components/sharedlinks-page/actions/shared-link-edit.svelte

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index da1dd18d97..00087e91e0 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -684,8 +684,8 @@ importers:
         specifier: file:../open-api/typescript-sdk
         version: link:../open-api/typescript-sdk
       '@immich/ui':
-        specifier: ^0.40.2
-        version: 0.40.2(@internationalized/date@3.8.2)(svelte@5.43.0)
+        specifier: ^0.43.0
+        version: 0.43.0(@internationalized/date@3.8.2)(svelte@5.43.0)
       '@mapbox/mapbox-gl-rtl-text':
         specifier: 0.2.3
         version: 0.2.3(mapbox-gl@1.13.3)
@@ -2776,13 +2776,13 @@ packages:
   '@immich/justified-layout-wasm@0.4.3':
     resolution: {integrity: sha512-fpcQ7zPhP3Cp1bEXhONVYSUeIANa2uzaQFGKufUZQo5FO7aFT77szTVChhlCy4XaVy5R4ZvgSkA/1TJmeORz7Q==}
 
-  '@immich/svelte-markdown-preprocess@0.0.1':
-    resolution: {integrity: sha512-1vWoT4LO6fEyxrKwLKiNFECEkRVbuvpYPDvA7LavObTt2ijnonPYBDgfTwCPTofjxcocIGYUayv3CzgOzFiMOA==}
+  '@immich/svelte-markdown-preprocess@0.1.0':
+    resolution: {integrity: sha512-jgSOJEGLPKEXQCNRI4r4YUayeM2b0ZYLdzgKGl891jZBhOQIetlY7rU44kPpV1AA3/8wGDwNFKduIQZZ/qJYzg==}
     peerDependencies:
       svelte: ^5.0.0
 
-  '@immich/ui@0.40.2':
-    resolution: {integrity: sha512-6NS4yVx0VoyH+AaM7TISDaoIzZe3RuDOi6xMkK2LrOPQbKwTuheD2iagxsRYzUtJ9IPrmCPrwRBc9Jq5BkvmBQ==}
+  '@immich/ui@0.43.0':
+    resolution: {integrity: sha512-dwWIURsGghsbeFnqxCqUyWslyRU2vQjih7uewNr0nsW68bJ5/esl+V/Kiw2opiNiwI4Q3HEcuTRY57k4Hq+X3Q==}
     peerDependencies:
       svelte: ^5.0.0
 
@@ -14346,13 +14346,13 @@ snapshots:
 
   '@immich/justified-layout-wasm@0.4.3': {}
 
-  '@immich/svelte-markdown-preprocess@0.0.1(svelte@5.43.0)':
+  '@immich/svelte-markdown-preprocess@0.1.0(svelte@5.43.0)':
     dependencies:
       svelte: 5.43.0
 
-  '@immich/ui@0.40.2(@internationalized/date@3.8.2)(svelte@5.43.0)':
+  '@immich/ui@0.43.0(@internationalized/date@3.8.2)(svelte@5.43.0)':
     dependencies:
-      '@immich/svelte-markdown-preprocess': 0.0.1(svelte@5.43.0)
+      '@immich/svelte-markdown-preprocess': 0.1.0(svelte@5.43.0)
       '@mdi/js': 7.4.47
       bits-ui: 2.9.8(@internationalized/date@3.8.2)(svelte@5.43.0)
       luxon: 3.7.2
diff --git a/web/package.json b/web/package.json
index b9ec394b5d..2a93230c24 100644
--- a/web/package.json
+++ b/web/package.json
@@ -28,7 +28,7 @@
     "@formatjs/icu-messageformat-parser": "^2.9.8",
     "@immich/justified-layout-wasm": "^0.4.3",
     "@immich/sdk": "file:../open-api/typescript-sdk",
-    "@immich/ui": "^0.40.2",
+    "@immich/ui": "^0.43.0",
     "@mapbox/mapbox-gl-rtl-text": "0.2.3",
     "@mdi/js": "^7.4.47",
     "@photo-sphere-viewer/core": "^5.11.5",
diff --git a/web/src/lib/components/ActionButton.svelte b/web/src/lib/components/ActionButton.svelte
new file mode 100644
index 0000000000..1bbbf642e0
--- /dev/null
+++ b/web/src/lib/components/ActionButton.svelte
@@ -0,0 +1,19 @@
+<script lang="ts">
+  import { IconButton, type MenuItem } from '@immich/ui';
+
+  type Props = {
+    action: MenuItem;
+  };
+
+  const { action }: Props = $props();
+  const { title, icon, onSelect } = $derived(action);
+</script>
+
+<IconButton
+  shape="round"
+  color="secondary"
+  variant="ghost"
+  {icon}
+  aria-label={title}
+  onclick={(event: Event) => onSelect?.({ event, item: action })}
+/>
diff --git a/web/src/lib/components/album-page/album-shared-link.svelte b/web/src/lib/components/album-page/album-shared-link.svelte
index 580a865ae6..1b6db6ff69 100644
--- a/web/src/lib/components/album-page/album-shared-link.svelte
+++ b/web/src/lib/components/album-page/album-shared-link.svelte
@@ -1,10 +1,9 @@
 <script lang="ts">
-  import SharedLinkCopy from '$lib/components/sharedlinks-page/actions/shared-link-copy.svelte';
-  import { handleShowSharedLinkQrCode } from '$lib/services/shared-link.service';
+  import ActionButton from '$lib/components/ActionButton.svelte';
+  import { getSharedLinkActions } from '$lib/services/shared-link.service';
   import { locale } from '$lib/stores/preferences.store';
   import type { AlbumResponseDto, SharedLinkResponseDto } from '@immich/sdk';
-  import { IconButton, Text } from '@immich/ui';
-  import { mdiQrcode } from '@mdi/js';
+  import { Text } from '@immich/ui';
   import { DateTime } from 'luxon';
   import { t } from 'svelte-i18n';
 
@@ -32,6 +31,8 @@
     ]
       .filter(Boolean)
       .join(' • ');
+
+  const SharedLinkActions = $derived(getSharedLinkActions($t, sharedLink));
 </script>
 
 <div class="flex justify-between items-center">
@@ -40,14 +41,7 @@
     <Text size="tiny" color="muted">{getShareProperties()}</Text>
   </div>
   <div class="flex">
-    <IconButton
-      aria-label={$t('view_qr_code')}
-      shape="round"
-      color="secondary"
-      variant="ghost"
-      icon={mdiQrcode}
-      onclick={() => handleShowSharedLinkQrCode(sharedLink)}
-    />
-    <SharedLinkCopy {sharedLink} />
+    <ActionButton action={SharedLinkActions.ViewQrCode} />
+    <ActionButton action={SharedLinkActions.Copy} />
   </div>
 </div>
diff --git a/web/src/lib/components/shared-components/search-bar/search-bar.svelte b/web/src/lib/components/shared-components/search-bar/search-bar.svelte
index 8c1d2c5d08..ea1147fe06 100644
--- a/web/src/lib/components/shared-components/search-bar/search-bar.svelte
+++ b/web/src/lib/components/shared-components/search-bar/search-bar.svelte
@@ -92,7 +92,7 @@
     }
 
     const result = modalManager.open(SearchFilterModal, { searchQuery });
-    close = () => result.close(undefined);
+    close = () => result.close();
     closeDropdown();
 
     const searchResult = await result.onClose;
diff --git a/web/src/lib/components/sharedlinks-page/actions/shared-link-copy.svelte b/web/src/lib/components/sharedlinks-page/actions/shared-link-copy.svelte
deleted file mode 100644
index 06369e7792..0000000000
--- a/web/src/lib/components/sharedlinks-page/actions/shared-link-copy.svelte
+++ /dev/null
@@ -1,28 +0,0 @@
-<script lang="ts">
-  import MenuOption from '$lib/components/shared-components/context-menu/menu-option.svelte';
-  import { handleCopySharedLinkUrl } from '$lib/services/shared-link.service';
-  import type { SharedLinkResponseDto } from '@immich/sdk';
-  import { IconButton } from '@immich/ui';
-  import { mdiContentCopy } from '@mdi/js';
-  import { t } from 'svelte-i18n';
-
-  interface Props {
-    sharedLink: SharedLinkResponseDto;
-    menuItem?: boolean;
-  }
-
-  let { sharedLink, menuItem = false }: Props = $props();
-</script>
-
-{#if menuItem}
-  <MenuOption text={$t('copy_link')} icon={mdiContentCopy} onClick={() => handleCopySharedLinkUrl(sharedLink)} />
-{:else}
-  <IconButton
-    color="secondary"
-    shape="round"
-    variant="ghost"
-    aria-label={$t('copy_link')}
-    icon={mdiContentCopy}
-    onclick={() => handleCopySharedLinkUrl(sharedLink)}
-  />
-{/if}
diff --git a/web/src/lib/components/sharedlinks-page/actions/shared-link-delete.svelte b/web/src/lib/components/sharedlinks-page/actions/shared-link-delete.svelte
deleted file mode 100644
index f844d8483e..0000000000
--- a/web/src/lib/components/sharedlinks-page/actions/shared-link-delete.svelte
+++ /dev/null
@@ -1,26 +0,0 @@
-<script lang="ts">
-  import MenuOption from '$lib/components/shared-components/context-menu/menu-option.svelte';
-  import { IconButton } from '@immich/ui';
-  import { mdiDelete } from '@mdi/js';
-  import { t } from 'svelte-i18n';
-
-  interface Props {
-    menuItem?: boolean;
-    onDelete: () => void;
-  }
-
-  let { menuItem = false, onDelete }: Props = $props();
-</script>
-
-{#if menuItem}
-  <MenuOption text={$t('delete_link')} icon={mdiDelete} onClick={onDelete} />
-{:else}
-  <IconButton
-    color="secondary"
-    shape="round"
-    variant="ghost"
-    aria-label={$t('delete_link')}
-    icon={mdiDelete}
-    onclick={onDelete}
-  />
-{/if}
diff --git a/web/src/lib/components/sharedlinks-page/actions/shared-link-edit.svelte b/web/src/lib/components/sharedlinks-page/actions/shared-link-edit.svelte
deleted file mode 100644
index 7482c1b6eb..0000000000
--- a/web/src/lib/components/sharedlinks-page/actions/shared-link-edit.svelte
+++ /dev/null
@@ -1,33 +0,0 @@
-<script lang="ts">
-  import { goto } from '$app/navigation';
-  import MenuOption from '$lib/components/shared-components/context-menu/menu-option.svelte';
-  import { AppRoute } from '$lib/constants';
-  import type { SharedLinkResponseDto } from '@immich/sdk';
-  import { IconButton } from '@immich/ui';
-  import { mdiCircleEditOutline } from '@mdi/js';
-  import { t } from 'svelte-i18n';
-
-  interface Props {
-    menuItem?: boolean;
-    sharedLink: SharedLinkResponseDto;
-  }
-
-  let { sharedLink, menuItem = false }: Props = $props();
-
-  const onEdit = async () => {
-    await goto(`${AppRoute.SHARED_LINKS}/${sharedLink.id}`);
-  };
-</script>
-
-{#if menuItem}
-  <MenuOption text={$t('edit_link')} icon={mdiCircleEditOutline} onClick={onEdit} />
-{:else}
-  <IconButton
-    shape="round"
-    color="secondary"
-    variant="ghost"
-    aria-label={$t('edit_link')}
-    icon={mdiCircleEditOutline}
-    onclick={onEdit}
-  />
-{/if}
diff --git a/web/src/lib/components/sharedlinks-page/shared-link-card.svelte b/web/src/lib/components/sharedlinks-page/shared-link-card.svelte
index f811f60e77..b2c6cf296d 100644
--- a/web/src/lib/components/sharedlinks-page/shared-link-card.svelte
+++ b/web/src/lib/components/sharedlinks-page/shared-link-card.svelte
@@ -1,23 +1,19 @@
 <script lang="ts">
-  import ButtonContextMenu from '$lib/components/shared-components/context-menu/button-context-menu.svelte';
-  import SharedLinkCopy from '$lib/components/sharedlinks-page/actions/shared-link-copy.svelte';
-  import SharedLinkDelete from '$lib/components/sharedlinks-page/actions/shared-link-delete.svelte';
-  import SharedLinkEdit from '$lib/components/sharedlinks-page/actions/shared-link-edit.svelte';
+  import ActionButton from '$lib/components/ActionButton.svelte';
   import ShareCover from '$lib/components/sharedlinks-page/covers/share-cover.svelte';
   import { AppRoute } from '$lib/constants';
   import Badge from '$lib/elements/Badge.svelte';
+  import { getSharedLinkActions } from '$lib/services/shared-link.service';
   import { locale } from '$lib/stores/preferences.store';
   import { SharedLinkType, type SharedLinkResponseDto } from '@immich/sdk';
-  import { mdiDotsVertical } from '@mdi/js';
   import { DateTime, type ToRelativeUnit } from 'luxon';
   import { t } from 'svelte-i18n';
 
   interface Props {
     sharedLink: SharedLinkResponseDto;
-    onDelete: () => void;
   }
 
-  let { sharedLink, onDelete }: Props = $props();
+  let { sharedLink }: Props = $props();
 
   let now = DateTime.now();
   let expiresAt = $derived(sharedLink.expiresAt ? DateTime.fromISO(sharedLink.expiresAt) : undefined);
@@ -34,6 +30,8 @@
       }
     }
   };
+
+  const SharedLinkActions = $derived(getSharedLinkActions($t, sharedLink));
 </script>
 
 <div
@@ -97,23 +95,13 @@
   </svelte:element>
   <div class="flex flex-auto flex-col place-content-center place-items-end text-end ms-4">
     <div class="sm:flex hidden">
-      <SharedLinkEdit {sharedLink} />
-      <SharedLinkCopy {sharedLink} />
-      <SharedLinkDelete {onDelete} />
+      <ActionButton action={SharedLinkActions.Edit} />
+      <ActionButton action={SharedLinkActions.Copy} />
+      <ActionButton action={SharedLinkActions.Delete} />
     </div>
 
     <div class="sm:hidden">
-      <ButtonContextMenu
-        color="primary"
-        title={$t('shared_link_options')}
-        icon={mdiDotsVertical}
-        size="large"
-        hideContent
-      >
-        <SharedLinkEdit menuItem {sharedLink} />
-        <SharedLinkCopy menuItem {sharedLink} />
-        <SharedLinkDelete menuItem {onDelete} />
-      </ButtonContextMenu>
+      <ActionButton action={SharedLinkActions.ContextMenu} />
     </div>
   </div>
 </div>
diff --git a/web/src/lib/managers/event-manager.svelte.ts b/web/src/lib/managers/event-manager.svelte.ts
index 44ee524658..e7d50f026d 100644
--- a/web/src/lib/managers/event-manager.svelte.ts
+++ b/web/src/lib/managers/event-manager.svelte.ts
@@ -10,6 +10,7 @@ export type Events = {
   ThemeChange: [ThemeSetting];
   SharedLinkCreate: [SharedLinkResponseDto];
   SharedLinkUpdate: [SharedLinkResponseDto];
+  SharedLinkDelete: [SharedLinkResponseDto];
 };
 
 type Listener<EventMap extends Record<string, unknown[]>, K extends keyof EventMap> = (...params: EventMap[K]) => void;
diff --git a/web/src/lib/services/shared-link.service.ts b/web/src/lib/services/shared-link.service.ts
index 529b6b23b4..a48f0b5965 100644
--- a/web/src/lib/services/shared-link.service.ts
+++ b/web/src/lib/services/shared-link.service.ts
@@ -1,3 +1,5 @@
+import { goto } from '$app/navigation';
+import { AppRoute } from '$lib/constants';
 import { eventManager } from '$lib/managers/event-manager.svelte';
 import QrCodeModal from '$lib/modals/QrCodeModal.svelte';
 import { serverConfig } from '$lib/stores/server-config.store';
@@ -6,15 +8,58 @@ import { handleError } from '$lib/utils/handle-error';
 import { getFormatter } from '$lib/utils/i18n';
 import {
   createSharedLink,
+  removeSharedLink,
   updateSharedLink,
   type SharedLinkCreateDto,
   type SharedLinkEditDto,
   type SharedLinkResponseDto,
 } from '@immich/sdk';
-import { modalManager, toastManager } from '@immich/ui';
+import { MenuItemType, menuManager, modalManager, toastManager, type MenuItem } from '@immich/ui';
+import { mdiCircleEditOutline, mdiContentCopy, mdiDelete, mdiDotsVertical, mdiQrcode } from '@mdi/js';
+import type { MessageFormatter } from 'svelte-i18n';
 import { get } from 'svelte/store';
 
-const makeSharedLinkUrl = (sharedLink: SharedLinkResponseDto) => {
+export const getSharedLinkActions = ($t: MessageFormatter, sharedLink: SharedLinkResponseDto) => {
+  const Edit: MenuItem = {
+    title: $t('edit_link'),
+    icon: mdiCircleEditOutline,
+    onSelect: () => void goto(`${AppRoute.SHARED_LINKS}/${sharedLink.id}`),
+  };
+
+  const Delete: MenuItem = {
+    title: $t('delete_link'),
+    icon: mdiDelete,
+    color: 'danger',
+    onSelect: () => void handleDeleteSharedLink(sharedLink),
+  };
+
+  const Copy: MenuItem = {
+    title: $t('copy_link'),
+    icon: mdiContentCopy,
+    onSelect: () => void copyToClipboard(asUrl(sharedLink)),
+  };
+
+  const ViewQrCode: MenuItem = {
+    title: $t('view_qr_code'),
+    icon: mdiQrcode,
+    onSelect: () => void handleShowSharedLinkQrCode(sharedLink),
+  };
+
+  const ContextMenu: MenuItem = {
+    title: $t('shared_link_options'),
+    icon: mdiDotsVertical,
+    onSelect: ({ event }) =>
+      void menuManager.show({
+        target: event.currentTarget as HTMLElement,
+        position: 'top-right',
+        items: [Edit, Copy, MenuItemType.Divider, Delete],
+      }),
+  };
+
+  return { Edit, Delete, Copy, ViewQrCode, ContextMenu };
+};
+
+const asUrl = (sharedLink: SharedLinkResponseDto) => {
   const path = sharedLink.slug ? `s/${sharedLink.slug}` : `share/${sharedLink.key}`;
   return new URL(path, get(serverConfig).externalDomain || globalThis.location.origin).href;
 };
@@ -54,11 +99,34 @@ export const handleUpdateSharedLink = async (sharedLink: SharedLinkResponseDto,
   }
 };
 
-export const handleShowSharedLinkQrCode = async (sharedLink: SharedLinkResponseDto) => {
+export const handleDeleteSharedLink = async (sharedLink: SharedLinkResponseDto): Promise<boolean> => {
   const $t = await getFormatter();
-  await modalManager.show(QrCodeModal, { title: $t('view_link'), value: makeSharedLinkUrl(sharedLink) });
+
+  const success = await modalManager.showDialog({
+    title: $t('delete_shared_link'),
+    prompt: $t('confirm_delete_shared_link'),
+    confirmText: $t('delete'),
+  });
+
+  if (!success) {
+    return false;
+  }
+
+  try {
+    await removeSharedLink({ id: sharedLink.id });
+
+    eventManager.emit('SharedLinkDelete', sharedLink);
+
+    toastManager.success($t('deleted_shared_link'));
+
+    return true;
+  } catch (error) {
+    handleError(error, $t('errors.unable_to_delete_shared_link'));
+    return false;
+  }
 };
 
-export const handleCopySharedLinkUrl = async (sharedLink: SharedLinkResponseDto) => {
-  await copyToClipboard(makeSharedLinkUrl(sharedLink));
+const handleShowSharedLinkQrCode = async (sharedLink: SharedLinkResponseDto) => {
+  const $t = await getFormatter();
+  await modalManager.show(QrCodeModal, { title: $t('view_link'), value: asUrl(sharedLink) });
 };
diff --git a/web/src/routes/(user)/shared-links/[[id=id]]/+page.svelte b/web/src/routes/(user)/shared-links/[[id=id]]/+page.svelte
index 4b63ce71a1..e0239a2a43 100644
--- a/web/src/routes/(user)/shared-links/[[id=id]]/+page.svelte
+++ b/web/src/routes/(user)/shared-links/[[id=id]]/+page.svelte
@@ -7,9 +7,7 @@
   import { AppRoute } from '$lib/constants';
   import GroupTab from '$lib/elements/GroupTab.svelte';
   import SharedLinkCreateModal from '$lib/modals/SharedLinkCreateModal.svelte';
-  import { handleError } from '$lib/utils/handle-error';
-  import { getAllSharedLinks, removeSharedLink, SharedLinkType, type SharedLinkResponseDto } from '@immich/sdk';
-  import { modalManager, toastManager } from '@immich/ui';
+  import { getAllSharedLinks, SharedLinkType, type SharedLinkResponseDto } from '@immich/sdk';
   import { onMount } from 'svelte';
   import { t } from 'svelte-i18n';
   import type { PageData } from './$types';
@@ -31,26 +29,6 @@
     await refresh();
   });
 
-  const handleDeleteLink = async (id: string) => {
-    const isConfirmed = await modalManager.showDialog({
-      title: $t('delete_shared_link'),
-      prompt: $t('confirm_delete_shared_link'),
-      confirmText: $t('delete'),
-    });
-
-    if (!isConfirmed) {
-      return;
-    }
-
-    try {
-      await removeSharedLink({ id });
-      toastManager.success($t('deleted_shared_link'));
-      await refresh();
-    } catch (error) {
-      handleError(error, $t('errors.unable_to_delete_shared_link'));
-    }
-  };
-
   type Filter = 'all' | 'album' | 'individual';
 
   const filterMap: Record<Filter, string> = {
@@ -87,9 +65,13 @@
       sharedLinks[index] = sharedLink;
     }
   };
+
+  const onSharedLinkDelete = (sharedLink: SharedLinkResponseDto) => {
+    sharedLinks = sharedLinks.filter(({ id }) => id !== sharedLink.id);
+  };
 </script>
 
-<OnEvents {onSharedLinkUpdate} />
+<OnEvents {onSharedLinkUpdate} {onSharedLinkDelete} />
 
 <UserPageLayout title={data.meta.title}>
   {#snippet buttons()}
@@ -108,7 +90,7 @@
     {:else}
       <div class="flex flex-col gap-2">
         {#each filteredSharedLinks as sharedLink (sharedLink.id)}
-          <SharedLinkCard {sharedLink} onDelete={() => handleDeleteLink(sharedLink.id)} />
+          <SharedLinkCard {sharedLink} />
         {/each}
       </div>
     {/if}

From d5c5bdffcb2710dae78a5a4de59d4d0982d50bbd Mon Sep 17 00:00:00 2001
From: Jason Rasmussen <jason@rasm.me>
Date: Mon, 10 Nov 2025 16:10:29 -0500
Subject: [PATCH 71/84] refactor: album delete (#23773)

---
 .../components/album-page/albums-list.svelte  | 45 +++++--------------
 web/src/lib/managers/event-manager.svelte.ts  |  5 ++-
 web/src/lib/services/album.service.ts         | 39 +++++++++++++++-
 .../[[assetId=id]]/+page.svelte               | 39 +++++++---------
 4 files changed, 69 insertions(+), 59 deletions(-)

diff --git a/web/src/lib/components/album-page/albums-list.svelte b/web/src/lib/components/album-page/albums-list.svelte
index fb8d044b1a..bb826110b7 100644
--- a/web/src/lib/components/album-page/albums-list.svelte
+++ b/web/src/lib/components/album-page/albums-list.svelte
@@ -3,6 +3,7 @@
   import { resolve } from '$app/paths';
   import AlbumCardGroup from '$lib/components/album-page/album-card-group.svelte';
   import AlbumsTable from '$lib/components/album-page/albums-table.svelte';
+  import OnEvents from '$lib/components/OnEvents.svelte';
   import MenuOption from '$lib/components/shared-components/context-menu/menu-option.svelte';
   import RightClickContextMenu from '$lib/components/shared-components/context-menu/right-click-context-menu.svelte';
   import ToastAction from '$lib/components/ToastAction.svelte';
@@ -10,7 +11,7 @@
   import AlbumEditModal from '$lib/modals/AlbumEditModal.svelte';
   import AlbumShareModal from '$lib/modals/AlbumShareModal.svelte';
   import SharedLinkCreateModal from '$lib/modals/SharedLinkCreateModal.svelte';
-  import { handleConfirmAlbumDelete, handleDownloadAlbum } from '$lib/services/album.service';
+  import { handleDeleteAlbum, handleDownloadAlbum } from '$lib/services/album.service';
   import {
     AlbumFilter,
     AlbumGroupBy,
@@ -26,7 +27,7 @@
   import type { ContextMenuPosition } from '$lib/utils/context-menu';
   import { handleError } from '$lib/utils/handle-error';
   import { normalizeSearchString } from '$lib/utils/string-utils';
-  import { addUsersToAlbum, deleteAlbum, isHttpError, type AlbumResponseDto, type AlbumUserAddDto } from '@immich/sdk';
+  import { addUsersToAlbum, type AlbumResponseDto, type AlbumUserAddDto } from '@immich/sdk';
   import { modalManager, toastManager } from '@immich/ui';
   import { mdiDeleteOutline, mdiDownload, mdiRenameOutline, mdiShareVariantOutline } from '@mdi/js';
   import { groupBy } from 'lodash-es';
@@ -210,25 +211,6 @@
     isOpen = false;
   };
 
-  const handleDeleteAlbum = async (albumToDelete: AlbumResponseDto) => {
-    try {
-      await deleteAlbum({
-        id: albumToDelete.id,
-      });
-    } catch (error) {
-      // In rare cases deleting an album completes after the list of albums has been requested,
-      // leading to a bad request error.
-      // Since the album is already deleted, the error is ignored.
-      const isBadRequest = isHttpError(error) && error.status === 400;
-      if (!isBadRequest) {
-        throw error;
-      }
-    }
-
-    ownedAlbums = ownedAlbums.filter(({ id }) => id !== albumToDelete.id);
-    sharedAlbums = sharedAlbums.filter(({ id }) => id !== albumToDelete.id);
-  };
-
   const handleSelect = async (action: 'edit' | 'share' | 'download' | 'delete') => {
     closeAlbumContextMenu();
 
@@ -272,17 +254,7 @@
       }
 
       case 'delete': {
-        const isConfirmed = await handleConfirmAlbumDelete(selectedAlbum);
-        if (!isConfirmed) {
-          return;
-        }
-
-        try {
-          await handleDeleteAlbum(selectedAlbum);
-        } catch (error) {
-          handleError(error, $t('errors.unable_to_delete_album'));
-        }
-
+        await handleDeleteAlbum(selectedAlbum);
         break;
       }
     }
@@ -290,7 +262,7 @@
 
   const removeAlbumsIfEmpty = async () => {
     const albumsToRemove = ownedAlbums.filter((album) => album.assetCount === 0 && !album.albumName);
-    await Promise.allSettled(albumsToRemove.map((album) => handleDeleteAlbum(album)));
+    await Promise.allSettled(albumsToRemove.map((album) => handleDeleteAlbum(album, { prompt: false, notify: false })));
   };
 
   const updateAlbumInfo = (album: AlbumResponseDto) => {
@@ -346,8 +318,15 @@
       albumToShare = null;
     }
   };
+
+  const onAlbumDelete = (album: AlbumResponseDto) => {
+    ownedAlbums = ownedAlbums.filter(({ id }) => id !== album.id);
+    sharedAlbums = sharedAlbums.filter(({ id }) => id !== album.id);
+  };
 </script>
 
+<OnEvents {onAlbumDelete} />
+
 {#if albums.length > 0}
   {#if userSettings.view === AlbumViewMode.Cover}
     <!-- Album Cards -->
diff --git a/web/src/lib/managers/event-manager.svelte.ts b/web/src/lib/managers/event-manager.svelte.ts
index e7d50f026d..1bd437b4cc 100644
--- a/web/src/lib/managers/event-manager.svelte.ts
+++ b/web/src/lib/managers/event-manager.svelte.ts
@@ -1,5 +1,5 @@
 import type { ThemeSetting } from '$lib/managers/theme-manager.svelte';
-import type { LoginResponseDto, SharedLinkResponseDto } from '@immich/sdk';
+import type { AlbumResponseDto, LoginResponseDto, SharedLinkResponseDto } from '@immich/sdk';
 
 export type Events = {
   AppInit: [];
@@ -8,6 +8,9 @@ export type Events = {
   AuthLogout: [];
   LanguageChange: [{ name: string; code: string; rtl?: boolean }];
   ThemeChange: [ThemeSetting];
+
+  AlbumDelete: [AlbumResponseDto];
+
   SharedLinkCreate: [SharedLinkResponseDto];
   SharedLinkUpdate: [SharedLinkResponseDto];
   SharedLinkDelete: [SharedLinkResponseDto];
diff --git a/web/src/lib/services/album.service.ts b/web/src/lib/services/album.service.ts
index 52fa09d103..6e5583495f 100644
--- a/web/src/lib/services/album.service.ts
+++ b/web/src/lib/services/album.service.ts
@@ -1,7 +1,42 @@
+import { eventManager } from '$lib/managers/event-manager.svelte';
 import { downloadArchive } from '$lib/utils/asset-utils';
+import { handleError } from '$lib/utils/handle-error';
 import { getFormatter } from '$lib/utils/i18n';
-import type { AlbumResponseDto } from '@immich/sdk';
-import { modalManager } from '@immich/ui';
+import { deleteAlbum, type AlbumResponseDto } from '@immich/sdk';
+import { modalManager, toastManager } from '@immich/ui';
+
+export const handleDeleteAlbum = async (album: AlbumResponseDto, options?: { prompt?: boolean; notify?: boolean }) => {
+  const $t = await getFormatter();
+  const { prompt = true, notify = true } = options ?? {};
+
+  if (prompt) {
+    const confirmation =
+      album.albumName.length > 0
+        ? $t('album_delete_confirmation', { values: { album: album.albumName } })
+        : $t('unnamed_album_delete_confirmation');
+    const description = $t('album_delete_confirmation_description');
+
+    const success = await modalManager.showDialog({ prompt: `${confirmation} ${description}` });
+    if (!success) {
+      return false;
+    }
+  }
+
+  try {
+    await deleteAlbum({ id: album.id });
+
+    eventManager.emit('AlbumDelete', album);
+
+    if (notify) {
+      toastManager.success();
+    }
+
+    return true;
+  } catch (error) {
+    handleError(error, $t('errors.unable_to_delete_album'));
+    return false;
+  }
+};
 
 export const handleDownloadAlbum = async (album: AlbumResponseDto) => {
   await downloadArchive(`${album.albumName}.zip`, { albumId: album.id });
diff --git 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
index 6b543e1ecf..9af2b611f2 100644
--- 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
@@ -36,7 +36,7 @@
   import AlbumShareModal from '$lib/modals/AlbumShareModal.svelte';
   import AlbumUsersModal from '$lib/modals/AlbumUsersModal.svelte';
   import SharedLinkCreateModal from '$lib/modals/SharedLinkCreateModal.svelte';
-  import { handleConfirmAlbumDelete, handleDownloadAlbum } from '$lib/services/album.service';
+  import { handleDeleteAlbum, handleDownloadAlbum } from '$lib/services/album.service';
   import { AssetInteraction } from '$lib/stores/asset-interaction.svelte';
   import { assetViewingStore } from '$lib/stores/asset-viewing.store';
   import { featureFlags } from '$lib/stores/server-config.store';
@@ -59,9 +59,9 @@
     AssetVisibility,
     addAssetsToAlbum,
     addUsersToAlbum,
-    deleteAlbum,
     getAlbumInfo,
     updateAlbumInfo,
+    type AlbumResponseDto,
     type AlbumUserAddDto,
   } from '@immich/sdk';
   import { Button, Icon, IconButton, modalManager, toastManager } from '@immich/ui';
@@ -233,24 +233,6 @@
     }
   };
 
-  const handleRemoveAlbum = async () => {
-    const isConfirmed = await handleConfirmAlbumDelete(album);
-
-    if (!isConfirmed) {
-      viewMode = AlbumPageViewMode.VIEW;
-      return;
-    }
-
-    try {
-      await deleteAlbum({ id: album.id });
-      await goto(backUrl);
-    } catch (error) {
-      handleError(error, $t('errors.unable_to_delete_album'));
-    } finally {
-      viewMode = AlbumPageViewMode.VIEW;
-    }
-  };
-
   const handleSetVisibility = (assetIds: string[]) => {
     timelineManager.removeAssets(assetIds);
     assetInteraction.clearMultiselect();
@@ -301,7 +283,7 @@
 
   onNavigate(async ({ to }) => {
     if (!isAlbumsRoute(to?.route.id) && album.assetCount === 0 && !album.albumName) {
-      await deleteAlbum(album);
+      await handleDeleteAlbum(album, { notify: false, prompt: false });
     }
   });
 
@@ -388,6 +370,13 @@
     await refreshAlbum();
   };
 
+  const onAlbumDelete = async ({ id }: AlbumResponseDto) => {
+    if (id === album.id) {
+      await goto(backUrl);
+      viewMode = AlbumPageViewMode.VIEW;
+    }
+  };
+
   const handleShareLink = async () => {
     await modalManager.show(SharedLinkCreateModal, { albumId: album.id });
   };
@@ -424,7 +413,7 @@
   };
 </script>
 
-<OnEvents {onSharedLinkCreate} />
+<OnEvents {onSharedLinkCreate} {onAlbumDelete} />
 
 <div class="flex overflow-hidden" use:scrollMemoryClearer={{ routeStartsWith: AppRoute.ALBUMS }}>
   <div class="relative w-full shrink">
@@ -672,7 +661,11 @@
                   <MenuOption icon={mdiCogOutline} text={$t('options')} onClick={handleOptions} />
                 {/if}
 
-                <MenuOption icon={mdiDeleteOutline} text={$t('delete_album')} onClick={() => handleRemoveAlbum()} />
+                <MenuOption
+                  icon={mdiDeleteOutline}
+                  text={$t('delete_album')}
+                  onClick={() => handleDeleteAlbum(album)}
+                />
               </ButtonContextMenu>
             {/if}
 

From 0b487897a4b576c3c1461a88b9bc9406a9ffcd5a Mon Sep 17 00:00:00 2001
From: Jason Rasmussen <jason@rasm.me>
Date: Mon, 10 Nov 2025 16:17:18 -0500
Subject: [PATCH 72/84] refactor: shared link service (#23775)

---
 .../actions/RemoveFromSharedLinkAction.svelte | 45 ++++---------------
 web/src/lib/services/shared-link.service.ts   | 39 ++++++++++++++++
 2 files changed, 47 insertions(+), 37 deletions(-)

diff --git a/web/src/lib/components/timeline/actions/RemoveFromSharedLinkAction.svelte b/web/src/lib/components/timeline/actions/RemoveFromSharedLinkAction.svelte
index 973760ac45..774ce8ab45 100644
--- a/web/src/lib/components/timeline/actions/RemoveFromSharedLinkAction.svelte
+++ b/web/src/lib/components/timeline/actions/RemoveFromSharedLinkAction.svelte
@@ -1,9 +1,8 @@
 <script lang="ts">
   import { getAssetControlContext } from '$lib/components/timeline/AssetSelectControlBar.svelte';
-  import { authManager } from '$lib/managers/auth-manager.svelte';
-  import { handleError } from '$lib/utils/handle-error';
-  import { removeSharedLinkAssets, type SharedLinkResponseDto } from '@immich/sdk';
-  import { IconButton, modalManager, toastManager } from '@immich/ui';
+  import { handleRemoveSharedLinkAssets } from '$lib/services/shared-link.service';
+  import { type SharedLinkResponseDto } from '@immich/sdk';
+  import { IconButton } from '@immich/ui';
   import { mdiDeleteOutline } from '@mdi/js';
   import { t } from 'svelte-i18n';
 
@@ -15,39 +14,11 @@
 
   const { getAssets, clearSelect } = getAssetControlContext();
 
-  const handleRemove = async () => {
-    const isConfirmed = await modalManager.showDialog({
-      title: $t('remove_assets_title'),
-      prompt: $t('remove_assets_shared_link_confirmation', { values: { count: getAssets().length } }),
-      confirmText: $t('remove'),
-    });
-
-    if (!isConfirmed) {
-      return;
-    }
-
-    try {
-      const results = await removeSharedLinkAssets({
-        ...authManager.params,
-        id: sharedLink.id,
-        assetIdsDto: {
-          assetIds: [...getAssets()].map((asset) => asset.id),
-        },
-      });
-
-      for (const result of results) {
-        if (!result.success) {
-          continue;
-        }
-
-        sharedLink.assets = sharedLink.assets.filter((asset) => asset.id !== result.assetId);
-      }
-
-      const count = results.filter((item) => item.success).length;
-      toastManager.success($t('assets_removed_count', { values: { count } }));
+  const handleSelect = async () => {
+    const assetIds = getAssets().map(({ id }) => id);
+    const success = await handleRemoveSharedLinkAssets(sharedLink, assetIds);
+    if (success) {
       clearSelect();
-    } catch (error) {
-      handleError(error, $t('errors.unable_to_remove_assets_from_shared_link'));
     }
   };
 </script>
@@ -57,6 +28,6 @@
   color="secondary"
   variant="ghost"
   aria-label={$t('remove_from_shared_link')}
-  onclick={handleRemove}
+  onclick={handleSelect}
   icon={mdiDeleteOutline}
 />
diff --git a/web/src/lib/services/shared-link.service.ts b/web/src/lib/services/shared-link.service.ts
index a48f0b5965..97a7f5851e 100644
--- a/web/src/lib/services/shared-link.service.ts
+++ b/web/src/lib/services/shared-link.service.ts
@@ -1,5 +1,6 @@
 import { goto } from '$app/navigation';
 import { AppRoute } from '$lib/constants';
+import { authManager } from '$lib/managers/auth-manager.svelte';
 import { eventManager } from '$lib/managers/event-manager.svelte';
 import QrCodeModal from '$lib/modals/QrCodeModal.svelte';
 import { serverConfig } from '$lib/stores/server-config.store';
@@ -9,6 +10,7 @@ import { getFormatter } from '$lib/utils/i18n';
 import {
   createSharedLink,
   removeSharedLink,
+  removeSharedLinkAssets,
   updateSharedLink,
   type SharedLinkCreateDto,
   type SharedLinkEditDto,
@@ -126,6 +128,43 @@ export const handleDeleteSharedLink = async (sharedLink: SharedLinkResponseDto):
   }
 };
 
+export const handleRemoveSharedLinkAssets = async (sharedLink: SharedLinkResponseDto, assetIds: string[]) => {
+  const $t = await getFormatter();
+
+  const success = await modalManager.showDialog({
+    title: $t('remove_assets_title'),
+    prompt: $t('remove_assets_shared_link_confirmation', { values: { count: assetIds.length } }),
+    confirmText: $t('remove'),
+  });
+
+  if (!success) {
+    return false;
+  }
+
+  try {
+    const results = await removeSharedLinkAssets({
+      ...authManager.params,
+      id: sharedLink.id,
+      assetIdsDto: { assetIds },
+    });
+
+    for (const result of results) {
+      if (!result.success) {
+        continue;
+      }
+
+      sharedLink.assets = sharedLink.assets.filter((asset) => asset.id !== result.assetId);
+    }
+
+    const count = results.filter((item) => item.success).length;
+    toastManager.success($t('assets_removed_count', { values: { count } }));
+    return true;
+  } catch (error) {
+    handleError(error, $t('errors.unable_to_remove_assets_from_shared_link'));
+    return false;
+  }
+};
+
 const handleShowSharedLinkQrCode = async (sharedLink: SharedLinkResponseDto) => {
   const $t = await getFormatter();
   await modalManager.show(QrCodeModal, { title: $t('view_link'), value: asUrl(sharedLink) });

From 433a3cd3397385fc369b19cdb50ef2a847bb9ad1 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 10 Nov 2025 23:50:50 -0500
Subject: [PATCH 73/84] chore(deps): update dependency @types/node to ^22.19.0
 (#23786)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 cli/package.json                     | 2 +-
 e2e/package.json                     | 2 +-
 open-api/typescript-sdk/package.json | 2 +-
 pnpm-lock.yaml                       | 8 ++++----
 server/package.json                  | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/cli/package.json b/cli/package.json
index 83be681284..6fed806003 100644
--- a/cli/package.json
+++ b/cli/package.json
@@ -20,7 +20,7 @@
     "@types/lodash-es": "^4.17.12",
     "@types/micromatch": "^4.0.9",
     "@types/mock-fs": "^4.13.1",
-    "@types/node": "^22.18.13",
+    "@types/node": "^22.19.0",
     "@vitest/coverage-v8": "^3.0.0",
     "byte-size": "^9.0.0",
     "cli-progress": "^3.12.0",
diff --git a/e2e/package.json b/e2e/package.json
index b94fd7f6e2..84e1823e0c 100644
--- a/e2e/package.json
+++ b/e2e/package.json
@@ -25,7 +25,7 @@
     "@playwright/test": "^1.44.1",
     "@socket.io/component-emitter": "^3.1.2",
     "@types/luxon": "^3.4.2",
-    "@types/node": "^22.18.13",
+    "@types/node": "^22.19.0",
     "@types/oidc-provider": "^9.0.0",
     "@types/pg": "^8.15.1",
     "@types/pngjs": "^6.0.4",
diff --git a/open-api/typescript-sdk/package.json b/open-api/typescript-sdk/package.json
index a751bb7d1b..1756675ddd 100644
--- a/open-api/typescript-sdk/package.json
+++ b/open-api/typescript-sdk/package.json
@@ -19,7 +19,7 @@
     "@oazapfts/runtime": "^1.0.2"
   },
   "devDependencies": {
-    "@types/node": "^22.18.13",
+    "@types/node": "^22.19.0",
     "typescript": "^5.3.3"
   },
   "repository": {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 00087e91e0..ad09af2715 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -63,7 +63,7 @@ importers:
         specifier: ^4.13.1
         version: 4.13.4
       '@types/node':
-        specifier: ^22.18.13
+        specifier: ^22.19.0
         version: 22.19.0
       '@vitest/coverage-v8':
         specifier: ^3.0.0
@@ -211,7 +211,7 @@ importers:
         specifier: ^3.4.2
         version: 3.7.1
       '@types/node':
-        specifier: ^22.18.13
+        specifier: ^22.19.0
         version: 22.19.0
       '@types/oidc-provider':
         specifier: ^9.0.0
@@ -293,7 +293,7 @@ importers:
         version: 1.0.4
     devDependencies:
       '@types/node':
-        specifier: ^22.18.13
+        specifier: ^22.19.0
         version: 22.19.0
       typescript:
         specifier: ^5.3.3
@@ -582,7 +582,7 @@ importers:
         specifier: ^2.0.0
         version: 2.0.0
       '@types/node':
-        specifier: ^22.18.13
+        specifier: ^22.19.0
         version: 22.19.0
       '@types/nodemailer':
         specifier: ^7.0.0
diff --git a/server/package.json b/server/package.json
index 5b36efb2c4..0a8130163e 100644
--- a/server/package.json
+++ b/server/package.json
@@ -129,7 +129,7 @@
     "@types/luxon": "^3.6.2",
     "@types/mock-fs": "^4.13.1",
     "@types/multer": "^2.0.0",
-    "@types/node": "^22.18.13",
+    "@types/node": "^22.19.0",
     "@types/nodemailer": "^7.0.0",
     "@types/picomatch": "^4.0.0",
     "@types/pngjs": "^6.0.5",

From 2611e2ec2048ca69680c8c78c58a310c4321ba18 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 11 Nov 2025 13:35:36 +0100
Subject: [PATCH 74/84] chore(deps): update dependency exiftool-vendored to
 v31.3.0 (#23787)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 pnpm-lock.yaml | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index ad09af2715..d82485c5cd 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -239,7 +239,7 @@ importers:
         version: 60.0.0(eslint@9.38.0(jiti@2.6.1))
       exiftool-vendored:
         specifier: ^31.1.0
-        version: 31.1.0
+        version: 31.3.0
       globals:
         specifier: ^16.0.0
         version: 16.4.0
@@ -405,7 +405,7 @@ importers:
         version: 4.3.3
       exiftool-vendored:
         specifier: ^31.1.0
-        version: 31.1.0
+        version: 31.3.0
       express:
         specifier: ^5.1.0
         version: 5.1.0
@@ -3550,8 +3550,8 @@ packages:
     peerDependencies:
       '@photo-sphere-viewer/core': 5.14.0
 
-  '@photostructure/tz-lookup@11.2.1':
-    resolution: {integrity: sha512-ugPtvpdLwGQ8IWezSGFgUCYOpO/XXetfKLNv+UN2jjTYyfIDq9dA21GydGyzXuoQ06nN3VGBd3JxmEu+ZtXScg==}
+  '@photostructure/tz-lookup@11.3.0':
+    resolution: {integrity: sha512-rYGy7ETBHTnXrwbzm47e3LJPKJmzpY7zXnbZhdosNU0lTGWVqzxptSjK4qZkJ1G+Kwy4F6XStNR9ZqMsXAoASQ==}
 
   '@pkgjs/parseargs@0.11.0':
     resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==}
@@ -6627,17 +6627,17 @@ packages:
     resolution: {integrity: sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==}
     engines: {node: '>=10'}
 
-  exiftool-vendored.exe@13.38.0:
-    resolution: {integrity: sha512-oZx5enTAvSiIAXL+OEk7nNWrfUhEdKUpaGwDjCmz4VKwOa4HbisqyM808xPGPYj8X7XikcME/fq5hvevPeE3cw==}
+  exiftool-vendored.exe@13.41.0:
+    resolution: {integrity: sha512-7XG0PjZCm8HVsVUQAD4b/eBtvYBuGkySf2qslqHlnSR6jU1xoD1AgEprb2bCPqwhw0Jn3xzZoo/ihDo4F6fMyA==}
     os: [win32]
 
-  exiftool-vendored.pl@13.38.0:
-    resolution: {integrity: sha512-Q3xl1nnwswrsR5344z4NyqvI74fKwla+VJHY1N+32gcDgt8cs9KBsDUwcNzKHSOSa/MjEfniuCJVrQiqR05iag==}
+  exiftool-vendored.pl@13.41.0:
+    resolution: {integrity: sha512-JqqRuB8TggIOC983oTnOunB/baseGYw8XCkn7ylFGOmEv7oTQAK3uUTZV76vXE1X6c5H6IdHYt0abSgi8Kzc4g==}
     os: ['!win32']
     hasBin: true
 
-  exiftool-vendored@31.1.0:
-    resolution: {integrity: sha512-q8StxLawHLDvhqv/uoBYCfVbDskn49Cr5ouNCZhh4lgryGu1aymHwK9AvO6RcW2SbPm5MSnQDJOfGp2MW5Nnrw==}
+  exiftool-vendored@31.3.0:
+    resolution: {integrity: sha512-JQeyRvh7cV81fm9eKej2btdVh2z2Ak/sx89c4OCykeQnhnI81hk9TTraBtborYA+WcLM20cwYMPmpaW/sMy5Qw==}
     engines: {node: '>=20.0.0'}
 
   expect-type@1.2.1:
@@ -15300,7 +15300,7 @@ snapshots:
       '@photo-sphere-viewer/core': 5.14.0
       three: 0.180.0
 
-  '@photostructure/tz-lookup@11.2.1': {}
+  '@photostructure/tz-lookup@11.3.0': {}
 
   '@pkgjs/parseargs@0.11.0':
     optional: true
@@ -18807,21 +18807,21 @@ snapshots:
       signal-exit: 3.0.7
       strip-final-newline: 2.0.0
 
-  exiftool-vendored.exe@13.38.0:
+  exiftool-vendored.exe@13.41.0:
     optional: true
 
-  exiftool-vendored.pl@13.38.0: {}
+  exiftool-vendored.pl@13.41.0: {}
 
-  exiftool-vendored@31.1.0:
+  exiftool-vendored@31.3.0:
     dependencies:
-      '@photostructure/tz-lookup': 11.2.1
+      '@photostructure/tz-lookup': 11.3.0
       '@types/luxon': 3.7.1
       batch-cluster: 15.0.1
-      exiftool-vendored.pl: 13.38.0
+      exiftool-vendored.pl: 13.41.0
       he: 1.2.0
       luxon: 3.7.2
     optionalDependencies:
-      exiftool-vendored.exe: 13.38.0
+      exiftool-vendored.exe: 13.41.0
 
   expect-type@1.2.1: {}
 

From 2f40f5aad85c93e4ddeae7e4c3f88f96997049ae Mon Sep 17 00:00:00 2001
From: Jason Rasmussen <jason@rasm.me>
Date: Tue, 11 Nov 2025 07:42:33 -0500
Subject: [PATCH 75/84] refactor: user admin service (#23785)

---
 e2e/src/web/specs/user-admin.e2e-spec.ts      |   4 +-
 web/src/lib/components/ActionButton.svelte    |  19 +-
 web/src/lib/components/HeaderButton.svelte    |  18 ++
 web/src/lib/components/TableButton.svelte     |  16 ++
 web/src/lib/managers/event-manager.svelte.ts  |   7 +-
 web/src/lib/modals/UserCreateModal.svelte     |  49 ++--
 .../lib/modals/UserDeleteConfirmModal.svelte  |  20 +-
 web/src/lib/modals/UserEditModal.svelte       |  38 ++-
 .../lib/modals/UserRestoreConfirmModal.svelte |  54 ++--
 web/src/lib/services/album.service.ts         |   4 -
 web/src/lib/services/shared-link.service.ts   |   7 -
 web/src/lib/services/user-admin.service.ts    | 232 ++++++++++++++++++
 web/src/lib/types.ts                          |   4 +
 web/src/routes/admin/users/+page.svelte       |  96 ++------
 web/src/routes/admin/users/[id]/+page.svelte  | 160 ++----------
 15 files changed, 395 insertions(+), 333 deletions(-)
 create mode 100644 web/src/lib/components/HeaderButton.svelte
 create mode 100644 web/src/lib/components/TableButton.svelte
 create mode 100644 web/src/lib/services/user-admin.service.ts
 create mode 100644 web/src/lib/types.ts

diff --git a/e2e/src/web/specs/user-admin.e2e-spec.ts b/e2e/src/web/specs/user-admin.e2e-spec.ts
index 3d64e47aef..611a1b3dec 100644
--- a/e2e/src/web/specs/user-admin.e2e-spec.ts
+++ b/e2e/src/web/specs/user-admin.e2e-spec.ts
@@ -52,7 +52,7 @@ test.describe('User Administration', () => {
 
     await page.goto(`/admin/users/${user.userId}`);
 
-    await page.getByRole('button', { name: 'Edit user' }).click();
+    await page.getByRole('button', { name: 'Edit' }).click();
     await expect(page.getByLabel('Admin User')).not.toBeChecked();
     await page.getByText('Admin User').click();
     await expect(page.getByLabel('Admin User')).toBeChecked();
@@ -77,7 +77,7 @@ test.describe('User Administration', () => {
 
     await page.goto(`/admin/users/${user.userId}`);
 
-    await page.getByRole('button', { name: 'Edit user' }).click();
+    await page.getByRole('button', { name: 'Edit' }).click();
     await expect(page.getByLabel('Admin User')).toBeChecked();
     await page.getByText('Admin User').click();
     await expect(page.getByLabel('Admin User')).not.toBeChecked();
diff --git a/web/src/lib/components/ActionButton.svelte b/web/src/lib/components/ActionButton.svelte
index 1bbbf642e0..37bc09fb73 100644
--- a/web/src/lib/components/ActionButton.svelte
+++ b/web/src/lib/components/ActionButton.svelte
@@ -1,19 +1,16 @@
 <script lang="ts">
-  import { IconButton, type MenuItem } from '@immich/ui';
+  import type { ActionItem } from '$lib/types';
+  import { IconButton, type IconButtonProps } from '@immich/ui';
 
   type Props = {
-    action: MenuItem;
+    action: ActionItem;
   };
 
   const { action }: Props = $props();
-  const { title, icon, onSelect } = $derived(action);
+  const { title, icon, color = 'secondary', props: other = {}, onSelect } = $derived(action);
+  const onclick = (event: Event) => onSelect?.({ event, item: action });
 </script>
 
-<IconButton
-  shape="round"
-  color="secondary"
-  variant="ghost"
-  {icon}
-  aria-label={title}
-  onclick={(event: Event) => onSelect?.({ event, item: action })}
-/>
+{#if action.$if?.() ?? true}
+  <IconButton variant="ghost" {color} shape="round" {...other as IconButtonProps} {icon} aria-label={title} {onclick} />
+{/if}
diff --git a/web/src/lib/components/HeaderButton.svelte b/web/src/lib/components/HeaderButton.svelte
new file mode 100644
index 0000000000..9021d2d1cb
--- /dev/null
+++ b/web/src/lib/components/HeaderButton.svelte
@@ -0,0 +1,18 @@
+<script lang="ts">
+  import type { ActionItem } from '$lib/types';
+  import { Button, type ButtonProps, Text } from '@immich/ui';
+
+  type Props = {
+    action: ActionItem;
+  };
+
+  const { action }: Props = $props();
+  const { title, icon, color = 'secondary', props: other = {}, onSelect } = $derived(action);
+  const onclick = (event: Event) => onSelect?.({ event, item: action });
+</script>
+
+{#if action.$if?.() ?? true}
+  <Button variant="ghost" size="small" {color} {...other as ButtonProps} leadingIcon={icon} {onclick}>
+    <Text class="hidden md:block">{title}</Text>
+  </Button>
+{/if}
diff --git a/web/src/lib/components/TableButton.svelte b/web/src/lib/components/TableButton.svelte
new file mode 100644
index 0000000000..4bd82e4dd9
--- /dev/null
+++ b/web/src/lib/components/TableButton.svelte
@@ -0,0 +1,16 @@
+<script lang="ts">
+  import type { ActionItem } from '$lib/types';
+  import { IconButton, type IconButtonProps } from '@immich/ui';
+
+  type Props = {
+    action: ActionItem;
+  };
+
+  const { action }: Props = $props();
+  const { title, icon, props: other = {}, onSelect } = $derived(action);
+  const onclick = (event: Event) => onSelect?.({ event, item: action });
+</script>
+
+{#if action.$if?.() ?? true}
+  <IconButton shape="round" color="primary" {...other as IconButtonProps} {icon} aria-label={title} {onclick} />
+{/if}
diff --git a/web/src/lib/managers/event-manager.svelte.ts b/web/src/lib/managers/event-manager.svelte.ts
index 1bd437b4cc..733fb8bc71 100644
--- a/web/src/lib/managers/event-manager.svelte.ts
+++ b/web/src/lib/managers/event-manager.svelte.ts
@@ -1,5 +1,5 @@
 import type { ThemeSetting } from '$lib/managers/theme-manager.svelte';
-import type { AlbumResponseDto, LoginResponseDto, SharedLinkResponseDto } from '@immich/sdk';
+import type { AlbumResponseDto, LoginResponseDto, SharedLinkResponseDto, UserAdminResponseDto } from '@immich/sdk';
 
 export type Events = {
   AppInit: [];
@@ -14,6 +14,11 @@ export type Events = {
   SharedLinkCreate: [SharedLinkResponseDto];
   SharedLinkUpdate: [SharedLinkResponseDto];
   SharedLinkDelete: [SharedLinkResponseDto];
+
+  UserAdminCreate: [UserAdminResponseDto];
+  UserAdminUpdate: [UserAdminResponseDto];
+  UserAdminDelete: [UserAdminResponseDto];
+  UserAdminRestore: [UserAdminResponseDto];
 };
 
 type Listener<EventMap extends Record<string, unknown[]>, K extends keyof EventMap> = (...params: EventMap[K]) => void;
diff --git a/web/src/lib/modals/UserCreateModal.svelte b/web/src/lib/modals/UserCreateModal.svelte
index 1a1f46d1d5..38d6ed54b2 100644
--- a/web/src/lib/modals/UserCreateModal.svelte
+++ b/web/src/lib/modals/UserCreateModal.svelte
@@ -1,11 +1,9 @@
 <script lang="ts">
+  import { handleCreateUserAdmin } from '$lib/services/user-admin.service';
   import { featureFlags } from '$lib/stores/server-config.store';
   import { userInteraction } from '$lib/stores/user.svelte';
   import { ByteUnit, convertToBytes } from '$lib/utils/byte-units';
-  import { handleError } from '$lib/utils/handle-error';
-  import { createUserAdmin, type UserAdminResponseDto } from '@immich/sdk';
   import {
-    Alert,
     Button,
     Field,
     HelperText,
@@ -20,13 +18,12 @@
   } from '@immich/ui';
   import { t } from 'svelte-i18n';
 
-  interface Props {
-    onClose: (user?: UserAdminResponseDto) => void;
-  }
+  type Props = {
+    onClose: () => void;
+  };
 
   let { onClose }: Props = $props();
 
-  let error = $state('');
   let success = $state(false);
 
   let email = $state('');
@@ -57,40 +54,28 @@
     }
 
     isCreatingUser = true;
-    error = '';
 
-    try {
-      const user = await createUserAdmin({
-        userAdminCreateDto: {
-          email,
-          password,
-          shouldChangePassword,
-          name,
-          quotaSizeInBytes,
-          notify,
-          isAdmin,
-        },
-      });
+    const success = await handleCreateUserAdmin({
+      email,
+      password,
+      shouldChangePassword,
+      name,
+      quotaSizeInBytes,
+      notify,
+      isAdmin,
+    });
 
-      success = true;
-
-      onClose(user);
-      return;
-    } catch (error) {
-      handleError(error, $t('errors.unable_to_create_user'));
-    } finally {
-      isCreatingUser = false;
+    if (success) {
+      onClose();
     }
+
+    isCreatingUser = false;
   };
 </script>
 
 <Modal title={$t('create_new_user')} {onClose} size="small">
   <ModalBody>
     <form onsubmit={onSubmit} autocomplete="off" id="create-new-user-form">
-      {#if error}
-        <Alert color="danger" size="small" title={error} closable />
-      {/if}
-
       {#if success}
         <p class="text-sm text-immich-primary">{$t('new_user_created')}</p>
       {/if}
diff --git a/web/src/lib/modals/UserDeleteConfirmModal.svelte b/web/src/lib/modals/UserDeleteConfirmModal.svelte
index 9c9223707e..46e02d54c4 100644
--- a/web/src/lib/modals/UserDeleteConfirmModal.svelte
+++ b/web/src/lib/modals/UserDeleteConfirmModal.svelte
@@ -1,14 +1,15 @@
 <script lang="ts">
   import FormatMessage from '$lib/elements/FormatMessage.svelte';
+  import { handleDeleteUserAdmin } from '$lib/services/user-admin.service';
   import { serverConfig } from '$lib/stores/server-config.store';
-  import { handleError } from '$lib/utils/handle-error';
-  import { deleteUserAdmin, type UserAdminResponseDto, type UserResponseDto } from '@immich/sdk';
+  import { type UserAdminResponseDto } from '@immich/sdk';
   import { Alert, Checkbox, ConfirmModal, Field, Input, Label, Text } from '@immich/ui';
+  import { mdiTrashCanOutline } from '@mdi/js';
   import { t } from 'svelte-i18n';
 
   type Props = {
-    user: UserResponseDto;
-    onClose: (user?: UserAdminResponseDto) => void;
+    user: UserAdminResponseDto;
+    onClose: () => void;
   };
 
   let { user, onClose }: Props = $props();
@@ -17,22 +18,21 @@
   let email = $state('');
   let disabled = $derived(force && email !== user.email);
 
-  const handleClose = async (confirmed: boolean) => {
+  const handleClose = async (confirmed?: boolean) => {
     if (!confirmed) {
       onClose();
       return;
     }
 
-    try {
-      const result = await deleteUserAdmin({ id: user.id, userAdminDeleteDto: { force } });
-      onClose(result);
-    } catch (error) {
-      handleError(error, $t('errors.unable_to_delete_user'));
+    const success = await handleDeleteUserAdmin(user, { force });
+    if (success) {
+      onClose();
     }
   };
 </script>
 
 <ConfirmModal
+  icon={mdiTrashCanOutline}
   title={$t('delete_user')}
   confirmText={force ? $t('permanently_delete') : $t('delete')}
   onClose={handleClose}
diff --git a/web/src/lib/modals/UserEditModal.svelte b/web/src/lib/modals/UserEditModal.svelte
index 657f6dee61..84e4edc32a 100644
--- a/web/src/lib/modals/UserEditModal.svelte
+++ b/web/src/lib/modals/UserEditModal.svelte
@@ -1,10 +1,10 @@
 <script lang="ts">
   import { AppRoute } from '$lib/constants';
+  import { handleUpdateUserAdmin } from '$lib/services/user-admin.service';
   import { user as authUser } from '$lib/stores/user.store';
   import { userInteraction } from '$lib/stores/user.svelte';
   import { ByteUnit, convertFromBytes, convertToBytes } from '$lib/utils/byte-units';
-  import { handleError } from '$lib/utils/handle-error';
-  import { updateUserAdmin, type UserAdminResponseDto } from '@immich/sdk';
+  import { type UserAdminResponseDto } from '@immich/sdk';
   import {
     Button,
     Field,
@@ -23,7 +23,7 @@
 
   interface Props {
     user: UserAdminResponseDto;
-    onClose: (data?: UserAdminResponseDto) => void;
+    onClose: () => void;
   }
 
   let { user, onClose }: Props = $props();
@@ -48,28 +48,20 @@
       quotaSizeBytes > userInteraction.serverInfo.diskSizeRaw,
   );
 
-  const handleEditUser = async () => {
-    try {
-      const newUser = await updateUserAdmin({
-        id: user.id,
-        userAdminUpdateDto: {
-          email,
-          name,
-          storageLabel,
-          quotaSizeInBytes: typeof quotaSize === 'number' ? convertToBytes(quotaSize, ByteUnit.GiB) : null,
-          isAdmin,
-        },
-      });
-
-      onClose(newUser);
-    } catch (error) {
-      handleError(error, $t('errors.unable_to_update_user'));
-    }
-  };
-
   const onSubmit = async (event: Event) => {
     event.preventDefault();
-    await handleEditUser();
+
+    const success = await handleUpdateUserAdmin(user, {
+      email,
+      name,
+      storageLabel,
+      quotaSizeInBytes: typeof quotaSize === 'number' ? convertToBytes(quotaSize, ByteUnit.GiB) : null,
+      isAdmin,
+    });
+
+    if (success) {
+      onClose();
+    }
   };
 </script>
 
diff --git a/web/src/lib/modals/UserRestoreConfirmModal.svelte b/web/src/lib/modals/UserRestoreConfirmModal.svelte
index 03c36e27cd..0a01f846b9 100644
--- a/web/src/lib/modals/UserRestoreConfirmModal.svelte
+++ b/web/src/lib/modals/UserRestoreConfirmModal.svelte
@@ -1,30 +1,39 @@
 <script lang="ts">
   import FormatMessage from '$lib/elements/FormatMessage.svelte';
-  import { handleError } from '$lib/utils/handle-error';
-  import { restoreUserAdmin, type UserAdminResponseDto, type UserResponseDto } from '@immich/sdk';
-  import { Button, HStack, Modal, ModalBody, ModalFooter } from '@immich/ui';
+  import { handleRestoreUserAdmin } from '$lib/services/user-admin.service';
+  import { type UserAdminResponseDto } from '@immich/sdk';
+  import { ConfirmModal } from '@immich/ui';
   import { mdiDeleteRestore } from '@mdi/js';
   import { t } from 'svelte-i18n';
 
-  interface Props {
-    user: UserResponseDto;
-    onClose: (user?: UserAdminResponseDto) => void;
-  }
+  type Props = {
+    user: UserAdminResponseDto;
+    onClose: () => void;
+  };
 
   let { user, onClose }: Props = $props();
 
-  const handleRestoreUser = async () => {
-    try {
-      const result = await restoreUserAdmin({ id: user.id });
-      onClose(result);
-    } catch (error) {
-      handleError(error, $t('errors.unable_to_restore_user'));
+  const handleClose = async (confirmed: boolean) => {
+    if (!confirmed) {
+      return;
+    }
+
+    const success = await handleRestoreUserAdmin(user);
+    if (success) {
+      onClose();
     }
   };
 </script>
 
-<Modal title={$t('restore_user')} {onClose} icon={mdiDeleteRestore} size="small">
-  <ModalBody>
+<ConfirmModal
+  icon={mdiDeleteRestore}
+  title={$t('restore_user')}
+  confirmText={$t('restore')}
+  confirmColor="primary"
+  size="small"
+  onClose={handleClose}
+>
+  {#snippet promptSnippet()}
     <p>
       <FormatMessage key="admin.user_restore_description" values={{ user: user.name }}>
         {#snippet children({ message })}
@@ -32,16 +41,5 @@
         {/snippet}
       </FormatMessage>
     </p>
-  </ModalBody>
-
-  <ModalFooter>
-    <HStack fullWidth>
-      <Button shape="round" color="secondary" fullWidth onclick={() => onClose()}>
-        {$t('cancel')}
-      </Button>
-      <Button shape="round" color="primary" fullWidth onclick={() => handleRestoreUser()}>
-        {$t('restore')}
-      </Button>
-    </HStack>
-  </ModalFooter>
-</Modal>
+  {/snippet}
+</ConfirmModal>
diff --git a/web/src/lib/services/album.service.ts b/web/src/lib/services/album.service.ts
index 6e5583495f..702f84d6f9 100644
--- a/web/src/lib/services/album.service.ts
+++ b/web/src/lib/services/album.service.ts
@@ -15,7 +15,6 @@ export const handleDeleteAlbum = async (album: AlbumResponseDto, options?: { pro
         ? $t('album_delete_confirmation', { values: { album: album.albumName } })
         : $t('unnamed_album_delete_confirmation');
     const description = $t('album_delete_confirmation_description');
-
     const success = await modalManager.showDialog({ prompt: `${confirmation} ${description}` });
     if (!success) {
       return false;
@@ -24,13 +23,10 @@ export const handleDeleteAlbum = async (album: AlbumResponseDto, options?: { pro
 
   try {
     await deleteAlbum({ id: album.id });
-
     eventManager.emit('AlbumDelete', album);
-
     if (notify) {
       toastManager.success();
     }
-
     return true;
   } catch (error) {
     handleError(error, $t('errors.unable_to_delete_album'));
diff --git a/web/src/lib/services/shared-link.service.ts b/web/src/lib/services/shared-link.service.ts
index 97a7f5851e..9ac1c47a94 100644
--- a/web/src/lib/services/shared-link.service.ts
+++ b/web/src/lib/services/shared-link.service.ts
@@ -103,24 +103,19 @@ export const handleUpdateSharedLink = async (sharedLink: SharedLinkResponseDto,
 
 export const handleDeleteSharedLink = async (sharedLink: SharedLinkResponseDto): Promise<boolean> => {
   const $t = await getFormatter();
-
   const success = await modalManager.showDialog({
     title: $t('delete_shared_link'),
     prompt: $t('confirm_delete_shared_link'),
     confirmText: $t('delete'),
   });
-
   if (!success) {
     return false;
   }
 
   try {
     await removeSharedLink({ id: sharedLink.id });
-
     eventManager.emit('SharedLinkDelete', sharedLink);
-
     toastManager.success($t('deleted_shared_link'));
-
     return true;
   } catch (error) {
     handleError(error, $t('errors.unable_to_delete_shared_link'));
@@ -130,13 +125,11 @@ export const handleDeleteSharedLink = async (sharedLink: SharedLinkResponseDto):
 
 export const handleRemoveSharedLinkAssets = async (sharedLink: SharedLinkResponseDto, assetIds: string[]) => {
   const $t = await getFormatter();
-
   const success = await modalManager.showDialog({
     title: $t('remove_assets_title'),
     prompt: $t('remove_assets_shared_link_confirmation', { values: { count: assetIds.length } }),
     confirmText: $t('remove'),
   });
-
   if (!success) {
     return false;
   }
diff --git a/web/src/lib/services/user-admin.service.ts b/web/src/lib/services/user-admin.service.ts
new file mode 100644
index 0000000000..9d3e21bc9e
--- /dev/null
+++ b/web/src/lib/services/user-admin.service.ts
@@ -0,0 +1,232 @@
+import { goto } from '$app/navigation';
+import { eventManager } from '$lib/managers/event-manager.svelte';
+import PasswordResetSuccessModal from '$lib/modals/PasswordResetSuccessModal.svelte';
+import UserCreateModal from '$lib/modals/UserCreateModal.svelte';
+import UserDeleteConfirmModal from '$lib/modals/UserDeleteConfirmModal.svelte';
+import UserEditModal from '$lib/modals/UserEditModal.svelte';
+import UserRestoreConfirmModal from '$lib/modals/UserRestoreConfirmModal.svelte';
+import { serverConfig } from '$lib/stores/server-config.store';
+import { user as authUser } from '$lib/stores/user.store';
+import type { ActionItem } from '$lib/types';
+import { handleError } from '$lib/utils/handle-error';
+import { getFormatter } from '$lib/utils/i18n';
+import {
+  createUserAdmin,
+  deleteUserAdmin,
+  restoreUserAdmin,
+  updateUserAdmin,
+  UserStatus,
+  type UserAdminCreateDto,
+  type UserAdminDeleteDto,
+  type UserAdminResponseDto,
+  type UserAdminUpdateDto,
+} from '@immich/sdk';
+import { MenuItemType, menuManager, modalManager, toastManager } from '@immich/ui';
+import {
+  mdiDeleteRestore,
+  mdiDotsVertical,
+  mdiEyeOutline,
+  mdiLockReset,
+  mdiLockSmart,
+  mdiPencilOutline,
+  mdiPlusBoxOutline,
+  mdiTrashCanOutline,
+} from '@mdi/js';
+import { DateTime } from 'luxon';
+import type { MessageFormatter } from 'svelte-i18n';
+import { get } from 'svelte/store';
+
+const getDeleteDate = (deletedAt: string): Date =>
+  DateTime.fromISO(deletedAt)
+    .plus({ days: get(serverConfig).userDeleteDelay })
+    .toJSDate();
+
+export const getUserAdminsActions = ($t: MessageFormatter) => {
+  const Create: ActionItem = {
+    title: $t('create_user'),
+    icon: mdiPlusBoxOutline,
+    onSelect: () => void modalManager.show(UserCreateModal, {}),
+  };
+
+  return { Create };
+};
+
+export const getUserAdminActions = ($t: MessageFormatter, user: UserAdminResponseDto) => {
+  const View: ActionItem = {
+    icon: mdiEyeOutline,
+    title: $t('view'),
+    onSelect: () => void goto(`/admin/users/${user.id}`),
+  };
+
+  const Update: ActionItem = {
+    icon: mdiPencilOutline,
+    title: $t('edit'),
+    onSelect: () => void modalManager.show(UserEditModal, { user }),
+  };
+
+  const Delete: ActionItem = {
+    icon: mdiTrashCanOutline,
+    title: $t('delete'),
+    color: 'danger',
+    $if: () => get(authUser).id !== user.id && !user.deletedAt,
+    onSelect: () => void modalManager.show(UserDeleteConfirmModal, { user }),
+  };
+
+  const Restore: ActionItem = {
+    icon: mdiDeleteRestore,
+    title: $t('restore'),
+    color: 'primary',
+    $if: () => !!user.deletedAt && user.status === UserStatus.Deleted,
+    onSelect: () => void modalManager.show(UserRestoreConfirmModal, { user }),
+    props: {
+      title: $t('admin.user_restore_scheduled_removal', {
+        values: { date: getDeleteDate(user.deletedAt!) },
+      }),
+    },
+  };
+
+  const ResetPassword: ActionItem = {
+    icon: mdiLockReset,
+    title: $t('reset_password'),
+    $if: () => get(authUser).id !== user.id,
+    onSelect: () => void handleResetPasswordUserAdmin(user),
+  };
+
+  const ResetPinCode: ActionItem = {
+    icon: mdiLockSmart,
+    title: $t('reset_pin_code'),
+    onSelect: () => void handleResetPinCodeUserAdmin(user),
+  };
+
+  const ContextMenu: ActionItem = {
+    icon: mdiDotsVertical,
+    title: $t('actions'),
+    onSelect: ({ event }) =>
+      void menuManager.show({
+        target: event.currentTarget as HTMLElement,
+        position: 'top-right',
+        items: [
+          View,
+          Update,
+          ResetPassword,
+          ResetPinCode,
+          get(authUser).id === user.id ? undefined : MenuItemType.Divider,
+          Restore,
+          Delete,
+        ].filter(Boolean),
+      }),
+  };
+
+  return { View, Update, Delete, Restore, ResetPassword, ResetPinCode, ContextMenu };
+};
+
+export const handleCreateUserAdmin = async (dto: UserAdminCreateDto) => {
+  const $t = await getFormatter();
+
+  try {
+    const response = await createUserAdmin({ userAdminCreateDto: dto });
+    eventManager.emit('UserAdminCreate', response);
+    toastManager.success();
+    return true;
+  } catch (error) {
+    handleError(error, $t('errors.unable_to_create_user'));
+  }
+};
+
+export const handleUpdateUserAdmin = async (user: UserAdminResponseDto, dto: UserAdminUpdateDto) => {
+  const $t = await getFormatter();
+
+  try {
+    const response = await updateUserAdmin({ id: user.id, userAdminUpdateDto: dto });
+    eventManager.emit('UserAdminUpdate', response);
+    toastManager.success();
+    return true;
+  } catch (error) {
+    handleError(error, $t('errors.unable_to_update_user'));
+    return false;
+  }
+};
+
+export const handleDeleteUserAdmin = async (user: UserAdminResponseDto, dto: UserAdminDeleteDto) => {
+  const $t = await getFormatter();
+
+  try {
+    const result = await deleteUserAdmin({ id: user.id, userAdminDeleteDto: dto });
+    eventManager.emit('UserAdminDelete', result);
+    toastManager.success();
+    return true;
+  } catch (error) {
+    handleError(error, $t('errors.unable_to_delete_user'));
+  }
+};
+
+export const handleRestoreUserAdmin = async (user: UserAdminResponseDto) => {
+  const $t = await getFormatter();
+
+  try {
+    const response = await restoreUserAdmin({ id: user.id });
+    eventManager.emit('UserAdminRestore', response);
+    toastManager.success();
+    return true;
+  } catch (error) {
+    handleError(error, $t('errors.unable_to_restore_user'));
+    return false;
+  }
+};
+
+// TODO move password reset server-side
+const generatePassword = (length: number = 16) => {
+  let generatedPassword = '';
+
+  const characterSet = '0123456789' + 'abcdefghijklmnopqrstuvwxyz' + 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' + ',.-{}+!#$%/()=?';
+
+  for (let i = 0; i < length; i++) {
+    let randomNumber = crypto.getRandomValues(new Uint32Array(1))[0];
+    randomNumber = randomNumber / 2 ** 32;
+    randomNumber = Math.floor(randomNumber * characterSet.length);
+
+    generatedPassword += characterSet[randomNumber];
+  }
+
+  return generatedPassword;
+};
+
+export const handleResetPasswordUserAdmin = async (user: UserAdminResponseDto) => {
+  const $t = await getFormatter();
+  const prompt = $t('admin.confirm_user_password_reset', { values: { user: user.name } });
+  const success = await modalManager.showDialog({ prompt });
+  if (!success) {
+    return false;
+  }
+
+  try {
+    const dto = { password: generatePassword(), shouldChangePassword: true };
+    const response = await updateUserAdmin({ id: user.id, userAdminUpdateDto: dto });
+    eventManager.emit('UserAdminUpdate', response);
+    toastManager.success();
+    await modalManager.show(PasswordResetSuccessModal, { newPassword: dto.password });
+    return true;
+  } catch (error) {
+    handleError(error, $t('errors.unable_to_reset_password'));
+    return false;
+  }
+};
+
+export const handleResetPinCodeUserAdmin = async (user: UserAdminResponseDto) => {
+  const $t = await getFormatter();
+  const prompt = $t('admin.confirm_user_pin_code_reset', { values: { user: user.name } });
+  const success = await modalManager.showDialog({ prompt });
+  if (!success) {
+    return false;
+  }
+
+  try {
+    const response = await updateUserAdmin({ id: user.id, userAdminUpdateDto: { pinCode: null } });
+    eventManager.emit('UserAdminUpdate', response);
+    toastManager.success($t('pin_code_reset_successfully'));
+    return true;
+  } catch (error) {
+    handleError(error, $t('errors.unable_to_reset_pin_code'));
+    return false;
+  }
+};
diff --git a/web/src/lib/types.ts b/web/src/lib/types.ts
new file mode 100644
index 0000000000..960158a0f7
--- /dev/null
+++ b/web/src/lib/types.ts
@@ -0,0 +1,4 @@
+import type { MenuItem } from '@immich/ui';
+import type { HTMLAttributes } from 'svelte/elements';
+
+export type ActionItem = MenuItem & { props?: Omit<HTMLAttributes<HTMLElement>, 'color'> };
diff --git a/web/src/routes/admin/users/+page.svelte b/web/src/routes/admin/users/+page.svelte
index 129862a62c..c4c1012774 100644
--- a/web/src/routes/admin/users/+page.svelte
+++ b/web/src/routes/admin/users/+page.svelte
@@ -1,19 +1,16 @@
 <script lang="ts">
   import { page } from '$app/stores';
+  import HeaderButton from '$lib/components/HeaderButton.svelte';
   import AdminPageLayout from '$lib/components/layouts/AdminPageLayout.svelte';
-  import { AppRoute } from '$lib/constants';
-  import UserCreateModal from '$lib/modals/UserCreateModal.svelte';
-  import UserDeleteConfirmModal from '$lib/modals/UserDeleteConfirmModal.svelte';
-  import UserRestoreConfirmModal from '$lib/modals/UserRestoreConfirmModal.svelte';
+  import OnEvents from '$lib/components/OnEvents.svelte';
+  import TableButton from '$lib/components/TableButton.svelte';
+  import { getUserAdminActions, getUserAdminsActions } from '$lib/services/user-admin.service';
   import { locale } from '$lib/stores/preferences.store';
-  import { serverConfig } from '$lib/stores/server-config.store';
-  import { user } from '$lib/stores/user.store';
   import { websocketEvents } from '$lib/stores/websocket';
   import { getByteUnitString } from '$lib/utils/byte-units';
-  import { UserStatus, searchUsersAdmin, type UserAdminResponseDto } from '@immich/sdk';
-  import { Button, HStack, Icon, IconButton, Text, modalManager, toastManager } from '@immich/ui';
-  import { mdiDeleteRestore, mdiEyeOutline, mdiInfinity, mdiPlusBoxOutline, mdiTrashCanOutline } from '@mdi/js';
-  import { DateTime } from 'luxon';
+  import { searchUsersAdmin, type UserAdminResponseDto } from '@immich/sdk';
+  import { HStack, Icon, toastManager } from '@immich/ui';
+  import { mdiInfinity } from '@mdi/js';
   import { onMount } from 'svelte';
   import { t } from 'svelte-i18n';
   import type { PageData } from './$types';
@@ -44,36 +41,24 @@
     return websocketEvents.on('on_user_delete', onDeleteSuccess);
   });
 
-  const getDeleteDate = (deletedAt: string): Date => {
-    return DateTime.fromISO(deletedAt).plus({ days: $serverConfig.userDeleteDelay }).toJSDate();
-  };
+  const UserAdminsActions = $derived(getUserAdminsActions($t));
 
-  const handleCreate = async () => {
-    await modalManager.show(UserCreateModal);
+  const onUpdate = async () => {
     await refresh();
   };
-
-  const handleDelete = async (user: UserAdminResponseDto) => {
-    const result = await modalManager.show(UserDeleteConfirmModal, { user });
-    if (result) {
-      await refresh();
-    }
-  };
-
-  const handleRestore = async (user: UserAdminResponseDto) => {
-    const result = await modalManager.show(UserRestoreConfirmModal, { user });
-    if (result) {
-      await refresh();
-    }
-  };
 </script>
 
+<OnEvents
+  onUserAdminCreate={onUpdate}
+  onUserAdminUpdate={onUpdate}
+  onUserAdminDelete={onUpdate}
+  onUserAdminRestore={onUpdate}
+/>
+
 <AdminPageLayout title={data.meta.title}>
   {#snippet buttons()}
     <HStack gap={1}>
-      <Button leadingIcon={mdiPlusBoxOutline} onclick={handleCreate} size="small" variant="ghost" color="secondary">
-        <Text class="hidden md:block">{$t('create_user')}</Text>
-      </Button>
+      <HeaderButton action={UserAdminsActions.Create} />
     </HStack>
   {/snippet}
   <section id="setting-content" class="flex place-content-center sm:mx-4">
@@ -93,20 +78,21 @@
         </thead>
         <tbody class="block w-full overflow-y-auto rounded-md border dark:border-immich-dark-gray">
           {#if allUsers}
-            {#each allUsers as immichUser (immichUser.id)}
+            {#each allUsers as user (user.id)}
+              {@const UserAdminActions = getUserAdminActions($t, user)}
               <tr
-                class="flex h-20 overflow-hidden w-full place-items-center text-center dark:text-immich-dark-fg {immichUser.deletedAt
+                class="flex h-20 overflow-hidden w-full place-items-center text-center dark:text-immich-dark-fg {user.deletedAt
                   ? 'bg-red-300 dark:bg-red-900'
                   : 'even:bg-subtle/20 odd:bg-subtle/80'}"
               >
                 <td class="w-8/12 sm:w-5/12 lg:w-6/12 xl:w-4/12 2xl:w-5/12 text-ellipsis break-all px-2 text-sm">
-                  {immichUser.email}
+                  {user.email}
                 </td>
-                <td class="hidden sm:block w-3/12 text-ellipsis break-all px-2 text-sm">{immichUser.name}</td>
+                <td class="hidden sm:block w-3/12 text-ellipsis break-all px-2 text-sm">{user.name}</td>
                 <td class="hidden xl:block w-3/12 2xl:w-2/12 text-ellipsis break-all px-2 text-sm">
                   <div class="container mx-auto flex flex-wrap justify-center">
-                    {#if immichUser.quotaSizeInBytes !== null && immichUser.quotaSizeInBytes >= 0}
-                      {getByteUnitString(immichUser.quotaSizeInBytes, $locale)}
+                    {#if user.quotaSizeInBytes !== null && user.quotaSizeInBytes >= 0}
+                      {getByteUnitString(user.quotaSizeInBytes, $locale)}
                     {:else}
                       <Icon icon={mdiInfinity} size="16" />
                     {/if}
@@ -115,38 +101,8 @@
                 <td
                   class="flex flex-row flex-wrap justify-center gap-x-2 gap-y-1 w-4/12 lg:w-3/12 xl:w-2/12 text-ellipsis break-all text-sm"
                 >
-                  {#if !immichUser.deletedAt}
-                    <IconButton
-                      shape="round"
-                      size="medium"
-                      icon={mdiEyeOutline}
-                      title={$t('view_user')}
-                      href={`${AppRoute.ADMIN_USERS}/${immichUser.id}`}
-                      aria-label={$t('view_user')}
-                    />
-                    {#if immichUser.id !== $user.id}
-                      <IconButton
-                        shape="round"
-                        size="medium"
-                        icon={mdiTrashCanOutline}
-                        title={$t('delete_user')}
-                        onclick={() => handleDelete(immichUser)}
-                        aria-label={$t('delete_user')}
-                      />
-                    {/if}
-                  {/if}
-                  {#if immichUser.deletedAt && immichUser.status === UserStatus.Deleted}
-                    <IconButton
-                      shape="round"
-                      size="medium"
-                      icon={mdiDeleteRestore}
-                      title={$t('admin.user_restore_scheduled_removal', {
-                        values: { date: getDeleteDate(immichUser.deletedAt) },
-                      })}
-                      onclick={() => handleRestore(immichUser)}
-                      aria-label={$t('admin.user_restore_scheduled_removal')}
-                    />
-                  {/if}
+                  <TableButton action={UserAdminActions.View} />
+                  <TableButton action={UserAdminActions.ContextMenu} />
                 </td>
               </tr>
             {/each}
diff --git a/web/src/routes/admin/users/[id]/+page.svelte b/web/src/routes/admin/users/[id]/+page.svelte
index 79c663af39..49cfb4715a 100644
--- a/web/src/routes/admin/users/[id]/+page.svelte
+++ b/web/src/routes/admin/users/[id]/+page.svelte
@@ -1,22 +1,18 @@
 <script lang="ts">
+  import HeaderButton from '$lib/components/HeaderButton.svelte';
   import AdminPageLayout from '$lib/components/layouts/AdminPageLayout.svelte';
+  import OnEvents from '$lib/components/OnEvents.svelte';
   import ServerStatisticsCard from '$lib/components/server-statistics/ServerStatisticsCard.svelte';
   import UserAvatar from '$lib/components/shared-components/user-avatar.svelte';
   import DeviceCard from '$lib/components/user-settings-page/device-card.svelte';
   import FeatureSetting from '$lib/components/users/FeatureSetting.svelte';
-  import PasswordResetSuccessModal from '$lib/modals/PasswordResetSuccessModal.svelte';
-  import UserDeleteConfirmModal from '$lib/modals/UserDeleteConfirmModal.svelte';
-  import UserEditModal from '$lib/modals/UserEditModal.svelte';
-  import UserRestoreConfirmModal from '$lib/modals/UserRestoreConfirmModal.svelte';
+  import { getUserAdminActions } from '$lib/services/user-admin.service';
   import { locale } from '$lib/stores/preferences.store';
-  import { user as authUser } from '$lib/stores/user.store';
   import { createDateFormatter, findLocale } from '$lib/utils';
   import { getBytesWithUnit } from '$lib/utils/byte-units';
-  import { handleError } from '$lib/utils/handle-error';
-  import { updateUserAdmin } from '@immich/sdk';
+  import { type UserAdminResponseDto } from '@immich/sdk';
   import {
     Alert,
-    Button,
     Card,
     CardBody,
     CardHeader,
@@ -27,10 +23,8 @@
     Heading,
     HStack,
     Icon,
-    modalManager,
     Stack,
     Text,
-    toastManager,
   } from '@immich/ui';
   import {
     mdiAccountOutline,
@@ -38,12 +32,8 @@
     mdiChartPie,
     mdiChartPieOutline,
     mdiCheckCircle,
-    mdiDeleteRestore,
     mdiDevices,
     mdiFeatureSearchOutline,
-    mdiLockSmart,
-    mdiOnepassword,
-    mdiPencilOutline,
     mdiPlayCircle,
     mdiTrashCanOutline,
   } from '@mdi/js';
@@ -66,8 +56,6 @@
   const usedBytes = $derived(user.quotaUsageInBytes ?? 0);
   const availableBytes = $derived(user.quotaSizeInBytes ?? 1);
   let usedPercentage = $derived(Math.min(Math.round((usedBytes / availableBytes) * 100), 100));
-  let canResetPassword = $derived($authUser.id !== user.id);
-  let newPassword = $state<string>('');
 
   let editedLocale = $derived(findLocale($locale).code);
   let createAtDate: Date = $derived(new Date(user.createdAt));
@@ -75,27 +63,6 @@
   let userCreatedAtDateAndTime: string = $derived(createDateFormatter(editedLocale).formatDateTime(createAtDate));
   let userUpdatedAtDateAndTime: string = $derived(createDateFormatter(editedLocale).formatDateTime(updatedAtDate));
 
-  const handleEdit = async () => {
-    const result = await modalManager.show(UserEditModal, { user: { ...user } });
-    if (result) {
-      user = result;
-    }
-  };
-
-  const handleDelete = async () => {
-    const result = await modalManager.show(UserDeleteConfirmModal, { user });
-    if (result) {
-      user = result;
-    }
-  };
-
-  const handleRestore = async () => {
-    const result = await modalManager.show(UserRestoreConfirmModal, { user });
-    if (result) {
-      user = result;
-    }
-  };
-
   const getUsageClass = () => {
     if (usedPercentage >= 95) {
       return 'bg-red-500';
@@ -108,122 +75,25 @@
     return 'bg-primary';
   };
 
-  const handleResetPassword = async () => {
-    const isConfirmed = await modalManager.showDialog({
-      prompt: $t('admin.confirm_user_password_reset', { values: { user: user.name } }),
-    });
+  const UserAdminActions = $derived(getUserAdminActions($t, user));
 
-    if (!isConfirmed) {
-      return;
-    }
-
-    try {
-      newPassword = generatePassword();
-
-      await updateUserAdmin({
-        id: user.id,
-        userAdminUpdateDto: {
-          password: newPassword,
-          shouldChangePassword: true,
-        },
-      });
-
-      await modalManager.show(PasswordResetSuccessModal, { newPassword });
-    } catch (error) {
-      handleError(error, $t('errors.unable_to_reset_password'));
+  const onUpdate = (update: UserAdminResponseDto) => {
+    if (update.id === user.id) {
+      user = update;
     }
   };
-
-  const handleResetUserPinCode = async () => {
-    const isConfirmed = await modalManager.showDialog({
-      prompt: $t('admin.confirm_user_pin_code_reset', { values: { user: user.name } }),
-    });
-
-    if (!isConfirmed) {
-      return;
-    }
-
-    try {
-      await updateUserAdmin({ id: user.id, userAdminUpdateDto: { pinCode: null } });
-      toastManager.success($t('pin_code_reset_successfully'));
-    } catch (error) {
-      handleError(error, $t('errors.unable_to_reset_pin_code'));
-    }
-  };
-
-  // TODO move password reset server-side
-  function generatePassword(length: number = 16) {
-    let generatedPassword = '';
-
-    const characterSet = '0123456789' + 'abcdefghijklmnopqrstuvwxyz' + 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' + ',.-{}+!#$%/()=?';
-
-    for (let i = 0; i < length; i++) {
-      let randomNumber = crypto.getRandomValues(new Uint32Array(1))[0];
-      randomNumber = randomNumber / 2 ** 32;
-      randomNumber = Math.floor(randomNumber * characterSet.length);
-
-      generatedPassword += characterSet[randomNumber];
-    }
-
-    return generatedPassword;
-  }
 </script>
 
+<OnEvents onUserAdminUpdate={onUpdate} onUserAdminDelete={onUpdate} onUserAdminRestore={onUpdate} />
+
 <AdminPageLayout title={data.meta.title}>
   {#snippet buttons()}
     <HStack gap={0}>
-      {#if canResetPassword}
-        <Button
-          color="secondary"
-          size="small"
-          variant="ghost"
-          leadingIcon={mdiOnepassword}
-          onclick={handleResetPassword}
-        >
-          <Text class="hidden md:block">{$t('reset_password')}</Text>
-        </Button>
-      {/if}
-
-      <Button
-        color="secondary"
-        size="small"
-        variant="ghost"
-        leadingIcon={mdiLockSmart}
-        onclick={handleResetUserPinCode}
-      >
-        <Text class="hidden md:block">{$t('reset_pin_code')}</Text>
-      </Button>
-      <Button
-        color="secondary"
-        size="small"
-        variant="ghost"
-        leadingIcon={mdiPencilOutline}
-        onclick={() => handleEdit()}
-      >
-        <Text class="hidden md:block">{$t('edit_user')}</Text>
-      </Button>
-      {#if user.deletedAt}
-        <Button
-          color="primary"
-          size="small"
-          variant="ghost"
-          leadingIcon={mdiDeleteRestore}
-          class="ms-1"
-          onclick={() => handleRestore()}
-        >
-          <Text class="hidden md:block">{$t('restore_user')}</Text>
-        </Button>
-      {:else}
-        <Button
-          color="danger"
-          size="small"
-          variant="ghost"
-          leadingIcon={mdiTrashCanOutline}
-          onclick={() => handleDelete()}
-        >
-          <Text class="hidden md:block">{$t('delete_user')}</Text>
-        </Button>
-      {/if}
+      <HeaderButton action={UserAdminActions.ResetPassword} />
+      <HeaderButton action={UserAdminActions.ResetPinCode} />
+      <HeaderButton action={UserAdminActions.Update} />
+      <HeaderButton action={UserAdminActions.Restore} />
+      <HeaderButton action={UserAdminActions.Delete} />
     </HStack>
   {/snippet}
   <div>

From 0b3633db4f2c6b050475554387e63be03bdf9a6d Mon Sep 17 00:00:00 2001
From: David Wolff <david@dav.dev>
Date: Tue, 11 Nov 2025 13:47:11 +0100
Subject: [PATCH 76/84] fix(server): properly handle HEAD requests to SSR paths
 (#23788)

---
 server/src/services/api.service.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/server/src/services/api.service.ts b/server/src/services/api.service.ts
index 143b470750..ee9b0e622d 100644
--- a/server/src/services/api.service.ts
+++ b/server/src/services/api.service.ts
@@ -65,9 +65,10 @@ export class ApiService {
     }
 
     return async (request: Request, res: Response, next: NextFunction) => {
+      const method = request.method.toLowerCase();
       if (
         request.url.startsWith('/api') ||
-        request.method.toLowerCase() !== 'get' ||
+        (method !== 'get' && method !== 'head') ||
         excludePaths.some((item) => request.url.startsWith(item))
       ) {
         return next();

From 905f4375b0f402f7c65b0b26611880f86c34ee90 Mon Sep 17 00:00:00 2001
From: Mees Frensel <33722705+meesfrensel@users.noreply.github.com>
Date: Tue, 11 Nov 2025 15:50:31 +0100
Subject: [PATCH 77/84] fix(web): make sliding window cover all visible space
 to show small number of assets (#23796)

---
 .../shared-components/gallery-viewer/gallery-viewer.svelte      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/src/lib/components/shared-components/gallery-viewer/gallery-viewer.svelte b/web/src/lib/components/shared-components/gallery-viewer/gallery-viewer.svelte
index 7f87237054..82f876834a 100644
--- a/web/src/lib/components/shared-components/gallery-viewer/gallery-viewer.svelte
+++ b/web/src/lib/components/shared-components/gallery-viewer/gallery-viewer.svelte
@@ -99,7 +99,7 @@
   let scrollTop = $state(0);
   let slidingWindow = $derived.by(() => {
     const top = (scrollTop || 0) - slidingWindowOffset;
-    const bottom = top + viewport.height;
+    const bottom = top + viewport.height + slidingWindowOffset;
     return {
       top,
       bottom,

From f915d4cc909ab768cf79840a4e4dccc6f3d93128 Mon Sep 17 00:00:00 2001
From: bo0tzz <git@bo0tzz.me>
Date: Tue, 11 Nov 2025 15:51:21 +0100
Subject: [PATCH 78/84] fix: disable ruby updates (#23794)

Until https://github.com/fastlane/fastlane/issues/29183 is fixed
---
 renovate.json | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/renovate.json b/renovate.json
index 3a889f4789..fbbc8976bd 100644
--- a/renovate.json
+++ b/renovate.json
@@ -26,6 +26,12 @@
       "matchPackageNames": ["ghcr.io/immich-app/postgres"],
       "matchUpdateTypes": ["major"],
       "enabled": false
+    },
+    {
+      "matchPackageNames": ["ruby"],
+      "groupName": "ruby",
+      "matchCurrentVersion": "< 3.4",
+      "enabled": false
     }
   ],
   "ignorePaths": [

From 2dc81e28fca3a0ee78f87b4593a2bc38eb45f9f7 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 11 Nov 2025 16:25:36 +0100
Subject: [PATCH 79/84] chore(deps): update github-actions (#23582)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .github/workflows/cli.yml              | 4 ++--
 .github/workflows/close-duplicates.yml | 2 +-
 .github/workflows/codeql-analysis.yml  | 6 +++---
 .github/workflows/prepare-release.yml  | 2 +-
 .github/workflows/test.yml             | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/cli.yml b/.github/workflows/cli.yml
index dae8cec1fd..fc2c9f6853 100644
--- a/.github/workflows/cli.yml
+++ b/.github/workflows/cli.yml
@@ -84,7 +84,7 @@ jobs:
           token: ${{ steps.token.outputs.token }}
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
+        uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3.7.0
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
@@ -105,7 +105,7 @@ jobs:
 
       - name: Generate docker image tags
         id: metadata
-        uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # v5.8.0
+        uses: docker/metadata-action@318604b99e75e41977312d83839a89be02ca4893 # v5.9.0
         with:
           flavor: |
             latest=false
diff --git a/.github/workflows/close-duplicates.yml b/.github/workflows/close-duplicates.yml
index ba360b50dc..b3c79f81d8 100644
--- a/.github/workflows/close-duplicates.yml
+++ b/.github/workflows/close-duplicates.yml
@@ -35,7 +35,7 @@ jobs:
     needs: [get_body, should_run]
     if: ${{ needs.should_run.outputs.should_run == 'true' }}
     container:
-      image: ghcr.io/immich-app/mdq:main@sha256:6b8450bfc06770af1af66bce9bf2ced7d1d9b90df1a59fc4c83a17777a9f6723
+      image: ghcr.io/immich-app/mdq:main@sha256:9c905a4ff69f00c4b2f98b40b6090ab3ab18d1a15ed1379733b8691aa1fcb271
     outputs:
       checked: ${{ steps.get_checkbox.outputs.checked }}
     steps:
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 3f32478c0c..34228843ad 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -57,7 +57,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@16140ae1a102900babc80a33c44059580f687047 # v4.30.9
+        uses: github/codeql-action/init@0499de31b99561a6d14a36a5f662c2a54f91beee # v4.31.2
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -70,7 +70,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@16140ae1a102900babc80a33c44059580f687047 # v4.30.9
+        uses: github/codeql-action/autobuild@0499de31b99561a6d14a36a5f662c2a54f91beee # v4.31.2
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -83,6 +83,6 @@ jobs:
       #   ./location_of_script_within_repo/buildscript.sh
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@16140ae1a102900babc80a33c44059580f687047 # v4.30.9
+        uses: github/codeql-action/analyze@0499de31b99561a6d14a36a5f662c2a54f91beee # v4.31.2
         with:
           category: '/language:${{matrix.language}}'
diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml
index 77f32ace4f..4b278d9475 100644
--- a/.github/workflows/prepare-release.yml
+++ b/.github/workflows/prepare-release.yml
@@ -62,7 +62,7 @@ jobs:
           ref: main
 
       - name: Install uv
-        uses: astral-sh/setup-uv@2ddd2b9cb38ad8efd50337e8ab201519a34c9f24 # v7.1.1
+        uses: astral-sh/setup-uv@85856786d1ce8acfbcc2f13a5f3fbd6b938f9f41 # v7.1.2
 
       - name: Setup pnpm
         uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 0a63046c0e..44d7250f2f 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -563,7 +563,7 @@ jobs:
           persist-credentials: false
           token: ${{ steps.token.outputs.token }}
       - name: Install uv
-        uses: astral-sh/setup-uv@2ddd2b9cb38ad8efd50337e8ab201519a34c9f24 # v7.1.1
+        uses: astral-sh/setup-uv@85856786d1ce8acfbcc2f13a5f3fbd6b938f9f41 # v7.1.2
       - uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
         # TODO: add caching when supported (https://github.com/actions/setup-python/pull/818)
         # with:

From 337e3a8dac4e05de59d42657cc8bc59b1fc410eb Mon Sep 17 00:00:00 2001
From: idubnori <i.dub.nori@gmail.com>
Date: Wed, 12 Nov 2025 01:04:54 +0900
Subject: [PATCH 80/84] feat(mobile): album activity deep link (#23737)

* feat: add activity deep link support in DeepLinkService

* test: add unit tests for DeepLinkService handling of activity deep links

* Revert "test: add unit tests for DeepLinkService handling of activity deep links"

This reverts commit 0b1914be9ad03c545fc5a32ee3aecd0181e4dca5.
---
 mobile/lib/services/deep_link.service.dart | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/mobile/lib/services/deep_link.service.dart b/mobile/lib/services/deep_link.service.dart
index d67362aac2..6ede7f6830 100644
--- a/mobile/lib/services/deep_link.service.dart
+++ b/mobile/lib/services/deep_link.service.dart
@@ -77,6 +77,7 @@ class DeepLinkService {
       "memory" => await _buildMemoryDeepLink(queryParams['id'] ?? ''),
       "asset" => await _buildAssetDeepLink(queryParams['id'] ?? '', ref),
       "album" => await _buildAlbumDeepLink(queryParams['id'] ?? ''),
+      "activity" => await _buildActivityDeepLink(queryParams['albumId'] ?? ''),
       _ => null,
     };
 
@@ -185,4 +186,18 @@ class DeepLinkService {
       return AlbumViewerRoute(albumId: album.id);
     }
   }
+
+  Future<PageRouteInfo?> _buildActivityDeepLink(String albumId) async {
+    if (Store.isBetaTimelineEnabled == false) {
+      return null;
+    }
+
+    final album = await _betaRemoteAlbumService.get(albumId);
+
+    if (album == null || album.isActivityEnabled == false) {
+      return null;
+    }
+
+    return DriftActivitiesRoute(album: album);
+  }
 }

From 4fd9e42ce52bd78746e75d270fca7276aac0b5ac Mon Sep 17 00:00:00 2001
From: Mees Frensel <33722705+meesfrensel@users.noreply.github.com>
Date: Tue, 11 Nov 2025 17:22:53 +0100
Subject: [PATCH 81/84] feat(web): animate gifs on hover (#23198)

---
 .../assets/thumbnail/thumbnail.svelte         | 30 ++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/web/src/lib/components/assets/thumbnail/thumbnail.svelte b/web/src/lib/components/assets/thumbnail/thumbnail.svelte
index 994d741605..dd13d613b2 100644
--- a/web/src/lib/components/assets/thumbnail/thumbnail.svelte
+++ b/web/src/lib/components/assets/thumbnail/thumbnail.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { ProjectionType } from '$lib/constants';
   import { locale, playVideoThumbnailOnHover } from '$lib/stores/preferences.store';
-  import { getAssetPlaybackUrl, getAssetThumbnailUrl } from '$lib/utils';
+  import { getAssetOriginalUrl, getAssetPlaybackUrl, getAssetThumbnailUrl } from '$lib/utils';
   import { timeToSeconds } from '$lib/utils/date-time';
   import { getAltText } from '$lib/utils/thumbnail-util';
   import { AssetMediaSize, AssetVisibility } from '@immich/sdk';
@@ -9,6 +9,7 @@
     mdiArchiveArrowDownOutline,
     mdiCameraBurst,
     mdiCheckCircle,
+    mdiFileGifBox,
     mdiHeart,
     mdiMotionPauseOutline,
     mdiMotionPlayOutline,
@@ -281,6 +282,14 @@
           </div>
         {/if}
 
+        {#if asset.isImage && asset.duration}
+          <div class="absolute end-0 top-0 flex place-items-center gap-1 text-xs font-medium text-white">
+            <span class="pe-2 pt-2">
+              <Icon icon={mdiFileGifBox} size="24" />
+            </span>
+          </div>
+        {/if}
+
         <!-- Stacked asset -->
         {#if asset.stack && showStackedIcon}
           <div
@@ -342,6 +351,25 @@
             playbackOnIconHover={!$playVideoThumbnailOnHover}
           />
         </div>
+      {:else if asset.isImage && asset.duration && mouseOver}
+        <!-- GIF -->
+        <div class="absolute top-0 h-full w-full pointer-events-none">
+          <div class="absolute h-full w-full bg-linear-to-b from-black/25 via-[transparent_25%]"></div>
+          <ImageThumbnail
+            class={imageClass}
+            {brokenAssetClass}
+            url={getAssetOriginalUrl({ id: asset.id, cacheKey: asset.thumbhash })}
+            altText={$getAltText(asset)}
+            widthStyle="{width}px"
+            heightStyle="{height}px"
+            curve={selected}
+          />
+          <div class="absolute end-0 top-0 flex place-items-center gap-1 text-xs font-medium text-white">
+            <span class="pe-2 pt-2">
+              <Icon icon={mdiMotionPauseOutline} size="24" />
+            </span>
+          </div>
+        </div>
       {/if}
 
       {#if (!loaded || thumbError) && asset.thumbhash}

From e8e9e7830e440747274a5ca35701ff70f50d6ea5 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 11 Nov 2025 20:04:22 +0000
Subject: [PATCH 82/84] chore(deps): update github-actions (major) (#23812)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: bo0tzz <git@bo0tzz.me>
---
 .github/workflows/build-mobile.yml    | 4 ++--
 .github/workflows/docs-build.yml      | 2 +-
 .github/workflows/prepare-release.yml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build-mobile.yml b/.github/workflows/build-mobile.yml
index e39a8f5ea9..e4ae09bfd7 100644
--- a/.github/workflows/build-mobile.yml
+++ b/.github/workflows/build-mobile.yml
@@ -165,7 +165,7 @@ jobs:
           fi
 
       - name: Publish Android Artifact
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: release-apk-signed
           path: mobile/build/app/outputs/flutter-apk/*.apk
@@ -317,7 +317,7 @@ jobs:
           security delete-keychain build.keychain || true
 
       - name: Upload IPA artifact
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: ios-release-ipa
           path: mobile/ios/Runner.ipa
diff --git a/.github/workflows/docs-build.yml b/.github/workflows/docs-build.yml
index 2a28b57569..823aa98fc8 100644
--- a/.github/workflows/docs-build.yml
+++ b/.github/workflows/docs-build.yml
@@ -85,7 +85,7 @@ jobs:
         run: pnpm build
 
       - name: Upload build output
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: docs-build-output
           path: docs/build/
diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml
index 4b278d9475..6e7ee8f608 100644
--- a/.github/workflows/prepare-release.yml
+++ b/.github/workflows/prepare-release.yml
@@ -138,7 +138,7 @@ jobs:
           persist-credentials: false
 
       - name: Download APK
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+        uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
         with:
           name: release-apk-signed
           github-token: ${{ steps.generate-token.outputs.token }}

From 896665bca908b925fa19fb0908da2286fb8b4d21 Mon Sep 17 00:00:00 2001
From: Alex <alex.tran1502@gmail.com>
Date: Tue, 11 Nov 2025 15:35:44 -0600
Subject: [PATCH 83/84] fix: iOS release build dependency verification (#23814)

---
 mobile/ios/Runner.xcodeproj/project.pbxproj   |  16 +-
 .../xcshareddata/swiftpm/Package.resolved     | 177 ++++++++++++++++++
 .../xcshareddata/swiftpm/Package.resolved     |  18 ++
 3 files changed, 202 insertions(+), 9 deletions(-)
 create mode 100644 mobile/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

diff --git a/mobile/ios/Runner.xcodeproj/project.pbxproj b/mobile/ios/Runner.xcodeproj/project.pbxproj
index d2d9e8f0b7..599e7990f4 100644
--- a/mobile/ios/Runner.xcodeproj/project.pbxproj
+++ b/mobile/ios/Runner.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 77;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -136,11 +136,15 @@
 /* Begin PBXFileSystemSynchronizedRootGroup section */
 		B231F52D2E93A44A00BC45D1 /* Core */ = {
 			isa = PBXFileSystemSynchronizedRootGroup;
+			exceptions = (
+			);
 			path = Core;
 			sourceTree = "<group>";
 		};
 		B2CF7F8C2DDE4EBB00744BF6 /* Sync */ = {
 			isa = PBXFileSystemSynchronizedRootGroup;
+			exceptions = (
+			);
 			path = Sync;
 			sourceTree = "<group>";
 		};
@@ -154,6 +158,8 @@
 		};
 		FEE084F22EC172080045228E /* Schemas */ = {
 			isa = PBXFileSystemSynchronizedRootGroup;
+			exceptions = (
+			);
 			path = Schemas;
 			sourceTree = "<group>";
 		};
@@ -543,14 +549,10 @@
 			inputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			inputPaths = (
-			);
 			name = "[CP] Copy Pods Resources";
 			outputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
 			);
-			outputPaths = (
-			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
@@ -579,14 +581,10 @@
 			inputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			inputPaths = (
-			);
 			name = "[CP] Embed Pods Frameworks";
 			outputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
 			);
-			outputPaths = (
-			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
diff --git a/mobile/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/mobile/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
new file mode 100644
index 0000000000..432e81234d
--- /dev/null
+++ b/mobile/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -0,0 +1,177 @@
+{
+  "originHash" : "9be33bfaa68721646604aefff3cabbdaf9a193da192aae024c265065671f6c49",
+  "pins" : [
+    {
+      "identity" : "combine-schedulers",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/pointfreeco/combine-schedulers",
+      "state" : {
+        "revision" : "fd16d76fd8b9a976d88bfb6cacc05ca8d19c91b6",
+        "version" : "1.1.0"
+      }
+    },
+    {
+      "identity" : "grdb.swift",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/groue/GRDB.swift",
+      "state" : {
+        "revision" : "18497b68fdbb3a09528d260a0a0e1e7e61c8c53d",
+        "version" : "7.8.0"
+      }
+    },
+    {
+      "identity" : "opencombine",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/OpenCombine/OpenCombine.git",
+      "state" : {
+        "revision" : "8576f0d579b27020beccbccc3ea6844f3ddfc2c2",
+        "version" : "0.14.0"
+      }
+    },
+    {
+      "identity" : "sqlite-data",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/pointfreeco/sqlite-data",
+      "state" : {
+        "revision" : "b66b894b9a5710f1072c8eb6448a7edfc2d743d9",
+        "version" : "1.3.0"
+      }
+    },
+    {
+      "identity" : "swift-case-paths",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/pointfreeco/swift-case-paths",
+      "state" : {
+        "revision" : "6989976265be3f8d2b5802c722f9ba168e227c71",
+        "version" : "1.7.2"
+      }
+    },
+    {
+      "identity" : "swift-clocks",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/pointfreeco/swift-clocks",
+      "state" : {
+        "revision" : "cc46202b53476d64e824e0b6612da09d84ffde8e",
+        "version" : "1.0.6"
+      }
+    },
+    {
+      "identity" : "swift-collections",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/apple/swift-collections",
+      "state" : {
+        "revision" : "7b847a3b7008b2dc2f47ca3110d8c782fb2e5c7e",
+        "version" : "1.3.0"
+      }
+    },
+    {
+      "identity" : "swift-concurrency-extras",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/pointfreeco/swift-concurrency-extras",
+      "state" : {
+        "revision" : "5a3825302b1a0d744183200915a47b508c828e6f",
+        "version" : "1.3.2"
+      }
+    },
+    {
+      "identity" : "swift-custom-dump",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/pointfreeco/swift-custom-dump",
+      "state" : {
+        "revision" : "82645ec760917961cfa08c9c0c7104a57a0fa4b1",
+        "version" : "1.3.3"
+      }
+    },
+    {
+      "identity" : "swift-dependencies",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/pointfreeco/swift-dependencies",
+      "state" : {
+        "revision" : "a10f9feeb214bc72b5337b6ef6d5a029360db4cc",
+        "version" : "1.10.0"
+      }
+    },
+    {
+      "identity" : "swift-http-structured-headers",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/apple/swift-http-structured-headers.git",
+      "state" : {
+        "revision" : "a9f3c352f4d46afd155e00b3c6e85decae6bcbeb",
+        "version" : "1.5.0"
+      }
+    },
+    {
+      "identity" : "swift-identified-collections",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/pointfreeco/swift-identified-collections",
+      "state" : {
+        "revision" : "322d9ffeeba85c9f7c4984b39422ec7cc3c56597",
+        "version" : "1.1.1"
+      }
+    },
+    {
+      "identity" : "swift-perception",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/pointfreeco/swift-perception",
+      "state" : {
+        "revision" : "4f47ebafed5f0b0172cf5c661454fa8e28fb2ac4",
+        "version" : "2.0.9"
+      }
+    },
+    {
+      "identity" : "swift-sharing",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/pointfreeco/swift-sharing",
+      "state" : {
+        "revision" : "3bfc408cc2d0bee2287c174da6b1c76768377818",
+        "version" : "2.7.4"
+      }
+    },
+    {
+      "identity" : "swift-snapshot-testing",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/pointfreeco/swift-snapshot-testing",
+      "state" : {
+        "revision" : "a8b7c5e0ed33d8ab8887d1654d9b59f2cbad529b",
+        "version" : "1.18.7"
+      }
+    },
+    {
+      "identity" : "swift-structured-queries",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/pointfreeco/swift-structured-queries",
+      "state" : {
+        "revision" : "9c84335373bae5f5c9f7b5f0adf3ae10f2cab5b9",
+        "version" : "0.25.2"
+      }
+    },
+    {
+      "identity" : "swift-syntax",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/swiftlang/swift-syntax",
+      "state" : {
+        "revision" : "4799286537280063c85a32f09884cfbca301b1a1",
+        "version" : "602.0.0"
+      }
+    },
+    {
+      "identity" : "swift-tagged",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/pointfreeco/swift-tagged",
+      "state" : {
+        "revision" : "3907a9438f5b57d317001dc99f3f11b46882272b",
+        "version" : "0.10.0"
+      }
+    },
+    {
+      "identity" : "xctest-dynamic-overlay",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/pointfreeco/xctest-dynamic-overlay",
+      "state" : {
+        "revision" : "4c27acf5394b645b70d8ba19dc249c0472d5f618",
+        "version" : "1.7.0"
+      }
+    }
+  ],
+  "version" : 3
+}
diff --git a/mobile/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved b/mobile/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved
index af8b19fa89..ff8a53ff4b 100644
--- a/mobile/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/mobile/ios/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -28,6 +28,15 @@
         "version" : "1.3.0"
       }
     },
+    {
+      "identity" : "swift-case-paths",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/pointfreeco/swift-case-paths",
+      "state" : {
+        "revision" : "6989976265be3f8d2b5802c722f9ba168e227c71",
+        "version" : "1.7.2"
+      }
+    },
     {
       "identity" : "swift-clocks",
       "kind" : "remoteSourceControl",
@@ -136,6 +145,15 @@
         "version" : "602.0.0"
       }
     },
+    {
+      "identity" : "swift-tagged",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/pointfreeco/swift-tagged",
+      "state" : {
+        "revision" : "3907a9438f5b57d317001dc99f3f11b46882272b",
+        "version" : "0.10.0"
+      }
+    },
     {
       "identity" : "xctest-dynamic-overlay",
       "kind" : "remoteSourceControl",

From edde0f93aeedf29e70cee26047a3c594193e7fa5 Mon Sep 17 00:00:00 2001
From: Jason Rasmussen <jason@rasm.me>
Date: Tue, 11 Nov 2025 17:01:14 -0500
Subject: [PATCH 84/84] feat: endpoint descriptions (#23813)

---
 .../repositories/folder_api.repository.dart   |    2 +-
 mobile/lib/services/api.service.dart          |    8 +-
 mobile/openapi/README.md                      |  441 +++---
 mobile/openapi/lib/api.dart                   |    5 +-
 mobile/openapi/lib/api/activities_api.dart    |   32 +-
 mobile/openapi/lib/api/albums_api.dart        |   96 +-
 mobile/openapi/lib/api/api_keys_api.dart      |   49 +-
 mobile/openapi/lib/api/assets_api.dart        |  167 ++-
 ...api.dart => authentication_admin_api.dart} |   12 +-
 .../openapi/lib/api/authentication_api.dart   |  357 ++++-
 mobile/openapi/lib/api/deprecated_api.dart    |  199 ++-
 mobile/openapi/lib/api/download_api.dart      |   16 +-
 mobile/openapi/lib/api/duplicates_api.dart    |   24 +-
 mobile/openapi/lib/api/faces_api.dart         |   32 +-
 mobile/openapi/lib/api/jobs_api.dart          |   24 +-
 mobile/openapi/lib/api/libraries_api.dart     |   67 +-
 mobile/openapi/lib/api/map_api.dart           |   56 +-
 mobile/openapi/lib/api/memories_api.dart      |   64 +-
 .../lib/api/notifications_admin_api.dart      |   33 +-
 mobile/openapi/lib/api/notifications_api.dart |   48 +-
 mobile/openapi/lib/api/o_auth_api.dart        |  233 ---
 mobile/openapi/lib/api/partners_api.dart      |   40 +-
 mobile/openapi/lib/api/people_api.dart        |   88 +-
 mobile/openapi/lib/api/search_api.dart        |   80 +-
 mobile/openapi/lib/api/server_api.dart        |  127 +-
 mobile/openapi/lib/api/sessions_api.dart      |   48 +-
 mobile/openapi/lib/api/shared_links_api.dart  |  107 +-
 mobile/openapi/lib/api/stacks_api.dart        |   56 +-
 mobile/openapi/lib/api/sync_api.dart          |   54 +-
 mobile/openapi/lib/api/system_config_api.dart |   32 +-
 .../openapi/lib/api/system_metadata_api.dart  |   32 +-
 mobile/openapi/lib/api/tags_api.dart          |   72 +-
 mobile/openapi/lib/api/timeline_api.dart      |   16 +-
 mobile/openapi/lib/api/trash_api.dart         |   24 +-
 mobile/openapi/lib/api/users_admin_api.dart   |   80 +-
 mobile/openapi/lib/api/users_api.dart         |  120 +-
 .../lib/api/{view_api.dart => views_api.dart} |   24 +-
 open-api/immich-openapi-specs.json            | 1256 +++++++++++------
 open-api/typescript-sdk/src/fetch-client.ts   |  488 ++++---
 server/src/constants.ts                       |   55 +-
 server/src/controllers/activity.controller.ts |   23 +-
 server/src/controllers/album.controller.ts    |   56 +-
 server/src/controllers/api-key.controller.ts  |   27 +-
 .../src/controllers/asset-media.controller.ts |   35 +-
 server/src/controllers/asset.controller.ts    |   66 +-
 .../src/controllers/auth-admin.controller.ts  |   10 +-
 server/src/controllers/auth.controller.ts     |   51 +-
 server/src/controllers/download.controller.ts |   16 +-
 .../src/controllers/duplicate.controller.ts   |   18 +-
 server/src/controllers/face.controller.ts     |   23 +-
 server/src/controllers/job.controller.ts      |   20 +-
 server/src/controllers/library.controller.ts  |   39 +-
 server/src/controllers/map.controller.ts      |   13 +-
 server/src/controllers/memory.controller.ts   |   40 +-
 .../notification-admin.controller.ts          |   17 +-
 .../controllers/notification.controller.ts    |   30 +-
 server/src/controllers/oauth.controller.ts    |   27 +-
 server/src/controllers/partner.controller.ts  |   28 +-
 server/src/controllers/person.controller.ts   |   23 +-
 server/src/controllers/search.controller.ts   |   48 +-
 server/src/controllers/server.controller.ts   |   45 +-
 server/src/controllers/session.controller.ts  |   30 +-
 .../src/controllers/shared-link.controller.ts |   40 +-
 server/src/controllers/stack.controller.ts    |   35 +-
 server/src/controllers/sync.controller.ts     |   35 +-
 .../controllers/system-config.controller.ts   |   19 +-
 .../controllers/system-metadata.controller.ts |   22 +-
 server/src/controllers/tag.controller.ts      |   42 +-
 server/src/controllers/timeline.controller.ts |   11 +-
 server/src/controllers/trash.controller.ts    |   18 +-
 .../src/controllers/user-admin.controller.ts  |   46 +-
 server/src/controllers/user.controller.ts     |   54 +-
 server/src/controllers/view.controller.ts     |   13 +-
 server/src/decorators.ts                      |    4 +-
 server/src/enum.ts                            |   35 +
 server/src/utils/misc.ts                      |   33 +-
 76 files changed, 4193 insertions(+), 1663 deletions(-)
 rename mobile/openapi/lib/api/{auth_admin_api.dart => authentication_admin_api.dart} (77%)
 delete mode 100644 mobile/openapi/lib/api/o_auth_api.dart
 rename mobile/openapi/lib/api/{view_api.dart => views_api.dart} (83%)

diff --git a/mobile/lib/repositories/folder_api.repository.dart b/mobile/lib/repositories/folder_api.repository.dart
index dfda19e45e..d20ca8e0a9 100644
--- a/mobile/lib/repositories/folder_api.repository.dart
+++ b/mobile/lib/repositories/folder_api.repository.dart
@@ -8,7 +8,7 @@ import 'package:openapi/api.dart';
 final folderApiRepositoryProvider = Provider((ref) => FolderApiRepository(ref.watch(apiServiceProvider).viewApi));
 
 class FolderApiRepository extends ApiRepository {
-  final ViewApi _api;
+  final ViewsApi _api;
   final Logger _log = Logger("FolderApiRepository");
 
   FolderApiRepository(this._api);
diff --git a/mobile/lib/services/api.service.dart b/mobile/lib/services/api.service.dart
index 698ac3a159..1a714b6f40 100644
--- a/mobile/lib/services/api.service.dart
+++ b/mobile/lib/services/api.service.dart
@@ -17,7 +17,7 @@ class ApiService implements Authentication {
 
   late UsersApi usersApi;
   late AuthenticationApi authenticationApi;
-  late OAuthApi oAuthApi;
+  late AuthenticationApi oAuthApi;
   late AlbumsApi albumsApi;
   late AssetsApi assetsApi;
   late SearchApi searchApi;
@@ -32,7 +32,7 @@ class ApiService implements Authentication {
   late DownloadApi downloadApi;
   late TrashApi trashApi;
   late StacksApi stacksApi;
-  late ViewApi viewApi;
+  late ViewsApi viewApi;
   late MemoriesApi memoriesApi;
   late SessionsApi sessionsApi;
 
@@ -56,7 +56,7 @@ class ApiService implements Authentication {
     }
     usersApi = UsersApi(_apiClient);
     authenticationApi = AuthenticationApi(_apiClient);
-    oAuthApi = OAuthApi(_apiClient);
+    oAuthApi = AuthenticationApi(_apiClient);
     albumsApi = AlbumsApi(_apiClient);
     assetsApi = AssetsApi(_apiClient);
     serverInfoApi = ServerApi(_apiClient);
@@ -71,7 +71,7 @@ class ApiService implements Authentication {
     downloadApi = DownloadApi(_apiClient);
     trashApi = TrashApi(_apiClient);
     stacksApi = StacksApi(_apiClient);
-    viewApi = ViewApi(_apiClient);
+    viewApi = ViewsApi(_apiClient);
     memoriesApi = MemoriesApi(_apiClient);
     sessionsApi = SessionsApi(_apiClient);
   }
diff --git a/mobile/openapi/README.md b/mobile/openapi/README.md
index 33ccadba7e..ff04a91def 100644
--- a/mobile/openapi/README.md
+++ b/mobile/openapi/README.md
@@ -73,225 +73,228 @@ All URIs are relative to */api*
 
 Class | Method | HTTP request | Description
 ------------ | ------------- | ------------- | -------------
-*APIKeysApi* | [**createApiKey**](doc//APIKeysApi.md#createapikey) | **POST** /api-keys | 
-*APIKeysApi* | [**deleteApiKey**](doc//APIKeysApi.md#deleteapikey) | **DELETE** /api-keys/{id} | 
-*APIKeysApi* | [**getApiKey**](doc//APIKeysApi.md#getapikey) | **GET** /api-keys/{id} | 
-*APIKeysApi* | [**getApiKeys**](doc//APIKeysApi.md#getapikeys) | **GET** /api-keys | 
-*APIKeysApi* | [**getMyApiKey**](doc//APIKeysApi.md#getmyapikey) | **GET** /api-keys/me | 
-*APIKeysApi* | [**updateApiKey**](doc//APIKeysApi.md#updateapikey) | **PUT** /api-keys/{id} | 
-*ActivitiesApi* | [**createActivity**](doc//ActivitiesApi.md#createactivity) | **POST** /activities | 
-*ActivitiesApi* | [**deleteActivity**](doc//ActivitiesApi.md#deleteactivity) | **DELETE** /activities/{id} | 
-*ActivitiesApi* | [**getActivities**](doc//ActivitiesApi.md#getactivities) | **GET** /activities | 
-*ActivitiesApi* | [**getActivityStatistics**](doc//ActivitiesApi.md#getactivitystatistics) | **GET** /activities/statistics | 
-*AlbumsApi* | [**addAssetsToAlbum**](doc//AlbumsApi.md#addassetstoalbum) | **PUT** /albums/{id}/assets | 
-*AlbumsApi* | [**addAssetsToAlbums**](doc//AlbumsApi.md#addassetstoalbums) | **PUT** /albums/assets | 
-*AlbumsApi* | [**addUsersToAlbum**](doc//AlbumsApi.md#adduserstoalbum) | **PUT** /albums/{id}/users | 
-*AlbumsApi* | [**createAlbum**](doc//AlbumsApi.md#createalbum) | **POST** /albums | 
-*AlbumsApi* | [**deleteAlbum**](doc//AlbumsApi.md#deletealbum) | **DELETE** /albums/{id} | 
-*AlbumsApi* | [**getAlbumInfo**](doc//AlbumsApi.md#getalbuminfo) | **GET** /albums/{id} | 
-*AlbumsApi* | [**getAlbumStatistics**](doc//AlbumsApi.md#getalbumstatistics) | **GET** /albums/statistics | 
-*AlbumsApi* | [**getAllAlbums**](doc//AlbumsApi.md#getallalbums) | **GET** /albums | 
-*AlbumsApi* | [**removeAssetFromAlbum**](doc//AlbumsApi.md#removeassetfromalbum) | **DELETE** /albums/{id}/assets | 
-*AlbumsApi* | [**removeUserFromAlbum**](doc//AlbumsApi.md#removeuserfromalbum) | **DELETE** /albums/{id}/user/{userId} | 
-*AlbumsApi* | [**updateAlbumInfo**](doc//AlbumsApi.md#updatealbuminfo) | **PATCH** /albums/{id} | 
-*AlbumsApi* | [**updateAlbumUser**](doc//AlbumsApi.md#updatealbumuser) | **PUT** /albums/{id}/user/{userId} | 
-*AssetsApi* | [**checkBulkUpload**](doc//AssetsApi.md#checkbulkupload) | **POST** /assets/bulk-upload-check | checkBulkUpload
-*AssetsApi* | [**checkExistingAssets**](doc//AssetsApi.md#checkexistingassets) | **POST** /assets/exist | checkExistingAssets
-*AssetsApi* | [**copyAsset**](doc//AssetsApi.md#copyasset) | **PUT** /assets/copy | 
-*AssetsApi* | [**deleteAssetMetadata**](doc//AssetsApi.md#deleteassetmetadata) | **DELETE** /assets/{id}/metadata/{key} | 
-*AssetsApi* | [**deleteAssets**](doc//AssetsApi.md#deleteassets) | **DELETE** /assets | 
-*AssetsApi* | [**downloadAsset**](doc//AssetsApi.md#downloadasset) | **GET** /assets/{id}/original | 
-*AssetsApi* | [**getAllUserAssetsByDeviceId**](doc//AssetsApi.md#getalluserassetsbydeviceid) | **GET** /assets/device/{deviceId} | getAllUserAssetsByDeviceId
-*AssetsApi* | [**getAssetInfo**](doc//AssetsApi.md#getassetinfo) | **GET** /assets/{id} | 
-*AssetsApi* | [**getAssetMetadata**](doc//AssetsApi.md#getassetmetadata) | **GET** /assets/{id}/metadata | 
-*AssetsApi* | [**getAssetMetadataByKey**](doc//AssetsApi.md#getassetmetadatabykey) | **GET** /assets/{id}/metadata/{key} | 
-*AssetsApi* | [**getAssetOcr**](doc//AssetsApi.md#getassetocr) | **GET** /assets/{id}/ocr | 
-*AssetsApi* | [**getAssetStatistics**](doc//AssetsApi.md#getassetstatistics) | **GET** /assets/statistics | 
-*AssetsApi* | [**getRandom**](doc//AssetsApi.md#getrandom) | **GET** /assets/random | 
-*AssetsApi* | [**playAssetVideo**](doc//AssetsApi.md#playassetvideo) | **GET** /assets/{id}/video/playback | 
-*AssetsApi* | [**replaceAsset**](doc//AssetsApi.md#replaceasset) | **PUT** /assets/{id}/original | Replace the asset with new file, without changing its id
-*AssetsApi* | [**runAssetJobs**](doc//AssetsApi.md#runassetjobs) | **POST** /assets/jobs | 
-*AssetsApi* | [**updateAsset**](doc//AssetsApi.md#updateasset) | **PUT** /assets/{id} | 
-*AssetsApi* | [**updateAssetMetadata**](doc//AssetsApi.md#updateassetmetadata) | **PUT** /assets/{id}/metadata | 
-*AssetsApi* | [**updateAssets**](doc//AssetsApi.md#updateassets) | **PUT** /assets | 
-*AssetsApi* | [**uploadAsset**](doc//AssetsApi.md#uploadasset) | **POST** /assets | 
-*AssetsApi* | [**viewAsset**](doc//AssetsApi.md#viewasset) | **GET** /assets/{id}/thumbnail | 
-*AuthAdminApi* | [**unlinkAllOAuthAccountsAdmin**](doc//AuthAdminApi.md#unlinkalloauthaccountsadmin) | **POST** /admin/auth/unlink-all | 
-*AuthenticationApi* | [**changePassword**](doc//AuthenticationApi.md#changepassword) | **POST** /auth/change-password | 
-*AuthenticationApi* | [**changePinCode**](doc//AuthenticationApi.md#changepincode) | **PUT** /auth/pin-code | 
-*AuthenticationApi* | [**getAuthStatus**](doc//AuthenticationApi.md#getauthstatus) | **GET** /auth/status | 
-*AuthenticationApi* | [**lockAuthSession**](doc//AuthenticationApi.md#lockauthsession) | **POST** /auth/session/lock | 
-*AuthenticationApi* | [**login**](doc//AuthenticationApi.md#login) | **POST** /auth/login | 
-*AuthenticationApi* | [**logout**](doc//AuthenticationApi.md#logout) | **POST** /auth/logout | 
-*AuthenticationApi* | [**resetPinCode**](doc//AuthenticationApi.md#resetpincode) | **DELETE** /auth/pin-code | 
-*AuthenticationApi* | [**setupPinCode**](doc//AuthenticationApi.md#setuppincode) | **POST** /auth/pin-code | 
-*AuthenticationApi* | [**signUpAdmin**](doc//AuthenticationApi.md#signupadmin) | **POST** /auth/admin-sign-up | 
-*AuthenticationApi* | [**unlockAuthSession**](doc//AuthenticationApi.md#unlockauthsession) | **POST** /auth/session/unlock | 
-*AuthenticationApi* | [**validateAccessToken**](doc//AuthenticationApi.md#validateaccesstoken) | **POST** /auth/validateToken | 
-*DeprecatedApi* | [**createPartnerDeprecated**](doc//DeprecatedApi.md#createpartnerdeprecated) | **POST** /partners/{id} | 
-*DeprecatedApi* | [**getRandom**](doc//DeprecatedApi.md#getrandom) | **GET** /assets/random | 
-*DeprecatedApi* | [**replaceAsset**](doc//DeprecatedApi.md#replaceasset) | **PUT** /assets/{id}/original | Replace the asset with new file, without changing its id
-*DownloadApi* | [**downloadArchive**](doc//DownloadApi.md#downloadarchive) | **POST** /download/archive | 
-*DownloadApi* | [**getDownloadInfo**](doc//DownloadApi.md#getdownloadinfo) | **POST** /download/info | 
-*DuplicatesApi* | [**deleteDuplicate**](doc//DuplicatesApi.md#deleteduplicate) | **DELETE** /duplicates/{id} | 
-*DuplicatesApi* | [**deleteDuplicates**](doc//DuplicatesApi.md#deleteduplicates) | **DELETE** /duplicates | 
-*DuplicatesApi* | [**getAssetDuplicates**](doc//DuplicatesApi.md#getassetduplicates) | **GET** /duplicates | 
-*FacesApi* | [**createFace**](doc//FacesApi.md#createface) | **POST** /faces | 
-*FacesApi* | [**deleteFace**](doc//FacesApi.md#deleteface) | **DELETE** /faces/{id} | 
-*FacesApi* | [**getFaces**](doc//FacesApi.md#getfaces) | **GET** /faces | 
-*FacesApi* | [**reassignFacesById**](doc//FacesApi.md#reassignfacesbyid) | **PUT** /faces/{id} | 
-*JobsApi* | [**createJob**](doc//JobsApi.md#createjob) | **POST** /jobs | 
-*JobsApi* | [**getAllJobsStatus**](doc//JobsApi.md#getalljobsstatus) | **GET** /jobs | 
-*JobsApi* | [**sendJobCommand**](doc//JobsApi.md#sendjobcommand) | **PUT** /jobs/{id} | 
-*LibrariesApi* | [**createLibrary**](doc//LibrariesApi.md#createlibrary) | **POST** /libraries | 
-*LibrariesApi* | [**deleteLibrary**](doc//LibrariesApi.md#deletelibrary) | **DELETE** /libraries/{id} | 
-*LibrariesApi* | [**getAllLibraries**](doc//LibrariesApi.md#getalllibraries) | **GET** /libraries | 
-*LibrariesApi* | [**getLibrary**](doc//LibrariesApi.md#getlibrary) | **GET** /libraries/{id} | 
-*LibrariesApi* | [**getLibraryStatistics**](doc//LibrariesApi.md#getlibrarystatistics) | **GET** /libraries/{id}/statistics | 
-*LibrariesApi* | [**scanLibrary**](doc//LibrariesApi.md#scanlibrary) | **POST** /libraries/{id}/scan | 
-*LibrariesApi* | [**updateLibrary**](doc//LibrariesApi.md#updatelibrary) | **PUT** /libraries/{id} | 
-*LibrariesApi* | [**validate**](doc//LibrariesApi.md#validate) | **POST** /libraries/{id}/validate | 
-*MapApi* | [**getMapMarkers**](doc//MapApi.md#getmapmarkers) | **GET** /map/markers | 
-*MapApi* | [**reverseGeocode**](doc//MapApi.md#reversegeocode) | **GET** /map/reverse-geocode | 
-*MemoriesApi* | [**addMemoryAssets**](doc//MemoriesApi.md#addmemoryassets) | **PUT** /memories/{id}/assets | 
-*MemoriesApi* | [**createMemory**](doc//MemoriesApi.md#creatememory) | **POST** /memories | 
-*MemoriesApi* | [**deleteMemory**](doc//MemoriesApi.md#deletememory) | **DELETE** /memories/{id} | 
-*MemoriesApi* | [**getMemory**](doc//MemoriesApi.md#getmemory) | **GET** /memories/{id} | 
-*MemoriesApi* | [**memoriesStatistics**](doc//MemoriesApi.md#memoriesstatistics) | **GET** /memories/statistics | 
-*MemoriesApi* | [**removeMemoryAssets**](doc//MemoriesApi.md#removememoryassets) | **DELETE** /memories/{id}/assets | 
-*MemoriesApi* | [**searchMemories**](doc//MemoriesApi.md#searchmemories) | **GET** /memories | 
-*MemoriesApi* | [**updateMemory**](doc//MemoriesApi.md#updatememory) | **PUT** /memories/{id} | 
-*NotificationsApi* | [**deleteNotification**](doc//NotificationsApi.md#deletenotification) | **DELETE** /notifications/{id} | 
-*NotificationsApi* | [**deleteNotifications**](doc//NotificationsApi.md#deletenotifications) | **DELETE** /notifications | 
-*NotificationsApi* | [**getNotification**](doc//NotificationsApi.md#getnotification) | **GET** /notifications/{id} | 
-*NotificationsApi* | [**getNotifications**](doc//NotificationsApi.md#getnotifications) | **GET** /notifications | 
-*NotificationsApi* | [**updateNotification**](doc//NotificationsApi.md#updatenotification) | **PUT** /notifications/{id} | 
-*NotificationsApi* | [**updateNotifications**](doc//NotificationsApi.md#updatenotifications) | **PUT** /notifications | 
-*NotificationsAdminApi* | [**createNotification**](doc//NotificationsAdminApi.md#createnotification) | **POST** /admin/notifications | 
-*NotificationsAdminApi* | [**getNotificationTemplateAdmin**](doc//NotificationsAdminApi.md#getnotificationtemplateadmin) | **POST** /admin/notifications/templates/{name} | 
-*NotificationsAdminApi* | [**sendTestEmailAdmin**](doc//NotificationsAdminApi.md#sendtestemailadmin) | **POST** /admin/notifications/test-email | 
-*OAuthApi* | [**finishOAuth**](doc//OAuthApi.md#finishoauth) | **POST** /oauth/callback | 
-*OAuthApi* | [**linkOAuthAccount**](doc//OAuthApi.md#linkoauthaccount) | **POST** /oauth/link | 
-*OAuthApi* | [**redirectOAuthToMobile**](doc//OAuthApi.md#redirectoauthtomobile) | **GET** /oauth/mobile-redirect | 
-*OAuthApi* | [**startOAuth**](doc//OAuthApi.md#startoauth) | **POST** /oauth/authorize | 
-*OAuthApi* | [**unlinkOAuthAccount**](doc//OAuthApi.md#unlinkoauthaccount) | **POST** /oauth/unlink | 
-*PartnersApi* | [**createPartner**](doc//PartnersApi.md#createpartner) | **POST** /partners | 
-*PartnersApi* | [**createPartnerDeprecated**](doc//PartnersApi.md#createpartnerdeprecated) | **POST** /partners/{id} | 
-*PartnersApi* | [**getPartners**](doc//PartnersApi.md#getpartners) | **GET** /partners | 
-*PartnersApi* | [**removePartner**](doc//PartnersApi.md#removepartner) | **DELETE** /partners/{id} | 
-*PartnersApi* | [**updatePartner**](doc//PartnersApi.md#updatepartner) | **PUT** /partners/{id} | 
-*PeopleApi* | [**createPerson**](doc//PeopleApi.md#createperson) | **POST** /people | 
-*PeopleApi* | [**deletePeople**](doc//PeopleApi.md#deletepeople) | **DELETE** /people | 
-*PeopleApi* | [**deletePerson**](doc//PeopleApi.md#deleteperson) | **DELETE** /people/{id} | 
-*PeopleApi* | [**getAllPeople**](doc//PeopleApi.md#getallpeople) | **GET** /people | 
-*PeopleApi* | [**getPerson**](doc//PeopleApi.md#getperson) | **GET** /people/{id} | 
-*PeopleApi* | [**getPersonStatistics**](doc//PeopleApi.md#getpersonstatistics) | **GET** /people/{id}/statistics | 
-*PeopleApi* | [**getPersonThumbnail**](doc//PeopleApi.md#getpersonthumbnail) | **GET** /people/{id}/thumbnail | 
-*PeopleApi* | [**mergePerson**](doc//PeopleApi.md#mergeperson) | **POST** /people/{id}/merge | 
-*PeopleApi* | [**reassignFaces**](doc//PeopleApi.md#reassignfaces) | **PUT** /people/{id}/reassign | 
-*PeopleApi* | [**updatePeople**](doc//PeopleApi.md#updatepeople) | **PUT** /people | 
-*PeopleApi* | [**updatePerson**](doc//PeopleApi.md#updateperson) | **PUT** /people/{id} | 
-*SearchApi* | [**getAssetsByCity**](doc//SearchApi.md#getassetsbycity) | **GET** /search/cities | 
-*SearchApi* | [**getExploreData**](doc//SearchApi.md#getexploredata) | **GET** /search/explore | 
-*SearchApi* | [**getSearchSuggestions**](doc//SearchApi.md#getsearchsuggestions) | **GET** /search/suggestions | 
-*SearchApi* | [**searchAssetStatistics**](doc//SearchApi.md#searchassetstatistics) | **POST** /search/statistics | 
-*SearchApi* | [**searchAssets**](doc//SearchApi.md#searchassets) | **POST** /search/metadata | 
-*SearchApi* | [**searchLargeAssets**](doc//SearchApi.md#searchlargeassets) | **POST** /search/large-assets | 
-*SearchApi* | [**searchPerson**](doc//SearchApi.md#searchperson) | **GET** /search/person | 
-*SearchApi* | [**searchPlaces**](doc//SearchApi.md#searchplaces) | **GET** /search/places | 
-*SearchApi* | [**searchRandom**](doc//SearchApi.md#searchrandom) | **POST** /search/random | 
-*SearchApi* | [**searchSmart**](doc//SearchApi.md#searchsmart) | **POST** /search/smart | 
-*ServerApi* | [**deleteServerLicense**](doc//ServerApi.md#deleteserverlicense) | **DELETE** /server/license | 
-*ServerApi* | [**getAboutInfo**](doc//ServerApi.md#getaboutinfo) | **GET** /server/about | 
-*ServerApi* | [**getApkLinks**](doc//ServerApi.md#getapklinks) | **GET** /server/apk-links | 
-*ServerApi* | [**getServerConfig**](doc//ServerApi.md#getserverconfig) | **GET** /server/config | 
-*ServerApi* | [**getServerFeatures**](doc//ServerApi.md#getserverfeatures) | **GET** /server/features | 
-*ServerApi* | [**getServerLicense**](doc//ServerApi.md#getserverlicense) | **GET** /server/license | 
-*ServerApi* | [**getServerStatistics**](doc//ServerApi.md#getserverstatistics) | **GET** /server/statistics | 
-*ServerApi* | [**getServerVersion**](doc//ServerApi.md#getserverversion) | **GET** /server/version | 
-*ServerApi* | [**getStorage**](doc//ServerApi.md#getstorage) | **GET** /server/storage | 
-*ServerApi* | [**getSupportedMediaTypes**](doc//ServerApi.md#getsupportedmediatypes) | **GET** /server/media-types | 
-*ServerApi* | [**getTheme**](doc//ServerApi.md#gettheme) | **GET** /server/theme | 
-*ServerApi* | [**getVersionCheck**](doc//ServerApi.md#getversioncheck) | **GET** /server/version-check | 
-*ServerApi* | [**getVersionHistory**](doc//ServerApi.md#getversionhistory) | **GET** /server/version-history | 
-*ServerApi* | [**pingServer**](doc//ServerApi.md#pingserver) | **GET** /server/ping | 
-*ServerApi* | [**setServerLicense**](doc//ServerApi.md#setserverlicense) | **PUT** /server/license | 
-*SessionsApi* | [**createSession**](doc//SessionsApi.md#createsession) | **POST** /sessions | 
-*SessionsApi* | [**deleteAllSessions**](doc//SessionsApi.md#deleteallsessions) | **DELETE** /sessions | 
-*SessionsApi* | [**deleteSession**](doc//SessionsApi.md#deletesession) | **DELETE** /sessions/{id} | 
-*SessionsApi* | [**getSessions**](doc//SessionsApi.md#getsessions) | **GET** /sessions | 
-*SessionsApi* | [**lockSession**](doc//SessionsApi.md#locksession) | **POST** /sessions/{id}/lock | 
-*SessionsApi* | [**updateSession**](doc//SessionsApi.md#updatesession) | **PUT** /sessions/{id} | 
-*SharedLinksApi* | [**addSharedLinkAssets**](doc//SharedLinksApi.md#addsharedlinkassets) | **PUT** /shared-links/{id}/assets | 
-*SharedLinksApi* | [**createSharedLink**](doc//SharedLinksApi.md#createsharedlink) | **POST** /shared-links | 
-*SharedLinksApi* | [**getAllSharedLinks**](doc//SharedLinksApi.md#getallsharedlinks) | **GET** /shared-links | 
-*SharedLinksApi* | [**getMySharedLink**](doc//SharedLinksApi.md#getmysharedlink) | **GET** /shared-links/me | 
-*SharedLinksApi* | [**getSharedLinkById**](doc//SharedLinksApi.md#getsharedlinkbyid) | **GET** /shared-links/{id} | 
-*SharedLinksApi* | [**removeSharedLink**](doc//SharedLinksApi.md#removesharedlink) | **DELETE** /shared-links/{id} | 
-*SharedLinksApi* | [**removeSharedLinkAssets**](doc//SharedLinksApi.md#removesharedlinkassets) | **DELETE** /shared-links/{id}/assets | 
-*SharedLinksApi* | [**updateSharedLink**](doc//SharedLinksApi.md#updatesharedlink) | **PATCH** /shared-links/{id} | 
-*StacksApi* | [**createStack**](doc//StacksApi.md#createstack) | **POST** /stacks | 
-*StacksApi* | [**deleteStack**](doc//StacksApi.md#deletestack) | **DELETE** /stacks/{id} | 
-*StacksApi* | [**deleteStacks**](doc//StacksApi.md#deletestacks) | **DELETE** /stacks | 
-*StacksApi* | [**getStack**](doc//StacksApi.md#getstack) | **GET** /stacks/{id} | 
-*StacksApi* | [**removeAssetFromStack**](doc//StacksApi.md#removeassetfromstack) | **DELETE** /stacks/{id}/assets/{assetId} | 
-*StacksApi* | [**searchStacks**](doc//StacksApi.md#searchstacks) | **GET** /stacks | 
-*StacksApi* | [**updateStack**](doc//StacksApi.md#updatestack) | **PUT** /stacks/{id} | 
-*SyncApi* | [**deleteSyncAck**](doc//SyncApi.md#deletesyncack) | **DELETE** /sync/ack | 
-*SyncApi* | [**getDeltaSync**](doc//SyncApi.md#getdeltasync) | **POST** /sync/delta-sync | 
-*SyncApi* | [**getFullSyncForUser**](doc//SyncApi.md#getfullsyncforuser) | **POST** /sync/full-sync | 
-*SyncApi* | [**getSyncAck**](doc//SyncApi.md#getsyncack) | **GET** /sync/ack | 
-*SyncApi* | [**getSyncStream**](doc//SyncApi.md#getsyncstream) | **POST** /sync/stream | 
-*SyncApi* | [**sendSyncAck**](doc//SyncApi.md#sendsyncack) | **POST** /sync/ack | 
-*SystemConfigApi* | [**getConfig**](doc//SystemConfigApi.md#getconfig) | **GET** /system-config | 
-*SystemConfigApi* | [**getConfigDefaults**](doc//SystemConfigApi.md#getconfigdefaults) | **GET** /system-config/defaults | 
-*SystemConfigApi* | [**getStorageTemplateOptions**](doc//SystemConfigApi.md#getstoragetemplateoptions) | **GET** /system-config/storage-template-options | 
-*SystemConfigApi* | [**updateConfig**](doc//SystemConfigApi.md#updateconfig) | **PUT** /system-config | 
-*SystemMetadataApi* | [**getAdminOnboarding**](doc//SystemMetadataApi.md#getadminonboarding) | **GET** /system-metadata/admin-onboarding | 
-*SystemMetadataApi* | [**getReverseGeocodingState**](doc//SystemMetadataApi.md#getreversegeocodingstate) | **GET** /system-metadata/reverse-geocoding-state | 
-*SystemMetadataApi* | [**getVersionCheckState**](doc//SystemMetadataApi.md#getversioncheckstate) | **GET** /system-metadata/version-check-state | 
-*SystemMetadataApi* | [**updateAdminOnboarding**](doc//SystemMetadataApi.md#updateadminonboarding) | **POST** /system-metadata/admin-onboarding | 
-*TagsApi* | [**bulkTagAssets**](doc//TagsApi.md#bulktagassets) | **PUT** /tags/assets | 
-*TagsApi* | [**createTag**](doc//TagsApi.md#createtag) | **POST** /tags | 
-*TagsApi* | [**deleteTag**](doc//TagsApi.md#deletetag) | **DELETE** /tags/{id} | 
-*TagsApi* | [**getAllTags**](doc//TagsApi.md#getalltags) | **GET** /tags | 
-*TagsApi* | [**getTagById**](doc//TagsApi.md#gettagbyid) | **GET** /tags/{id} | 
-*TagsApi* | [**tagAssets**](doc//TagsApi.md#tagassets) | **PUT** /tags/{id}/assets | 
-*TagsApi* | [**untagAssets**](doc//TagsApi.md#untagassets) | **DELETE** /tags/{id}/assets | 
-*TagsApi* | [**updateTag**](doc//TagsApi.md#updatetag) | **PUT** /tags/{id} | 
-*TagsApi* | [**upsertTags**](doc//TagsApi.md#upserttags) | **PUT** /tags | 
-*TimelineApi* | [**getTimeBucket**](doc//TimelineApi.md#gettimebucket) | **GET** /timeline/bucket | 
-*TimelineApi* | [**getTimeBuckets**](doc//TimelineApi.md#gettimebuckets) | **GET** /timeline/buckets | 
-*TrashApi* | [**emptyTrash**](doc//TrashApi.md#emptytrash) | **POST** /trash/empty | 
-*TrashApi* | [**restoreAssets**](doc//TrashApi.md#restoreassets) | **POST** /trash/restore/assets | 
-*TrashApi* | [**restoreTrash**](doc//TrashApi.md#restoretrash) | **POST** /trash/restore | 
-*UsersApi* | [**createProfileImage**](doc//UsersApi.md#createprofileimage) | **POST** /users/profile-image | 
-*UsersApi* | [**deleteProfileImage**](doc//UsersApi.md#deleteprofileimage) | **DELETE** /users/profile-image | 
-*UsersApi* | [**deleteUserLicense**](doc//UsersApi.md#deleteuserlicense) | **DELETE** /users/me/license | 
-*UsersApi* | [**deleteUserOnboarding**](doc//UsersApi.md#deleteuseronboarding) | **DELETE** /users/me/onboarding | 
-*UsersApi* | [**getMyPreferences**](doc//UsersApi.md#getmypreferences) | **GET** /users/me/preferences | 
-*UsersApi* | [**getMyUser**](doc//UsersApi.md#getmyuser) | **GET** /users/me | 
-*UsersApi* | [**getProfileImage**](doc//UsersApi.md#getprofileimage) | **GET** /users/{id}/profile-image | 
-*UsersApi* | [**getUser**](doc//UsersApi.md#getuser) | **GET** /users/{id} | 
-*UsersApi* | [**getUserLicense**](doc//UsersApi.md#getuserlicense) | **GET** /users/me/license | 
-*UsersApi* | [**getUserOnboarding**](doc//UsersApi.md#getuseronboarding) | **GET** /users/me/onboarding | 
-*UsersApi* | [**searchUsers**](doc//UsersApi.md#searchusers) | **GET** /users | 
-*UsersApi* | [**setUserLicense**](doc//UsersApi.md#setuserlicense) | **PUT** /users/me/license | 
-*UsersApi* | [**setUserOnboarding**](doc//UsersApi.md#setuseronboarding) | **PUT** /users/me/onboarding | 
-*UsersApi* | [**updateMyPreferences**](doc//UsersApi.md#updatemypreferences) | **PUT** /users/me/preferences | 
-*UsersApi* | [**updateMyUser**](doc//UsersApi.md#updatemyuser) | **PUT** /users/me | 
-*UsersAdminApi* | [**createUserAdmin**](doc//UsersAdminApi.md#createuseradmin) | **POST** /admin/users | 
-*UsersAdminApi* | [**deleteUserAdmin**](doc//UsersAdminApi.md#deleteuseradmin) | **DELETE** /admin/users/{id} | 
-*UsersAdminApi* | [**getUserAdmin**](doc//UsersAdminApi.md#getuseradmin) | **GET** /admin/users/{id} | 
-*UsersAdminApi* | [**getUserPreferencesAdmin**](doc//UsersAdminApi.md#getuserpreferencesadmin) | **GET** /admin/users/{id}/preferences | 
-*UsersAdminApi* | [**getUserSessionsAdmin**](doc//UsersAdminApi.md#getusersessionsadmin) | **GET** /admin/users/{id}/sessions | 
-*UsersAdminApi* | [**getUserStatisticsAdmin**](doc//UsersAdminApi.md#getuserstatisticsadmin) | **GET** /admin/users/{id}/statistics | 
-*UsersAdminApi* | [**restoreUserAdmin**](doc//UsersAdminApi.md#restoreuseradmin) | **POST** /admin/users/{id}/restore | 
-*UsersAdminApi* | [**searchUsersAdmin**](doc//UsersAdminApi.md#searchusersadmin) | **GET** /admin/users | 
-*UsersAdminApi* | [**updateUserAdmin**](doc//UsersAdminApi.md#updateuseradmin) | **PUT** /admin/users/{id} | 
-*UsersAdminApi* | [**updateUserPreferencesAdmin**](doc//UsersAdminApi.md#updateuserpreferencesadmin) | **PUT** /admin/users/{id}/preferences | 
-*ViewApi* | [**getAssetsByOriginalPath**](doc//ViewApi.md#getassetsbyoriginalpath) | **GET** /view/folder | 
-*ViewApi* | [**getUniqueOriginalPaths**](doc//ViewApi.md#getuniqueoriginalpaths) | **GET** /view/folder/unique-paths | 
+*APIKeysApi* | [**createApiKey**](doc//APIKeysApi.md#createapikey) | **POST** /api-keys | Create an API key
+*APIKeysApi* | [**deleteApiKey**](doc//APIKeysApi.md#deleteapikey) | **DELETE** /api-keys/{id} | Delete an API key
+*APIKeysApi* | [**getApiKey**](doc//APIKeysApi.md#getapikey) | **GET** /api-keys/{id} | Retrieve an API key
+*APIKeysApi* | [**getApiKeys**](doc//APIKeysApi.md#getapikeys) | **GET** /api-keys | List all API keys
+*APIKeysApi* | [**getMyApiKey**](doc//APIKeysApi.md#getmyapikey) | **GET** /api-keys/me | Retrieve the current API key
+*APIKeysApi* | [**updateApiKey**](doc//APIKeysApi.md#updateapikey) | **PUT** /api-keys/{id} | Update an API key
+*ActivitiesApi* | [**createActivity**](doc//ActivitiesApi.md#createactivity) | **POST** /activities | Create an activity
+*ActivitiesApi* | [**deleteActivity**](doc//ActivitiesApi.md#deleteactivity) | **DELETE** /activities/{id} | Delete an activity
+*ActivitiesApi* | [**getActivities**](doc//ActivitiesApi.md#getactivities) | **GET** /activities | List all activities
+*ActivitiesApi* | [**getActivityStatistics**](doc//ActivitiesApi.md#getactivitystatistics) | **GET** /activities/statistics | Retrieve activity statistics
+*AlbumsApi* | [**addAssetsToAlbum**](doc//AlbumsApi.md#addassetstoalbum) | **PUT** /albums/{id}/assets | Add assets to an album
+*AlbumsApi* | [**addAssetsToAlbums**](doc//AlbumsApi.md#addassetstoalbums) | **PUT** /albums/assets | Add assets to albums
+*AlbumsApi* | [**addUsersToAlbum**](doc//AlbumsApi.md#adduserstoalbum) | **PUT** /albums/{id}/users | Share album with users
+*AlbumsApi* | [**createAlbum**](doc//AlbumsApi.md#createalbum) | **POST** /albums | Create an album
+*AlbumsApi* | [**deleteAlbum**](doc//AlbumsApi.md#deletealbum) | **DELETE** /albums/{id} | Delete an album
+*AlbumsApi* | [**getAlbumInfo**](doc//AlbumsApi.md#getalbuminfo) | **GET** /albums/{id} | Retrieve an album
+*AlbumsApi* | [**getAlbumStatistics**](doc//AlbumsApi.md#getalbumstatistics) | **GET** /albums/statistics | Retrieve album statistics
+*AlbumsApi* | [**getAllAlbums**](doc//AlbumsApi.md#getallalbums) | **GET** /albums | List all albums
+*AlbumsApi* | [**removeAssetFromAlbum**](doc//AlbumsApi.md#removeassetfromalbum) | **DELETE** /albums/{id}/assets | Remove assets from an album
+*AlbumsApi* | [**removeUserFromAlbum**](doc//AlbumsApi.md#removeuserfromalbum) | **DELETE** /albums/{id}/user/{userId} | Remove user from album
+*AlbumsApi* | [**updateAlbumInfo**](doc//AlbumsApi.md#updatealbuminfo) | **PATCH** /albums/{id} | Update an album
+*AlbumsApi* | [**updateAlbumUser**](doc//AlbumsApi.md#updatealbumuser) | **PUT** /albums/{id}/user/{userId} | Update user role
+*AssetsApi* | [**checkBulkUpload**](doc//AssetsApi.md#checkbulkupload) | **POST** /assets/bulk-upload-check | Check bulk upload
+*AssetsApi* | [**checkExistingAssets**](doc//AssetsApi.md#checkexistingassets) | **POST** /assets/exist | Check existing assets
+*AssetsApi* | [**copyAsset**](doc//AssetsApi.md#copyasset) | **PUT** /assets/copy | Copy asset
+*AssetsApi* | [**deleteAssetMetadata**](doc//AssetsApi.md#deleteassetmetadata) | **DELETE** /assets/{id}/metadata/{key} | Delete asset metadata by key
+*AssetsApi* | [**deleteAssets**](doc//AssetsApi.md#deleteassets) | **DELETE** /assets | Delete assets
+*AssetsApi* | [**downloadAsset**](doc//AssetsApi.md#downloadasset) | **GET** /assets/{id}/original | Download original asset
+*AssetsApi* | [**getAllUserAssetsByDeviceId**](doc//AssetsApi.md#getalluserassetsbydeviceid) | **GET** /assets/device/{deviceId} | Retrieve assets by device ID
+*AssetsApi* | [**getAssetInfo**](doc//AssetsApi.md#getassetinfo) | **GET** /assets/{id} | Retrieve an asset
+*AssetsApi* | [**getAssetMetadata**](doc//AssetsApi.md#getassetmetadata) | **GET** /assets/{id}/metadata | Get asset metadata
+*AssetsApi* | [**getAssetMetadataByKey**](doc//AssetsApi.md#getassetmetadatabykey) | **GET** /assets/{id}/metadata/{key} | Retrieve asset metadata by key
+*AssetsApi* | [**getAssetOcr**](doc//AssetsApi.md#getassetocr) | **GET** /assets/{id}/ocr | Retrieve asset OCR data
+*AssetsApi* | [**getAssetStatistics**](doc//AssetsApi.md#getassetstatistics) | **GET** /assets/statistics | Get asset statistics
+*AssetsApi* | [**getRandom**](doc//AssetsApi.md#getrandom) | **GET** /assets/random | Get random assets
+*AssetsApi* | [**playAssetVideo**](doc//AssetsApi.md#playassetvideo) | **GET** /assets/{id}/video/playback | Play asset video
+*AssetsApi* | [**replaceAsset**](doc//AssetsApi.md#replaceasset) | **PUT** /assets/{id}/original | Replace asset
+*AssetsApi* | [**runAssetJobs**](doc//AssetsApi.md#runassetjobs) | **POST** /assets/jobs | Run an asset job
+*AssetsApi* | [**updateAsset**](doc//AssetsApi.md#updateasset) | **PUT** /assets/{id} | Update an asset
+*AssetsApi* | [**updateAssetMetadata**](doc//AssetsApi.md#updateassetmetadata) | **PUT** /assets/{id}/metadata | Update asset metadata
+*AssetsApi* | [**updateAssets**](doc//AssetsApi.md#updateassets) | **PUT** /assets | Update assets
+*AssetsApi* | [**uploadAsset**](doc//AssetsApi.md#uploadasset) | **POST** /assets | Upload asset
+*AssetsApi* | [**viewAsset**](doc//AssetsApi.md#viewasset) | **GET** /assets/{id}/thumbnail | View asset thumbnail
+*AuthenticationApi* | [**changePassword**](doc//AuthenticationApi.md#changepassword) | **POST** /auth/change-password | Change password
+*AuthenticationApi* | [**changePinCode**](doc//AuthenticationApi.md#changepincode) | **PUT** /auth/pin-code | Change pin code
+*AuthenticationApi* | [**finishOAuth**](doc//AuthenticationApi.md#finishoauth) | **POST** /oauth/callback | Finish OAuth
+*AuthenticationApi* | [**getAuthStatus**](doc//AuthenticationApi.md#getauthstatus) | **GET** /auth/status | Retrieve auth status
+*AuthenticationApi* | [**linkOAuthAccount**](doc//AuthenticationApi.md#linkoauthaccount) | **POST** /oauth/link | Link OAuth account
+*AuthenticationApi* | [**lockAuthSession**](doc//AuthenticationApi.md#lockauthsession) | **POST** /auth/session/lock | Lock auth session
+*AuthenticationApi* | [**login**](doc//AuthenticationApi.md#login) | **POST** /auth/login | Login
+*AuthenticationApi* | [**logout**](doc//AuthenticationApi.md#logout) | **POST** /auth/logout | Logout
+*AuthenticationApi* | [**redirectOAuthToMobile**](doc//AuthenticationApi.md#redirectoauthtomobile) | **GET** /oauth/mobile-redirect | Redirect OAuth to mobile
+*AuthenticationApi* | [**resetPinCode**](doc//AuthenticationApi.md#resetpincode) | **DELETE** /auth/pin-code | Reset pin code
+*AuthenticationApi* | [**setupPinCode**](doc//AuthenticationApi.md#setuppincode) | **POST** /auth/pin-code | Setup pin code
+*AuthenticationApi* | [**signUpAdmin**](doc//AuthenticationApi.md#signupadmin) | **POST** /auth/admin-sign-up | Register admin
+*AuthenticationApi* | [**startOAuth**](doc//AuthenticationApi.md#startoauth) | **POST** /oauth/authorize | Start OAuth
+*AuthenticationApi* | [**unlinkOAuthAccount**](doc//AuthenticationApi.md#unlinkoauthaccount) | **POST** /oauth/unlink | Unlink OAuth account
+*AuthenticationApi* | [**unlockAuthSession**](doc//AuthenticationApi.md#unlockauthsession) | **POST** /auth/session/unlock | Unlock auth session
+*AuthenticationApi* | [**validateAccessToken**](doc//AuthenticationApi.md#validateaccesstoken) | **POST** /auth/validateToken | Validate access token
+*AuthenticationAdminApi* | [**unlinkAllOAuthAccountsAdmin**](doc//AuthenticationAdminApi.md#unlinkalloauthaccountsadmin) | **POST** /admin/auth/unlink-all | Unlink all OAuth accounts
+*DeprecatedApi* | [**createPartnerDeprecated**](doc//DeprecatedApi.md#createpartnerdeprecated) | **POST** /partners/{id} | Create a partner
+*DeprecatedApi* | [**getAllUserAssetsByDeviceId**](doc//DeprecatedApi.md#getalluserassetsbydeviceid) | **GET** /assets/device/{deviceId} | Retrieve assets by device ID
+*DeprecatedApi* | [**getDeltaSync**](doc//DeprecatedApi.md#getdeltasync) | **POST** /sync/delta-sync | Get delta sync for user
+*DeprecatedApi* | [**getFullSyncForUser**](doc//DeprecatedApi.md#getfullsyncforuser) | **POST** /sync/full-sync | Get full sync for user
+*DeprecatedApi* | [**getRandom**](doc//DeprecatedApi.md#getrandom) | **GET** /assets/random | Get random assets
+*DeprecatedApi* | [**replaceAsset**](doc//DeprecatedApi.md#replaceasset) | **PUT** /assets/{id}/original | Replace asset
+*DownloadApi* | [**downloadArchive**](doc//DownloadApi.md#downloadarchive) | **POST** /download/archive | Download asset archive
+*DownloadApi* | [**getDownloadInfo**](doc//DownloadApi.md#getdownloadinfo) | **POST** /download/info | Retrieve download information
+*DuplicatesApi* | [**deleteDuplicate**](doc//DuplicatesApi.md#deleteduplicate) | **DELETE** /duplicates/{id} | Delete a duplicate
+*DuplicatesApi* | [**deleteDuplicates**](doc//DuplicatesApi.md#deleteduplicates) | **DELETE** /duplicates | Delete duplicates
+*DuplicatesApi* | [**getAssetDuplicates**](doc//DuplicatesApi.md#getassetduplicates) | **GET** /duplicates | Retrieve duplicates
+*FacesApi* | [**createFace**](doc//FacesApi.md#createface) | **POST** /faces | Create a face
+*FacesApi* | [**deleteFace**](doc//FacesApi.md#deleteface) | **DELETE** /faces/{id} | Delete a face
+*FacesApi* | [**getFaces**](doc//FacesApi.md#getfaces) | **GET** /faces | Retrieve faces for asset
+*FacesApi* | [**reassignFacesById**](doc//FacesApi.md#reassignfacesbyid) | **PUT** /faces/{id} | Re-assign a face to another person
+*JobsApi* | [**createJob**](doc//JobsApi.md#createjob) | **POST** /jobs | Create a manual job
+*JobsApi* | [**getAllJobsStatus**](doc//JobsApi.md#getalljobsstatus) | **GET** /jobs | Retrieve queue counts and status
+*JobsApi* | [**sendJobCommand**](doc//JobsApi.md#sendjobcommand) | **PUT** /jobs/{id} | Run jobs
+*LibrariesApi* | [**createLibrary**](doc//LibrariesApi.md#createlibrary) | **POST** /libraries | Create a library
+*LibrariesApi* | [**deleteLibrary**](doc//LibrariesApi.md#deletelibrary) | **DELETE** /libraries/{id} | Delete a library
+*LibrariesApi* | [**getAllLibraries**](doc//LibrariesApi.md#getalllibraries) | **GET** /libraries | Retrieve libraries
+*LibrariesApi* | [**getLibrary**](doc//LibrariesApi.md#getlibrary) | **GET** /libraries/{id} | Retrieve a library
+*LibrariesApi* | [**getLibraryStatistics**](doc//LibrariesApi.md#getlibrarystatistics) | **GET** /libraries/{id}/statistics | Retrieve library statistics
+*LibrariesApi* | [**scanLibrary**](doc//LibrariesApi.md#scanlibrary) | **POST** /libraries/{id}/scan | Scan a library
+*LibrariesApi* | [**updateLibrary**](doc//LibrariesApi.md#updatelibrary) | **PUT** /libraries/{id} | Update a library
+*LibrariesApi* | [**validate**](doc//LibrariesApi.md#validate) | **POST** /libraries/{id}/validate | Validate library settings
+*MapApi* | [**getMapMarkers**](doc//MapApi.md#getmapmarkers) | **GET** /map/markers | Retrieve map markers
+*MapApi* | [**reverseGeocode**](doc//MapApi.md#reversegeocode) | **GET** /map/reverse-geocode | Reverse geocode coordinates
+*MemoriesApi* | [**addMemoryAssets**](doc//MemoriesApi.md#addmemoryassets) | **PUT** /memories/{id}/assets | Add assets to a memory
+*MemoriesApi* | [**createMemory**](doc//MemoriesApi.md#creatememory) | **POST** /memories | Create a memory
+*MemoriesApi* | [**deleteMemory**](doc//MemoriesApi.md#deletememory) | **DELETE** /memories/{id} | Delete a memory
+*MemoriesApi* | [**getMemory**](doc//MemoriesApi.md#getmemory) | **GET** /memories/{id} | Retrieve a memory
+*MemoriesApi* | [**memoriesStatistics**](doc//MemoriesApi.md#memoriesstatistics) | **GET** /memories/statistics | Retrieve memories statistics
+*MemoriesApi* | [**removeMemoryAssets**](doc//MemoriesApi.md#removememoryassets) | **DELETE** /memories/{id}/assets | Remove assets from a memory
+*MemoriesApi* | [**searchMemories**](doc//MemoriesApi.md#searchmemories) | **GET** /memories | Retrieve memories
+*MemoriesApi* | [**updateMemory**](doc//MemoriesApi.md#updatememory) | **PUT** /memories/{id} | Update a memory
+*NotificationsApi* | [**deleteNotification**](doc//NotificationsApi.md#deletenotification) | **DELETE** /notifications/{id} | Delete a notification
+*NotificationsApi* | [**deleteNotifications**](doc//NotificationsApi.md#deletenotifications) | **DELETE** /notifications | Delete notifications
+*NotificationsApi* | [**getNotification**](doc//NotificationsApi.md#getnotification) | **GET** /notifications/{id} | Get a notification
+*NotificationsApi* | [**getNotifications**](doc//NotificationsApi.md#getnotifications) | **GET** /notifications | Retrieve notifications
+*NotificationsApi* | [**updateNotification**](doc//NotificationsApi.md#updatenotification) | **PUT** /notifications/{id} | Update a notification
+*NotificationsApi* | [**updateNotifications**](doc//NotificationsApi.md#updatenotifications) | **PUT** /notifications | Update notifications
+*NotificationsAdminApi* | [**createNotification**](doc//NotificationsAdminApi.md#createnotification) | **POST** /admin/notifications | Create a notification
+*NotificationsAdminApi* | [**getNotificationTemplateAdmin**](doc//NotificationsAdminApi.md#getnotificationtemplateadmin) | **POST** /admin/notifications/templates/{name} | Render email template
+*NotificationsAdminApi* | [**sendTestEmailAdmin**](doc//NotificationsAdminApi.md#sendtestemailadmin) | **POST** /admin/notifications/test-email | Send test email
+*PartnersApi* | [**createPartner**](doc//PartnersApi.md#createpartner) | **POST** /partners | Create a partner
+*PartnersApi* | [**createPartnerDeprecated**](doc//PartnersApi.md#createpartnerdeprecated) | **POST** /partners/{id} | Create a partner
+*PartnersApi* | [**getPartners**](doc//PartnersApi.md#getpartners) | **GET** /partners | Retrieve partners
+*PartnersApi* | [**removePartner**](doc//PartnersApi.md#removepartner) | **DELETE** /partners/{id} | Remove a partner
+*PartnersApi* | [**updatePartner**](doc//PartnersApi.md#updatepartner) | **PUT** /partners/{id} | Update a partner
+*PeopleApi* | [**createPerson**](doc//PeopleApi.md#createperson) | **POST** /people | Create a person
+*PeopleApi* | [**deletePeople**](doc//PeopleApi.md#deletepeople) | **DELETE** /people | Delete people
+*PeopleApi* | [**deletePerson**](doc//PeopleApi.md#deleteperson) | **DELETE** /people/{id} | Delete person
+*PeopleApi* | [**getAllPeople**](doc//PeopleApi.md#getallpeople) | **GET** /people | Get all people
+*PeopleApi* | [**getPerson**](doc//PeopleApi.md#getperson) | **GET** /people/{id} | Get a person
+*PeopleApi* | [**getPersonStatistics**](doc//PeopleApi.md#getpersonstatistics) | **GET** /people/{id}/statistics | Get person statistics
+*PeopleApi* | [**getPersonThumbnail**](doc//PeopleApi.md#getpersonthumbnail) | **GET** /people/{id}/thumbnail | Get person thumbnail
+*PeopleApi* | [**mergePerson**](doc//PeopleApi.md#mergeperson) | **POST** /people/{id}/merge | Merge people
+*PeopleApi* | [**reassignFaces**](doc//PeopleApi.md#reassignfaces) | **PUT** /people/{id}/reassign | Reassign faces
+*PeopleApi* | [**updatePeople**](doc//PeopleApi.md#updatepeople) | **PUT** /people | Update people
+*PeopleApi* | [**updatePerson**](doc//PeopleApi.md#updateperson) | **PUT** /people/{id} | Update person
+*SearchApi* | [**getAssetsByCity**](doc//SearchApi.md#getassetsbycity) | **GET** /search/cities | Retrieve assets by city
+*SearchApi* | [**getExploreData**](doc//SearchApi.md#getexploredata) | **GET** /search/explore | Retrieve explore data
+*SearchApi* | [**getSearchSuggestions**](doc//SearchApi.md#getsearchsuggestions) | **GET** /search/suggestions | Retrieve search suggestions
+*SearchApi* | [**searchAssetStatistics**](doc//SearchApi.md#searchassetstatistics) | **POST** /search/statistics | Search asset statistics
+*SearchApi* | [**searchAssets**](doc//SearchApi.md#searchassets) | **POST** /search/metadata | Search assets by metadata
+*SearchApi* | [**searchLargeAssets**](doc//SearchApi.md#searchlargeassets) | **POST** /search/large-assets | Search large assets
+*SearchApi* | [**searchPerson**](doc//SearchApi.md#searchperson) | **GET** /search/person | Search people
+*SearchApi* | [**searchPlaces**](doc//SearchApi.md#searchplaces) | **GET** /search/places | Search places
+*SearchApi* | [**searchRandom**](doc//SearchApi.md#searchrandom) | **POST** /search/random | Search random assets
+*SearchApi* | [**searchSmart**](doc//SearchApi.md#searchsmart) | **POST** /search/smart | Smart asset search
+*ServerApi* | [**deleteServerLicense**](doc//ServerApi.md#deleteserverlicense) | **DELETE** /server/license | Delete server product key
+*ServerApi* | [**getAboutInfo**](doc//ServerApi.md#getaboutinfo) | **GET** /server/about | Get server information
+*ServerApi* | [**getApkLinks**](doc//ServerApi.md#getapklinks) | **GET** /server/apk-links | Get APK links
+*ServerApi* | [**getServerConfig**](doc//ServerApi.md#getserverconfig) | **GET** /server/config | Get config
+*ServerApi* | [**getServerFeatures**](doc//ServerApi.md#getserverfeatures) | **GET** /server/features | Get features
+*ServerApi* | [**getServerLicense**](doc//ServerApi.md#getserverlicense) | **GET** /server/license | Get product key
+*ServerApi* | [**getServerStatistics**](doc//ServerApi.md#getserverstatistics) | **GET** /server/statistics | Get statistics
+*ServerApi* | [**getServerVersion**](doc//ServerApi.md#getserverversion) | **GET** /server/version | Get server version
+*ServerApi* | [**getStorage**](doc//ServerApi.md#getstorage) | **GET** /server/storage | Get storage
+*ServerApi* | [**getSupportedMediaTypes**](doc//ServerApi.md#getsupportedmediatypes) | **GET** /server/media-types | Get supported media types
+*ServerApi* | [**getTheme**](doc//ServerApi.md#gettheme) | **GET** /server/theme | Get theme
+*ServerApi* | [**getVersionCheck**](doc//ServerApi.md#getversioncheck) | **GET** /server/version-check | Get version check status
+*ServerApi* | [**getVersionHistory**](doc//ServerApi.md#getversionhistory) | **GET** /server/version-history | Get version history
+*ServerApi* | [**pingServer**](doc//ServerApi.md#pingserver) | **GET** /server/ping | Ping
+*ServerApi* | [**setServerLicense**](doc//ServerApi.md#setserverlicense) | **PUT** /server/license | Set server product key
+*SessionsApi* | [**createSession**](doc//SessionsApi.md#createsession) | **POST** /sessions | Create a session
+*SessionsApi* | [**deleteAllSessions**](doc//SessionsApi.md#deleteallsessions) | **DELETE** /sessions | Delete all sessions
+*SessionsApi* | [**deleteSession**](doc//SessionsApi.md#deletesession) | **DELETE** /sessions/{id} | Delete a session
+*SessionsApi* | [**getSessions**](doc//SessionsApi.md#getsessions) | **GET** /sessions | Retrieve sessions
+*SessionsApi* | [**lockSession**](doc//SessionsApi.md#locksession) | **POST** /sessions/{id}/lock | Lock a session
+*SessionsApi* | [**updateSession**](doc//SessionsApi.md#updatesession) | **PUT** /sessions/{id} | Update a session
+*SharedLinksApi* | [**addSharedLinkAssets**](doc//SharedLinksApi.md#addsharedlinkassets) | **PUT** /shared-links/{id}/assets | Add assets to a shared link
+*SharedLinksApi* | [**createSharedLink**](doc//SharedLinksApi.md#createsharedlink) | **POST** /shared-links | Create a shared link
+*SharedLinksApi* | [**getAllSharedLinks**](doc//SharedLinksApi.md#getallsharedlinks) | **GET** /shared-links | Retrieve all shared links
+*SharedLinksApi* | [**getMySharedLink**](doc//SharedLinksApi.md#getmysharedlink) | **GET** /shared-links/me | Retrieve current shared link
+*SharedLinksApi* | [**getSharedLinkById**](doc//SharedLinksApi.md#getsharedlinkbyid) | **GET** /shared-links/{id} | Retrieve a shared link
+*SharedLinksApi* | [**removeSharedLink**](doc//SharedLinksApi.md#removesharedlink) | **DELETE** /shared-links/{id} | Delete a shared link
+*SharedLinksApi* | [**removeSharedLinkAssets**](doc//SharedLinksApi.md#removesharedlinkassets) | **DELETE** /shared-links/{id}/assets | Remove assets from a shared link
+*SharedLinksApi* | [**updateSharedLink**](doc//SharedLinksApi.md#updatesharedlink) | **PATCH** /shared-links/{id} | Update a shared link
+*StacksApi* | [**createStack**](doc//StacksApi.md#createstack) | **POST** /stacks | Create a stack
+*StacksApi* | [**deleteStack**](doc//StacksApi.md#deletestack) | **DELETE** /stacks/{id} | Delete a stack
+*StacksApi* | [**deleteStacks**](doc//StacksApi.md#deletestacks) | **DELETE** /stacks | Delete stacks
+*StacksApi* | [**getStack**](doc//StacksApi.md#getstack) | **GET** /stacks/{id} | Retrieve a stack
+*StacksApi* | [**removeAssetFromStack**](doc//StacksApi.md#removeassetfromstack) | **DELETE** /stacks/{id}/assets/{assetId} | Remove an asset from a stack
+*StacksApi* | [**searchStacks**](doc//StacksApi.md#searchstacks) | **GET** /stacks | Retrieve stacks
+*StacksApi* | [**updateStack**](doc//StacksApi.md#updatestack) | **PUT** /stacks/{id} | Update a stack
+*SyncApi* | [**deleteSyncAck**](doc//SyncApi.md#deletesyncack) | **DELETE** /sync/ack | Delete acknowledgements
+*SyncApi* | [**getDeltaSync**](doc//SyncApi.md#getdeltasync) | **POST** /sync/delta-sync | Get delta sync for user
+*SyncApi* | [**getFullSyncForUser**](doc//SyncApi.md#getfullsyncforuser) | **POST** /sync/full-sync | Get full sync for user
+*SyncApi* | [**getSyncAck**](doc//SyncApi.md#getsyncack) | **GET** /sync/ack | Retrieve acknowledgements
+*SyncApi* | [**getSyncStream**](doc//SyncApi.md#getsyncstream) | **POST** /sync/stream | Stream sync changes
+*SyncApi* | [**sendSyncAck**](doc//SyncApi.md#sendsyncack) | **POST** /sync/ack | Acknowledge changes
+*SystemConfigApi* | [**getConfig**](doc//SystemConfigApi.md#getconfig) | **GET** /system-config | Get system configuration
+*SystemConfigApi* | [**getConfigDefaults**](doc//SystemConfigApi.md#getconfigdefaults) | **GET** /system-config/defaults | Get system configuration defaults
+*SystemConfigApi* | [**getStorageTemplateOptions**](doc//SystemConfigApi.md#getstoragetemplateoptions) | **GET** /system-config/storage-template-options | Get storage template options
+*SystemConfigApi* | [**updateConfig**](doc//SystemConfigApi.md#updateconfig) | **PUT** /system-config | Update system configuration
+*SystemMetadataApi* | [**getAdminOnboarding**](doc//SystemMetadataApi.md#getadminonboarding) | **GET** /system-metadata/admin-onboarding | Retrieve admin onboarding
+*SystemMetadataApi* | [**getReverseGeocodingState**](doc//SystemMetadataApi.md#getreversegeocodingstate) | **GET** /system-metadata/reverse-geocoding-state | Retrieve reverse geocoding state
+*SystemMetadataApi* | [**getVersionCheckState**](doc//SystemMetadataApi.md#getversioncheckstate) | **GET** /system-metadata/version-check-state | Retrieve version check state
+*SystemMetadataApi* | [**updateAdminOnboarding**](doc//SystemMetadataApi.md#updateadminonboarding) | **POST** /system-metadata/admin-onboarding | Update admin onboarding
+*TagsApi* | [**bulkTagAssets**](doc//TagsApi.md#bulktagassets) | **PUT** /tags/assets | Tag assets
+*TagsApi* | [**createTag**](doc//TagsApi.md#createtag) | **POST** /tags | Create a tag
+*TagsApi* | [**deleteTag**](doc//TagsApi.md#deletetag) | **DELETE** /tags/{id} | Delete a tag
+*TagsApi* | [**getAllTags**](doc//TagsApi.md#getalltags) | **GET** /tags | Retrieve tags
+*TagsApi* | [**getTagById**](doc//TagsApi.md#gettagbyid) | **GET** /tags/{id} | Retrieve a tag
+*TagsApi* | [**tagAssets**](doc//TagsApi.md#tagassets) | **PUT** /tags/{id}/assets | Tag assets
+*TagsApi* | [**untagAssets**](doc//TagsApi.md#untagassets) | **DELETE** /tags/{id}/assets | Untag assets
+*TagsApi* | [**updateTag**](doc//TagsApi.md#updatetag) | **PUT** /tags/{id} | Update a tag
+*TagsApi* | [**upsertTags**](doc//TagsApi.md#upserttags) | **PUT** /tags | Upsert tags
+*TimelineApi* | [**getTimeBucket**](doc//TimelineApi.md#gettimebucket) | **GET** /timeline/bucket | Get time bucket
+*TimelineApi* | [**getTimeBuckets**](doc//TimelineApi.md#gettimebuckets) | **GET** /timeline/buckets | Get time buckets
+*TrashApi* | [**emptyTrash**](doc//TrashApi.md#emptytrash) | **POST** /trash/empty | Empty trash
+*TrashApi* | [**restoreAssets**](doc//TrashApi.md#restoreassets) | **POST** /trash/restore/assets | Restore assets
+*TrashApi* | [**restoreTrash**](doc//TrashApi.md#restoretrash) | **POST** /trash/restore | Restore trash
+*UsersApi* | [**createProfileImage**](doc//UsersApi.md#createprofileimage) | **POST** /users/profile-image | Create user profile image
+*UsersApi* | [**deleteProfileImage**](doc//UsersApi.md#deleteprofileimage) | **DELETE** /users/profile-image | Delete user profile image
+*UsersApi* | [**deleteUserLicense**](doc//UsersApi.md#deleteuserlicense) | **DELETE** /users/me/license | Delete user product key
+*UsersApi* | [**deleteUserOnboarding**](doc//UsersApi.md#deleteuseronboarding) | **DELETE** /users/me/onboarding | Delete user onboarding
+*UsersApi* | [**getMyPreferences**](doc//UsersApi.md#getmypreferences) | **GET** /users/me/preferences | Get my preferences
+*UsersApi* | [**getMyUser**](doc//UsersApi.md#getmyuser) | **GET** /users/me | Get current user
+*UsersApi* | [**getProfileImage**](doc//UsersApi.md#getprofileimage) | **GET** /users/{id}/profile-image | Retrieve user profile image
+*UsersApi* | [**getUser**](doc//UsersApi.md#getuser) | **GET** /users/{id} | Retrieve a user
+*UsersApi* | [**getUserLicense**](doc//UsersApi.md#getuserlicense) | **GET** /users/me/license | Retrieve user product key
+*UsersApi* | [**getUserOnboarding**](doc//UsersApi.md#getuseronboarding) | **GET** /users/me/onboarding | Retrieve user onboarding
+*UsersApi* | [**searchUsers**](doc//UsersApi.md#searchusers) | **GET** /users | Get all users
+*UsersApi* | [**setUserLicense**](doc//UsersApi.md#setuserlicense) | **PUT** /users/me/license | Set user product key
+*UsersApi* | [**setUserOnboarding**](doc//UsersApi.md#setuseronboarding) | **PUT** /users/me/onboarding | Update user onboarding
+*UsersApi* | [**updateMyPreferences**](doc//UsersApi.md#updatemypreferences) | **PUT** /users/me/preferences | Update my preferences
+*UsersApi* | [**updateMyUser**](doc//UsersApi.md#updatemyuser) | **PUT** /users/me | Update current user
+*UsersAdminApi* | [**createUserAdmin**](doc//UsersAdminApi.md#createuseradmin) | **POST** /admin/users | Create a user
+*UsersAdminApi* | [**deleteUserAdmin**](doc//UsersAdminApi.md#deleteuseradmin) | **DELETE** /admin/users/{id} | Delete a user
+*UsersAdminApi* | [**getUserAdmin**](doc//UsersAdminApi.md#getuseradmin) | **GET** /admin/users/{id} | Retrieve a user
+*UsersAdminApi* | [**getUserPreferencesAdmin**](doc//UsersAdminApi.md#getuserpreferencesadmin) | **GET** /admin/users/{id}/preferences | Retrieve user preferences
+*UsersAdminApi* | [**getUserSessionsAdmin**](doc//UsersAdminApi.md#getusersessionsadmin) | **GET** /admin/users/{id}/sessions | Retrieve user sessions
+*UsersAdminApi* | [**getUserStatisticsAdmin**](doc//UsersAdminApi.md#getuserstatisticsadmin) | **GET** /admin/users/{id}/statistics | Retrieve user statistics
+*UsersAdminApi* | [**restoreUserAdmin**](doc//UsersAdminApi.md#restoreuseradmin) | **POST** /admin/users/{id}/restore | Restore a deleted user
+*UsersAdminApi* | [**searchUsersAdmin**](doc//UsersAdminApi.md#searchusersadmin) | **GET** /admin/users | Search users
+*UsersAdminApi* | [**updateUserAdmin**](doc//UsersAdminApi.md#updateuseradmin) | **PUT** /admin/users/{id} | Update a user
+*UsersAdminApi* | [**updateUserPreferencesAdmin**](doc//UsersAdminApi.md#updateuserpreferencesadmin) | **PUT** /admin/users/{id}/preferences | Update user preferences
+*ViewsApi* | [**getAssetsByOriginalPath**](doc//ViewsApi.md#getassetsbyoriginalpath) | **GET** /view/folder | Retrieve assets by original path
+*ViewsApi* | [**getUniqueOriginalPaths**](doc//ViewsApi.md#getuniqueoriginalpaths) | **GET** /view/folder/unique-paths | Retrieve unique paths
 
 
 ## Documentation For Models
diff --git a/mobile/openapi/lib/api.dart b/mobile/openapi/lib/api.dart
index a4b58763c1..d0ac141bae 100644
--- a/mobile/openapi/lib/api.dart
+++ b/mobile/openapi/lib/api.dart
@@ -34,8 +34,8 @@ part 'api/api_keys_api.dart';
 part 'api/activities_api.dart';
 part 'api/albums_api.dart';
 part 'api/assets_api.dart';
-part 'api/auth_admin_api.dart';
 part 'api/authentication_api.dart';
+part 'api/authentication_admin_api.dart';
 part 'api/deprecated_api.dart';
 part 'api/download_api.dart';
 part 'api/duplicates_api.dart';
@@ -46,7 +46,6 @@ part 'api/map_api.dart';
 part 'api/memories_api.dart';
 part 'api/notifications_api.dart';
 part 'api/notifications_admin_api.dart';
-part 'api/o_auth_api.dart';
 part 'api/partners_api.dart';
 part 'api/people_api.dart';
 part 'api/search_api.dart';
@@ -62,7 +61,7 @@ part 'api/timeline_api.dart';
 part 'api/trash_api.dart';
 part 'api/users_api.dart';
 part 'api/users_admin_api.dart';
-part 'api/view_api.dart';
+part 'api/views_api.dart';
 
 part 'model/api_key_create_dto.dart';
 part 'model/api_key_create_response_dto.dart';
diff --git a/mobile/openapi/lib/api/activities_api.dart b/mobile/openapi/lib/api/activities_api.dart
index 67015499fa..b92f95be72 100644
--- a/mobile/openapi/lib/api/activities_api.dart
+++ b/mobile/openapi/lib/api/activities_api.dart
@@ -16,7 +16,9 @@ class ActivitiesApi {
 
   final ApiClient apiClient;
 
-  /// This endpoint requires the `activity.create` permission.
+  /// Create an activity
+  ///
+  /// Create a like or a comment for an album, or an asset in an album.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -48,7 +50,9 @@ class ActivitiesApi {
     );
   }
 
-  /// This endpoint requires the `activity.create` permission.
+  /// Create an activity
+  ///
+  /// Create a like or a comment for an album, or an asset in an album.
   ///
   /// Parameters:
   ///
@@ -68,7 +72,9 @@ class ActivitiesApi {
     return null;
   }
 
-  /// This endpoint requires the `activity.delete` permission.
+  /// Delete an activity
+  ///
+  /// Removes a like or comment from a given album or asset in an album.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -101,7 +107,9 @@ class ActivitiesApi {
     );
   }
 
-  /// This endpoint requires the `activity.delete` permission.
+  /// Delete an activity
+  ///
+  /// Removes a like or comment from a given album or asset in an album.
   ///
   /// Parameters:
   ///
@@ -113,7 +121,9 @@ class ActivitiesApi {
     }
   }
 
-  /// This endpoint requires the `activity.read` permission.
+  /// List all activities
+  ///
+  /// Returns a list of activities for the selected asset or album. The activities are returned in sorted order, with the oldest activities appearing first.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -167,7 +177,9 @@ class ActivitiesApi {
     );
   }
 
-  /// This endpoint requires the `activity.read` permission.
+  /// List all activities
+  ///
+  /// Returns a list of activities for the selected asset or album. The activities are returned in sorted order, with the oldest activities appearing first.
   ///
   /// Parameters:
   ///
@@ -198,7 +210,9 @@ class ActivitiesApi {
     return null;
   }
 
-  /// This endpoint requires the `activity.statistics` permission.
+  /// Retrieve activity statistics
+  ///
+  /// Returns the number of likes and comments for a given album or asset in an album.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -237,7 +251,9 @@ class ActivitiesApi {
     );
   }
 
-  /// This endpoint requires the `activity.statistics` permission.
+  /// Retrieve activity statistics
+  ///
+  /// Returns the number of likes and comments for a given album or asset in an album.
   ///
   /// Parameters:
   ///
diff --git a/mobile/openapi/lib/api/albums_api.dart b/mobile/openapi/lib/api/albums_api.dart
index a45083669c..1042a2850f 100644
--- a/mobile/openapi/lib/api/albums_api.dart
+++ b/mobile/openapi/lib/api/albums_api.dart
@@ -16,7 +16,9 @@ class AlbumsApi {
 
   final ApiClient apiClient;
 
-  /// This endpoint requires the `albumAsset.create` permission.
+  /// Add assets to an album
+  ///
+  /// Add multiple assets to a specific album by its ID.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -62,7 +64,9 @@ class AlbumsApi {
     );
   }
 
-  /// This endpoint requires the `albumAsset.create` permission.
+  /// Add assets to an album
+  ///
+  /// Add multiple assets to a specific album by its ID.
   ///
   /// Parameters:
   ///
@@ -91,7 +95,9 @@ class AlbumsApi {
     return null;
   }
 
-  /// This endpoint requires the `albumAsset.create` permission.
+  /// Add assets to albums
+  ///
+  /// Send a list of asset IDs and album IDs to add each asset to each album.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -134,7 +140,9 @@ class AlbumsApi {
     );
   }
 
-  /// This endpoint requires the `albumAsset.create` permission.
+  /// Add assets to albums
+  ///
+  /// Send a list of asset IDs and album IDs to add each asset to each album.
   ///
   /// Parameters:
   ///
@@ -158,7 +166,9 @@ class AlbumsApi {
     return null;
   }
 
-  /// This endpoint requires the `albumUser.create` permission.
+  /// Share album with users
+  ///
+  /// Share an album with multiple users. Each user can be given a specific role in the album.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -193,7 +203,9 @@ class AlbumsApi {
     );
   }
 
-  /// This endpoint requires the `albumUser.create` permission.
+  /// Share album with users
+  ///
+  /// Share an album with multiple users. Each user can be given a specific role in the album.
   ///
   /// Parameters:
   ///
@@ -215,7 +227,9 @@ class AlbumsApi {
     return null;
   }
 
-  /// This endpoint requires the `album.create` permission.
+  /// Create an album
+  ///
+  /// Create a new album. The album can also be created with initial users and assets.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -247,7 +261,9 @@ class AlbumsApi {
     );
   }
 
-  /// This endpoint requires the `album.create` permission.
+  /// Create an album
+  ///
+  /// Create a new album. The album can also be created with initial users and assets.
   ///
   /// Parameters:
   ///
@@ -267,7 +283,9 @@ class AlbumsApi {
     return null;
   }
 
-  /// This endpoint requires the `album.delete` permission.
+  /// Delete an album
+  ///
+  /// Delete a specific album by its ID. Note the album is initially trashed and then immediately scheduled for deletion, but relies on a background job to complete the process.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -300,7 +318,9 @@ class AlbumsApi {
     );
   }
 
-  /// This endpoint requires the `album.delete` permission.
+  /// Delete an album
+  ///
+  /// Delete a specific album by its ID. Note the album is initially trashed and then immediately scheduled for deletion, but relies on a background job to complete the process.
   ///
   /// Parameters:
   ///
@@ -312,7 +332,9 @@ class AlbumsApi {
     }
   }
 
-  /// This endpoint requires the `album.read` permission.
+  /// Retrieve an album
+  ///
+  /// Retrieve information about a specific album by its ID.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -361,7 +383,9 @@ class AlbumsApi {
     );
   }
 
-  /// This endpoint requires the `album.read` permission.
+  /// Retrieve an album
+  ///
+  /// Retrieve information about a specific album by its ID.
   ///
   /// Parameters:
   ///
@@ -387,7 +411,9 @@ class AlbumsApi {
     return null;
   }
 
-  /// This endpoint requires the `album.statistics` permission.
+  /// Retrieve album statistics
+  ///
+  /// Returns statistics about the albums available to the authenticated user.
   ///
   /// Note: This method returns the HTTP [Response].
   Future<Response> getAlbumStatisticsWithHttpInfo() async {
@@ -415,7 +441,9 @@ class AlbumsApi {
     );
   }
 
-  /// This endpoint requires the `album.statistics` permission.
+  /// Retrieve album statistics
+  ///
+  /// Returns statistics about the albums available to the authenticated user.
   Future<AlbumStatisticsResponseDto?> getAlbumStatistics() async {
     final response = await getAlbumStatisticsWithHttpInfo();
     if (response.statusCode >= HttpStatus.badRequest) {
@@ -431,7 +459,9 @@ class AlbumsApi {
     return null;
   }
 
-  /// This endpoint requires the `album.read` permission.
+  /// List all albums
+  ///
+  /// Retrieve a list of albums available to the authenticated user.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -473,7 +503,9 @@ class AlbumsApi {
     );
   }
 
-  /// This endpoint requires the `album.read` permission.
+  /// List all albums
+  ///
+  /// Retrieve a list of albums available to the authenticated user.
   ///
   /// Parameters:
   ///
@@ -499,7 +531,9 @@ class AlbumsApi {
     return null;
   }
 
-  /// This endpoint requires the `albumAsset.delete` permission.
+  /// Remove assets from an album
+  ///
+  /// Remove multiple assets from a specific album by its ID.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -534,7 +568,9 @@ class AlbumsApi {
     );
   }
 
-  /// This endpoint requires the `albumAsset.delete` permission.
+  /// Remove assets from an album
+  ///
+  /// Remove multiple assets from a specific album by its ID.
   ///
   /// Parameters:
   ///
@@ -559,7 +595,9 @@ class AlbumsApi {
     return null;
   }
 
-  /// This endpoint requires the `albumUser.delete` permission.
+  /// Remove user from album
+  ///
+  /// Remove a user from an album. Use an ID of \"me\" to leave a shared album.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -595,7 +633,9 @@ class AlbumsApi {
     );
   }
 
-  /// This endpoint requires the `albumUser.delete` permission.
+  /// Remove user from album
+  ///
+  /// Remove a user from an album. Use an ID of \"me\" to leave a shared album.
   ///
   /// Parameters:
   ///
@@ -609,7 +649,9 @@ class AlbumsApi {
     }
   }
 
-  /// This endpoint requires the `album.update` permission.
+  /// Update an album
+  ///
+  /// Update the information of a specific album by its ID. This endpoint can be used to update the album name, description, sort order, etc. However, it is not used to add or remove assets or users from the album.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -644,7 +686,9 @@ class AlbumsApi {
     );
   }
 
-  /// This endpoint requires the `album.update` permission.
+  /// Update an album
+  ///
+  /// Update the information of a specific album by its ID. This endpoint can be used to update the album name, description, sort order, etc. However, it is not used to add or remove assets or users from the album.
   ///
   /// Parameters:
   ///
@@ -666,7 +710,9 @@ class AlbumsApi {
     return null;
   }
 
-  /// This endpoint requires the `albumUser.update` permission.
+  /// Update user role
+  ///
+  /// Change the role for a specific user in a specific album.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -704,7 +750,9 @@ class AlbumsApi {
     );
   }
 
-  /// This endpoint requires the `albumUser.update` permission.
+  /// Update user role
+  ///
+  /// Change the role for a specific user in a specific album.
   ///
   /// Parameters:
   ///
diff --git a/mobile/openapi/lib/api/api_keys_api.dart b/mobile/openapi/lib/api/api_keys_api.dart
index 3ac829c30c..0bd26575c6 100644
--- a/mobile/openapi/lib/api/api_keys_api.dart
+++ b/mobile/openapi/lib/api/api_keys_api.dart
@@ -16,7 +16,9 @@ class APIKeysApi {
 
   final ApiClient apiClient;
 
-  /// This endpoint requires the `apiKey.create` permission.
+  /// Create an API key
+  ///
+  /// Creates a new API key. It will be limited to the permissions specified.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -48,7 +50,9 @@ class APIKeysApi {
     );
   }
 
-  /// This endpoint requires the `apiKey.create` permission.
+  /// Create an API key
+  ///
+  /// Creates a new API key. It will be limited to the permissions specified.
   ///
   /// Parameters:
   ///
@@ -68,7 +72,9 @@ class APIKeysApi {
     return null;
   }
 
-  /// This endpoint requires the `apiKey.delete` permission.
+  /// Delete an API key
+  ///
+  /// Deletes an API key identified by its ID. The current user must own this API key.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -101,7 +107,9 @@ class APIKeysApi {
     );
   }
 
-  /// This endpoint requires the `apiKey.delete` permission.
+  /// Delete an API key
+  ///
+  /// Deletes an API key identified by its ID. The current user must own this API key.
   ///
   /// Parameters:
   ///
@@ -113,7 +121,9 @@ class APIKeysApi {
     }
   }
 
-  /// This endpoint requires the `apiKey.read` permission.
+  /// Retrieve an API key
+  ///
+  /// Retrieve an API key by its ID. The current user must own this API key.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -146,7 +156,9 @@ class APIKeysApi {
     );
   }
 
-  /// This endpoint requires the `apiKey.read` permission.
+  /// Retrieve an API key
+  ///
+  /// Retrieve an API key by its ID. The current user must own this API key.
   ///
   /// Parameters:
   ///
@@ -166,7 +178,9 @@ class APIKeysApi {
     return null;
   }
 
-  /// This endpoint requires the `apiKey.read` permission.
+  /// List all API keys
+  ///
+  /// Retrieve all API keys of the current user.
   ///
   /// Note: This method returns the HTTP [Response].
   Future<Response> getApiKeysWithHttpInfo() async {
@@ -194,7 +208,9 @@ class APIKeysApi {
     );
   }
 
-  /// This endpoint requires the `apiKey.read` permission.
+  /// List all API keys
+  ///
+  /// Retrieve all API keys of the current user.
   Future<List<APIKeyResponseDto>?> getApiKeys() async {
     final response = await getApiKeysWithHttpInfo();
     if (response.statusCode >= HttpStatus.badRequest) {
@@ -213,7 +229,11 @@ class APIKeysApi {
     return null;
   }
 
-  /// Performs an HTTP 'GET /api-keys/me' operation and returns the [Response].
+  /// Retrieve the current API key
+  ///
+  /// Retrieve the API key that is used to access this endpoint.
+  ///
+  /// Note: This method returns the HTTP [Response].
   Future<Response> getMyApiKeyWithHttpInfo() async {
     // ignore: prefer_const_declarations
     final apiPath = r'/api-keys/me';
@@ -239,6 +259,9 @@ class APIKeysApi {
     );
   }
 
+  /// Retrieve the current API key
+  ///
+  /// Retrieve the API key that is used to access this endpoint.
   Future<APIKeyResponseDto?> getMyApiKey() async {
     final response = await getMyApiKeyWithHttpInfo();
     if (response.statusCode >= HttpStatus.badRequest) {
@@ -254,7 +277,9 @@ class APIKeysApi {
     return null;
   }
 
-  /// This endpoint requires the `apiKey.update` permission.
+  /// Update an API key
+  ///
+  /// Updates the name and permissions of an API key by its ID. The current user must own this API key.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -289,7 +314,9 @@ class APIKeysApi {
     );
   }
 
-  /// This endpoint requires the `apiKey.update` permission.
+  /// Update an API key
+  ///
+  /// Updates the name and permissions of an API key by its ID. The current user must own this API key.
   ///
   /// Parameters:
   ///
diff --git a/mobile/openapi/lib/api/assets_api.dart b/mobile/openapi/lib/api/assets_api.dart
index 7bae14bb58..fdb171bedc 100644
--- a/mobile/openapi/lib/api/assets_api.dart
+++ b/mobile/openapi/lib/api/assets_api.dart
@@ -16,9 +16,9 @@ class AssetsApi {
 
   final ApiClient apiClient;
 
-  /// checkBulkUpload
+  /// Check bulk upload
   ///
-  /// Checks if assets exist by checksums. This endpoint requires the `asset.upload` permission.
+  /// Determine which assets have already been uploaded to the server based on their SHA1 checksums.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -50,9 +50,9 @@ class AssetsApi {
     );
   }
 
-  /// checkBulkUpload
+  /// Check bulk upload
   ///
-  /// Checks if assets exist by checksums. This endpoint requires the `asset.upload` permission.
+  /// Determine which assets have already been uploaded to the server based on their SHA1 checksums.
   ///
   /// Parameters:
   ///
@@ -72,7 +72,7 @@ class AssetsApi {
     return null;
   }
 
-  /// checkExistingAssets
+  /// Check existing assets
   ///
   /// Checks if multiple assets exist on the server and returns all existing - used by background backup
   ///
@@ -106,7 +106,7 @@ class AssetsApi {
     );
   }
 
-  /// checkExistingAssets
+  /// Check existing assets
   ///
   /// Checks if multiple assets exist on the server and returns all existing - used by background backup
   ///
@@ -128,7 +128,9 @@ class AssetsApi {
     return null;
   }
 
-  /// This endpoint requires the `asset.copy` permission.
+  /// Copy asset
+  ///
+  /// Copy asset information like albums, tags, etc. from one asset to another.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -160,7 +162,9 @@ class AssetsApi {
     );
   }
 
-  /// This endpoint requires the `asset.copy` permission.
+  /// Copy asset
+  ///
+  /// Copy asset information like albums, tags, etc. from one asset to another.
   ///
   /// Parameters:
   ///
@@ -172,7 +176,9 @@ class AssetsApi {
     }
   }
 
-  /// This endpoint requires the `asset.update` permission.
+  /// Delete asset metadata by key
+  ///
+  /// Delete a specific metadata key-value pair associated with the specified asset.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -208,7 +214,9 @@ class AssetsApi {
     );
   }
 
-  /// This endpoint requires the `asset.update` permission.
+  /// Delete asset metadata by key
+  ///
+  /// Delete a specific metadata key-value pair associated with the specified asset.
   ///
   /// Parameters:
   ///
@@ -222,7 +230,9 @@ class AssetsApi {
     }
   }
 
-  /// This endpoint requires the `asset.delete` permission.
+  /// Delete assets
+  ///
+  /// Deletes multiple assets at the same time.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -254,7 +264,9 @@ class AssetsApi {
     );
   }
 
-  /// This endpoint requires the `asset.delete` permission.
+  /// Delete assets
+  ///
+  /// Deletes multiple assets at the same time.
   ///
   /// Parameters:
   ///
@@ -266,7 +278,9 @@ class AssetsApi {
     }
   }
 
-  /// This endpoint requires the `asset.download` permission.
+  /// Download original asset
+  ///
+  /// Downloads the original file of the specified asset.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -310,7 +324,9 @@ class AssetsApi {
     );
   }
 
-  /// This endpoint requires the `asset.download` permission.
+  /// Download original asset
+  ///
+  /// Downloads the original file of the specified asset.
   ///
   /// Parameters:
   ///
@@ -334,9 +350,9 @@ class AssetsApi {
     return null;
   }
 
-  /// getAllUserAssetsByDeviceId
+  /// Retrieve assets by device ID
   ///
-  /// Get all asset of a device that are in the database, ID only.
+  /// This property was deprecated in v2.0.0. Get all asset of a device that are in the database, ID only.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -369,9 +385,9 @@ class AssetsApi {
     );
   }
 
-  /// getAllUserAssetsByDeviceId
+  /// Retrieve assets by device ID
   ///
-  /// Get all asset of a device that are in the database, ID only.
+  /// This property was deprecated in v2.0.0. Get all asset of a device that are in the database, ID only.
   ///
   /// Parameters:
   ///
@@ -394,7 +410,9 @@ class AssetsApi {
     return null;
   }
 
-  /// This endpoint requires the `asset.read` permission.
+  /// Retrieve an asset
+  ///
+  /// Retrieve detailed information about a specific asset.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -438,7 +456,9 @@ class AssetsApi {
     );
   }
 
-  /// This endpoint requires the `asset.read` permission.
+  /// Retrieve an asset
+  ///
+  /// Retrieve detailed information about a specific asset.
   ///
   /// Parameters:
   ///
@@ -462,7 +482,9 @@ class AssetsApi {
     return null;
   }
 
-  /// This endpoint requires the `asset.read` permission.
+  /// Get asset metadata
+  ///
+  /// Retrieve all metadata key-value pairs associated with the specified asset.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -495,7 +517,9 @@ class AssetsApi {
     );
   }
 
-  /// This endpoint requires the `asset.read` permission.
+  /// Get asset metadata
+  ///
+  /// Retrieve all metadata key-value pairs associated with the specified asset.
   ///
   /// Parameters:
   ///
@@ -518,7 +542,9 @@ class AssetsApi {
     return null;
   }
 
-  /// This endpoint requires the `asset.read` permission.
+  /// Retrieve asset metadata by key
+  ///
+  /// Retrieve the value of a specific metadata key associated with the specified asset.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -554,7 +580,9 @@ class AssetsApi {
     );
   }
 
-  /// This endpoint requires the `asset.read` permission.
+  /// Retrieve asset metadata by key
+  ///
+  /// Retrieve the value of a specific metadata key associated with the specified asset.
   ///
   /// Parameters:
   ///
@@ -576,7 +604,9 @@ class AssetsApi {
     return null;
   }
 
-  /// This endpoint requires the `asset.read` permission.
+  /// Retrieve asset OCR data
+  ///
+  /// Retrieve all OCR (Optical Character Recognition) data associated with the specified asset.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -609,7 +639,9 @@ class AssetsApi {
     );
   }
 
-  /// This endpoint requires the `asset.read` permission.
+  /// Retrieve asset OCR data
+  ///
+  /// Retrieve all OCR (Optical Character Recognition) data associated with the specified asset.
   ///
   /// Parameters:
   ///
@@ -632,7 +664,9 @@ class AssetsApi {
     return null;
   }
 
-  /// This endpoint requires the `asset.statistics` permission.
+  /// Get asset statistics
+  ///
+  /// Retrieve various statistics about the assets owned by the authenticated user.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -678,7 +712,9 @@ class AssetsApi {
     );
   }
 
-  /// This endpoint requires the `asset.statistics` permission.
+  /// Get asset statistics
+  ///
+  /// Retrieve various statistics about the assets owned by the authenticated user.
   ///
   /// Parameters:
   ///
@@ -702,7 +738,9 @@ class AssetsApi {
     return null;
   }
 
-  /// This property was deprecated in v1.116.0. This endpoint requires the `asset.read` permission.
+  /// Get random assets
+  ///
+  /// This property was deprecated in v1.116.0. Retrieve a specified number of random assets for the authenticated user.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -738,7 +776,9 @@ class AssetsApi {
     );
   }
 
-  /// This property was deprecated in v1.116.0. This endpoint requires the `asset.read` permission.
+  /// Get random assets
+  ///
+  /// This property was deprecated in v1.116.0. Retrieve a specified number of random assets for the authenticated user.
   ///
   /// Parameters:
   ///
@@ -761,7 +801,9 @@ class AssetsApi {
     return null;
   }
 
-  /// This endpoint requires the `asset.view` permission.
+  /// Play asset video
+  ///
+  /// Streams the video file for the specified asset. This endpoint also supports byte range requests.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -805,7 +847,9 @@ class AssetsApi {
     );
   }
 
-  /// This endpoint requires the `asset.view` permission.
+  /// Play asset video
+  ///
+  /// Streams the video file for the specified asset. This endpoint also supports byte range requests.
   ///
   /// Parameters:
   ///
@@ -829,9 +873,9 @@ class AssetsApi {
     return null;
   }
 
-  /// Replace the asset with new file, without changing its id
+  /// Replace asset
   ///
-  /// This property was deprecated in v1.142.0. Replace the asset with new file, without changing its id. This endpoint requires the `asset.replace` permission.
+  /// This property was deprecated in v1.142.0. Replace the asset with new file, without changing its id.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -923,9 +967,9 @@ class AssetsApi {
     );
   }
 
-  /// Replace the asset with new file, without changing its id
+  /// Replace asset
   ///
-  /// This property was deprecated in v1.142.0. Replace the asset with new file, without changing its id. This endpoint requires the `asset.replace` permission.
+  /// This property was deprecated in v1.142.0. Replace the asset with new file, without changing its id.
   ///
   /// Parameters:
   ///
@@ -963,7 +1007,12 @@ class AssetsApi {
     return null;
   }
 
-  /// Performs an HTTP 'POST /assets/jobs' operation and returns the [Response].
+  /// Run an asset job
+  ///
+  /// Run a specific job on a set of assets.
+  ///
+  /// Note: This method returns the HTTP [Response].
+  ///
   /// Parameters:
   ///
   /// * [AssetJobsDto] assetJobsDto (required):
@@ -992,6 +1041,10 @@ class AssetsApi {
     );
   }
 
+  /// Run an asset job
+  ///
+  /// Run a specific job on a set of assets.
+  ///
   /// Parameters:
   ///
   /// * [AssetJobsDto] assetJobsDto (required):
@@ -1002,7 +1055,9 @@ class AssetsApi {
     }
   }
 
-  /// This endpoint requires the `asset.update` permission.
+  /// Update an asset
+  ///
+  /// Update information of a specific asset.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -1037,7 +1092,9 @@ class AssetsApi {
     );
   }
 
-  /// This endpoint requires the `asset.update` permission.
+  /// Update an asset
+  ///
+  /// Update information of a specific asset.
   ///
   /// Parameters:
   ///
@@ -1059,7 +1116,9 @@ class AssetsApi {
     return null;
   }
 
-  /// This endpoint requires the `asset.update` permission.
+  /// Update asset metadata
+  ///
+  /// Update or add metadata key-value pairs for the specified asset.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -1094,7 +1153,9 @@ class AssetsApi {
     );
   }
 
-  /// This endpoint requires the `asset.update` permission.
+  /// Update asset metadata
+  ///
+  /// Update or add metadata key-value pairs for the specified asset.
   ///
   /// Parameters:
   ///
@@ -1119,7 +1180,9 @@ class AssetsApi {
     return null;
   }
 
-  /// This endpoint requires the `asset.update` permission.
+  /// Update assets
+  ///
+  /// Updates multiple assets at the same time.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -1151,7 +1214,9 @@ class AssetsApi {
     );
   }
 
-  /// This endpoint requires the `asset.update` permission.
+  /// Update assets
+  ///
+  /// Updates multiple assets at the same time.
   ///
   /// Parameters:
   ///
@@ -1163,7 +1228,9 @@ class AssetsApi {
     }
   }
 
-  /// This endpoint requires the `asset.upload` permission.
+  /// Upload asset
+  ///
+  /// Uploads a new asset to the server.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -1290,7 +1357,9 @@ class AssetsApi {
     );
   }
 
-  /// This endpoint requires the `asset.upload` permission.
+  /// Upload asset
+  ///
+  /// Uploads a new asset to the server.
   ///
   /// Parameters:
   ///
@@ -1339,7 +1408,9 @@ class AssetsApi {
     return null;
   }
 
-  /// This endpoint requires the `asset.view` permission.
+  /// View asset thumbnail
+  ///
+  /// Retrieve the thumbnail image for the specified asset.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -1388,7 +1459,9 @@ class AssetsApi {
     );
   }
 
-  /// This endpoint requires the `asset.view` permission.
+  /// View asset thumbnail
+  ///
+  /// Retrieve the thumbnail image for the specified asset.
   ///
   /// Parameters:
   ///
diff --git a/mobile/openapi/lib/api/auth_admin_api.dart b/mobile/openapi/lib/api/authentication_admin_api.dart
similarity index 77%
rename from mobile/openapi/lib/api/auth_admin_api.dart
rename to mobile/openapi/lib/api/authentication_admin_api.dart
index d22b449aab..0a4b91ebc3 100644
--- a/mobile/openapi/lib/api/auth_admin_api.dart
+++ b/mobile/openapi/lib/api/authentication_admin_api.dart
@@ -11,12 +11,14 @@
 part of openapi.api;
 
 
-class AuthAdminApi {
-  AuthAdminApi([ApiClient? apiClient]) : apiClient = apiClient ?? defaultApiClient;
+class AuthenticationAdminApi {
+  AuthenticationAdminApi([ApiClient? apiClient]) : apiClient = apiClient ?? defaultApiClient;
 
   final ApiClient apiClient;
 
-  /// This endpoint is an admin-only route, and requires the `adminAuth.unlinkAll` permission.
+  /// Unlink all OAuth accounts
+  ///
+  /// Unlinks all OAuth accounts associated with user accounts in the system.
   ///
   /// Note: This method returns the HTTP [Response].
   Future<Response> unlinkAllOAuthAccountsAdminWithHttpInfo() async {
@@ -44,7 +46,9 @@ class AuthAdminApi {
     );
   }
 
-  /// This endpoint is an admin-only route, and requires the `adminAuth.unlinkAll` permission.
+  /// Unlink all OAuth accounts
+  ///
+  /// Unlinks all OAuth accounts associated with user accounts in the system.
   Future<void> unlinkAllOAuthAccountsAdmin() async {
     final response = await unlinkAllOAuthAccountsAdminWithHttpInfo();
     if (response.statusCode >= HttpStatus.badRequest) {
diff --git a/mobile/openapi/lib/api/authentication_api.dart b/mobile/openapi/lib/api/authentication_api.dart
index a74af33a43..52d46a525b 100644
--- a/mobile/openapi/lib/api/authentication_api.dart
+++ b/mobile/openapi/lib/api/authentication_api.dart
@@ -16,7 +16,9 @@ class AuthenticationApi {
 
   final ApiClient apiClient;
 
-  /// This endpoint requires the `auth.changePassword` permission.
+  /// Change password
+  ///
+  /// Change the password of the current user.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -48,7 +50,9 @@ class AuthenticationApi {
     );
   }
 
-  /// This endpoint requires the `auth.changePassword` permission.
+  /// Change password
+  ///
+  /// Change the password of the current user.
   ///
   /// Parameters:
   ///
@@ -68,7 +72,9 @@ class AuthenticationApi {
     return null;
   }
 
-  /// This endpoint requires the `pinCode.update` permission.
+  /// Change pin code
+  ///
+  /// Change the pin code for the current user.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -100,7 +106,9 @@ class AuthenticationApi {
     );
   }
 
-  /// This endpoint requires the `pinCode.update` permission.
+  /// Change pin code
+  ///
+  /// Change the pin code for the current user.
   ///
   /// Parameters:
   ///
@@ -112,7 +120,67 @@ class AuthenticationApi {
     }
   }
 
-  /// Performs an HTTP 'GET /auth/status' operation and returns the [Response].
+  /// Finish OAuth
+  ///
+  /// Complete the OAuth authorization process by exchanging the authorization code for a session token.
+  ///
+  /// Note: This method returns the HTTP [Response].
+  ///
+  /// Parameters:
+  ///
+  /// * [OAuthCallbackDto] oAuthCallbackDto (required):
+  Future<Response> finishOAuthWithHttpInfo(OAuthCallbackDto oAuthCallbackDto,) async {
+    // ignore: prefer_const_declarations
+    final apiPath = r'/oauth/callback';
+
+    // ignore: prefer_final_locals
+    Object? postBody = oAuthCallbackDto;
+
+    final queryParams = <QueryParam>[];
+    final headerParams = <String, String>{};
+    final formParams = <String, String>{};
+
+    const contentTypes = <String>['application/json'];
+
+
+    return apiClient.invokeAPI(
+      apiPath,
+      'POST',
+      queryParams,
+      postBody,
+      headerParams,
+      formParams,
+      contentTypes.isEmpty ? null : contentTypes.first,
+    );
+  }
+
+  /// Finish OAuth
+  ///
+  /// Complete the OAuth authorization process by exchanging the authorization code for a session token.
+  ///
+  /// Parameters:
+  ///
+  /// * [OAuthCallbackDto] oAuthCallbackDto (required):
+  Future<LoginResponseDto?> finishOAuth(OAuthCallbackDto oAuthCallbackDto,) async {
+    final response = await finishOAuthWithHttpInfo(oAuthCallbackDto,);
+    if (response.statusCode >= HttpStatus.badRequest) {
+      throw ApiException(response.statusCode, await _decodeBodyBytes(response));
+    }
+    // When a remote server returns no body with a status of 204, we shall not decode it.
+    // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
+    // FormatException when trying to decode an empty string.
+    if (response.body.isNotEmpty && response.statusCode != HttpStatus.noContent) {
+      return await apiClient.deserializeAsync(await _decodeBodyBytes(response), 'LoginResponseDto',) as LoginResponseDto;
+    
+    }
+    return null;
+  }
+
+  /// Retrieve auth status
+  ///
+  /// Get information about the current session, including whether the user has a password, and if the session can access locked assets.
+  ///
+  /// Note: This method returns the HTTP [Response].
   Future<Response> getAuthStatusWithHttpInfo() async {
     // ignore: prefer_const_declarations
     final apiPath = r'/auth/status';
@@ -138,6 +206,9 @@ class AuthenticationApi {
     );
   }
 
+  /// Retrieve auth status
+  ///
+  /// Get information about the current session, including whether the user has a password, and if the session can access locked assets.
   Future<AuthStatusResponseDto?> getAuthStatus() async {
     final response = await getAuthStatusWithHttpInfo();
     if (response.statusCode >= HttpStatus.badRequest) {
@@ -153,7 +224,67 @@ class AuthenticationApi {
     return null;
   }
 
-  /// Performs an HTTP 'POST /auth/session/lock' operation and returns the [Response].
+  /// Link OAuth account
+  ///
+  /// Link an OAuth account to the authenticated user.
+  ///
+  /// Note: This method returns the HTTP [Response].
+  ///
+  /// Parameters:
+  ///
+  /// * [OAuthCallbackDto] oAuthCallbackDto (required):
+  Future<Response> linkOAuthAccountWithHttpInfo(OAuthCallbackDto oAuthCallbackDto,) async {
+    // ignore: prefer_const_declarations
+    final apiPath = r'/oauth/link';
+
+    // ignore: prefer_final_locals
+    Object? postBody = oAuthCallbackDto;
+
+    final queryParams = <QueryParam>[];
+    final headerParams = <String, String>{};
+    final formParams = <String, String>{};
+
+    const contentTypes = <String>['application/json'];
+
+
+    return apiClient.invokeAPI(
+      apiPath,
+      'POST',
+      queryParams,
+      postBody,
+      headerParams,
+      formParams,
+      contentTypes.isEmpty ? null : contentTypes.first,
+    );
+  }
+
+  /// Link OAuth account
+  ///
+  /// Link an OAuth account to the authenticated user.
+  ///
+  /// Parameters:
+  ///
+  /// * [OAuthCallbackDto] oAuthCallbackDto (required):
+  Future<UserAdminResponseDto?> linkOAuthAccount(OAuthCallbackDto oAuthCallbackDto,) async {
+    final response = await linkOAuthAccountWithHttpInfo(oAuthCallbackDto,);
+    if (response.statusCode >= HttpStatus.badRequest) {
+      throw ApiException(response.statusCode, await _decodeBodyBytes(response));
+    }
+    // When a remote server returns no body with a status of 204, we shall not decode it.
+    // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
+    // FormatException when trying to decode an empty string.
+    if (response.body.isNotEmpty && response.statusCode != HttpStatus.noContent) {
+      return await apiClient.deserializeAsync(await _decodeBodyBytes(response), 'UserAdminResponseDto',) as UserAdminResponseDto;
+    
+    }
+    return null;
+  }
+
+  /// Lock auth session
+  ///
+  /// Remove elevated access to locked assets from the current session.
+  ///
+  /// Note: This method returns the HTTP [Response].
   Future<Response> lockAuthSessionWithHttpInfo() async {
     // ignore: prefer_const_declarations
     final apiPath = r'/auth/session/lock';
@@ -179,6 +310,9 @@ class AuthenticationApi {
     );
   }
 
+  /// Lock auth session
+  ///
+  /// Remove elevated access to locked assets from the current session.
   Future<void> lockAuthSession() async {
     final response = await lockAuthSessionWithHttpInfo();
     if (response.statusCode >= HttpStatus.badRequest) {
@@ -186,7 +320,12 @@ class AuthenticationApi {
     }
   }
 
-  /// Performs an HTTP 'POST /auth/login' operation and returns the [Response].
+  /// Login
+  ///
+  /// Login with username and password and receive a session token.
+  ///
+  /// Note: This method returns the HTTP [Response].
+  ///
   /// Parameters:
   ///
   /// * [LoginCredentialDto] loginCredentialDto (required):
@@ -215,6 +354,10 @@ class AuthenticationApi {
     );
   }
 
+  /// Login
+  ///
+  /// Login with username and password and receive a session token.
+  ///
   /// Parameters:
   ///
   /// * [LoginCredentialDto] loginCredentialDto (required):
@@ -233,7 +376,11 @@ class AuthenticationApi {
     return null;
   }
 
-  /// Performs an HTTP 'POST /auth/logout' operation and returns the [Response].
+  /// Logout
+  ///
+  /// Logout the current user and invalidate the session token.
+  ///
+  /// Note: This method returns the HTTP [Response].
   Future<Response> logoutWithHttpInfo() async {
     // ignore: prefer_const_declarations
     final apiPath = r'/auth/logout';
@@ -259,6 +406,9 @@ class AuthenticationApi {
     );
   }
 
+  /// Logout
+  ///
+  /// Logout the current user and invalidate the session token.
   Future<LogoutResponseDto?> logout() async {
     final response = await logoutWithHttpInfo();
     if (response.statusCode >= HttpStatus.badRequest) {
@@ -274,7 +424,49 @@ class AuthenticationApi {
     return null;
   }
 
-  /// This endpoint requires the `pinCode.delete` permission.
+  /// Redirect OAuth to mobile
+  ///
+  /// Requests to this URL are automatically forwarded to the mobile app, and is used in some cases for OAuth redirecting.
+  ///
+  /// Note: This method returns the HTTP [Response].
+  Future<Response> redirectOAuthToMobileWithHttpInfo() async {
+    // ignore: prefer_const_declarations
+    final apiPath = r'/oauth/mobile-redirect';
+
+    // ignore: prefer_final_locals
+    Object? postBody;
+
+    final queryParams = <QueryParam>[];
+    final headerParams = <String, String>{};
+    final formParams = <String, String>{};
+
+    const contentTypes = <String>[];
+
+
+    return apiClient.invokeAPI(
+      apiPath,
+      'GET',
+      queryParams,
+      postBody,
+      headerParams,
+      formParams,
+      contentTypes.isEmpty ? null : contentTypes.first,
+    );
+  }
+
+  /// Redirect OAuth to mobile
+  ///
+  /// Requests to this URL are automatically forwarded to the mobile app, and is used in some cases for OAuth redirecting.
+  Future<void> redirectOAuthToMobile() async {
+    final response = await redirectOAuthToMobileWithHttpInfo();
+    if (response.statusCode >= HttpStatus.badRequest) {
+      throw ApiException(response.statusCode, await _decodeBodyBytes(response));
+    }
+  }
+
+  /// Reset pin code
+  ///
+  /// Reset the pin code for the current user by providing the account password
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -306,7 +498,9 @@ class AuthenticationApi {
     );
   }
 
-  /// This endpoint requires the `pinCode.delete` permission.
+  /// Reset pin code
+  ///
+  /// Reset the pin code for the current user by providing the account password
   ///
   /// Parameters:
   ///
@@ -318,7 +512,9 @@ class AuthenticationApi {
     }
   }
 
-  /// This endpoint requires the `pinCode.create` permission.
+  /// Setup pin code
+  ///
+  /// Setup a new pin code for the current user.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -350,7 +546,9 @@ class AuthenticationApi {
     );
   }
 
-  /// This endpoint requires the `pinCode.create` permission.
+  /// Setup pin code
+  ///
+  /// Setup a new pin code for the current user.
   ///
   /// Parameters:
   ///
@@ -362,7 +560,12 @@ class AuthenticationApi {
     }
   }
 
-  /// Performs an HTTP 'POST /auth/admin-sign-up' operation and returns the [Response].
+  /// Register admin
+  ///
+  /// Create the first admin user in the system.
+  ///
+  /// Note: This method returns the HTTP [Response].
+  ///
   /// Parameters:
   ///
   /// * [SignUpDto] signUpDto (required):
@@ -391,6 +594,10 @@ class AuthenticationApi {
     );
   }
 
+  /// Register admin
+  ///
+  /// Create the first admin user in the system.
+  ///
   /// Parameters:
   ///
   /// * [SignUpDto] signUpDto (required):
@@ -409,7 +616,116 @@ class AuthenticationApi {
     return null;
   }
 
-  /// Performs an HTTP 'POST /auth/session/unlock' operation and returns the [Response].
+  /// Start OAuth
+  ///
+  /// Initiate the OAuth authorization process.
+  ///
+  /// Note: This method returns the HTTP [Response].
+  ///
+  /// Parameters:
+  ///
+  /// * [OAuthConfigDto] oAuthConfigDto (required):
+  Future<Response> startOAuthWithHttpInfo(OAuthConfigDto oAuthConfigDto,) async {
+    // ignore: prefer_const_declarations
+    final apiPath = r'/oauth/authorize';
+
+    // ignore: prefer_final_locals
+    Object? postBody = oAuthConfigDto;
+
+    final queryParams = <QueryParam>[];
+    final headerParams = <String, String>{};
+    final formParams = <String, String>{};
+
+    const contentTypes = <String>['application/json'];
+
+
+    return apiClient.invokeAPI(
+      apiPath,
+      'POST',
+      queryParams,
+      postBody,
+      headerParams,
+      formParams,
+      contentTypes.isEmpty ? null : contentTypes.first,
+    );
+  }
+
+  /// Start OAuth
+  ///
+  /// Initiate the OAuth authorization process.
+  ///
+  /// Parameters:
+  ///
+  /// * [OAuthConfigDto] oAuthConfigDto (required):
+  Future<OAuthAuthorizeResponseDto?> startOAuth(OAuthConfigDto oAuthConfigDto,) async {
+    final response = await startOAuthWithHttpInfo(oAuthConfigDto,);
+    if (response.statusCode >= HttpStatus.badRequest) {
+      throw ApiException(response.statusCode, await _decodeBodyBytes(response));
+    }
+    // When a remote server returns no body with a status of 204, we shall not decode it.
+    // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
+    // FormatException when trying to decode an empty string.
+    if (response.body.isNotEmpty && response.statusCode != HttpStatus.noContent) {
+      return await apiClient.deserializeAsync(await _decodeBodyBytes(response), 'OAuthAuthorizeResponseDto',) as OAuthAuthorizeResponseDto;
+    
+    }
+    return null;
+  }
+
+  /// Unlink OAuth account
+  ///
+  /// Unlink the OAuth account from the authenticated user.
+  ///
+  /// Note: This method returns the HTTP [Response].
+  Future<Response> unlinkOAuthAccountWithHttpInfo() async {
+    // ignore: prefer_const_declarations
+    final apiPath = r'/oauth/unlink';
+
+    // ignore: prefer_final_locals
+    Object? postBody;
+
+    final queryParams = <QueryParam>[];
+    final headerParams = <String, String>{};
+    final formParams = <String, String>{};
+
+    const contentTypes = <String>[];
+
+
+    return apiClient.invokeAPI(
+      apiPath,
+      'POST',
+      queryParams,
+      postBody,
+      headerParams,
+      formParams,
+      contentTypes.isEmpty ? null : contentTypes.first,
+    );
+  }
+
+  /// Unlink OAuth account
+  ///
+  /// Unlink the OAuth account from the authenticated user.
+  Future<UserAdminResponseDto?> unlinkOAuthAccount() async {
+    final response = await unlinkOAuthAccountWithHttpInfo();
+    if (response.statusCode >= HttpStatus.badRequest) {
+      throw ApiException(response.statusCode, await _decodeBodyBytes(response));
+    }
+    // When a remote server returns no body with a status of 204, we shall not decode it.
+    // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
+    // FormatException when trying to decode an empty string.
+    if (response.body.isNotEmpty && response.statusCode != HttpStatus.noContent) {
+      return await apiClient.deserializeAsync(await _decodeBodyBytes(response), 'UserAdminResponseDto',) as UserAdminResponseDto;
+    
+    }
+    return null;
+  }
+
+  /// Unlock auth session
+  ///
+  /// Temporarily grant the session elevated access to locked assets by providing the correct PIN code.
+  ///
+  /// Note: This method returns the HTTP [Response].
+  ///
   /// Parameters:
   ///
   /// * [SessionUnlockDto] sessionUnlockDto (required):
@@ -438,6 +754,10 @@ class AuthenticationApi {
     );
   }
 
+  /// Unlock auth session
+  ///
+  /// Temporarily grant the session elevated access to locked assets by providing the correct PIN code.
+  ///
   /// Parameters:
   ///
   /// * [SessionUnlockDto] sessionUnlockDto (required):
@@ -448,7 +768,11 @@ class AuthenticationApi {
     }
   }
 
-  /// Performs an HTTP 'POST /auth/validateToken' operation and returns the [Response].
+  /// Validate access token
+  ///
+  /// Validate the current authorization method is still valid.
+  ///
+  /// Note: This method returns the HTTP [Response].
   Future<Response> validateAccessTokenWithHttpInfo() async {
     // ignore: prefer_const_declarations
     final apiPath = r'/auth/validateToken';
@@ -474,6 +798,9 @@ class AuthenticationApi {
     );
   }
 
+  /// Validate access token
+  ///
+  /// Validate the current authorization method is still valid.
   Future<ValidateAccessTokenResponseDto?> validateAccessToken() async {
     final response = await validateAccessTokenWithHttpInfo();
     if (response.statusCode >= HttpStatus.badRequest) {
diff --git a/mobile/openapi/lib/api/deprecated_api.dart b/mobile/openapi/lib/api/deprecated_api.dart
index 9246998ca2..b47b26b148 100644
--- a/mobile/openapi/lib/api/deprecated_api.dart
+++ b/mobile/openapi/lib/api/deprecated_api.dart
@@ -16,7 +16,9 @@ class DeprecatedApi {
 
   final ApiClient apiClient;
 
-  /// This property was deprecated in v1.141.0. This endpoint requires the `partner.create` permission.
+  /// Create a partner
+  ///
+  /// This property was deprecated in v1.141.0. Create a new partner to share assets with.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -49,7 +51,9 @@ class DeprecatedApi {
     );
   }
 
-  /// This property was deprecated in v1.141.0. This endpoint requires the `partner.create` permission.
+  /// Create a partner
+  ///
+  /// This property was deprecated in v1.141.0. Create a new partner to share assets with.
   ///
   /// Parameters:
   ///
@@ -69,7 +73,184 @@ class DeprecatedApi {
     return null;
   }
 
-  /// This property was deprecated in v1.116.0. This endpoint requires the `asset.read` permission.
+  /// Retrieve assets by device ID
+  ///
+  /// This property was deprecated in v2.0.0. Get all asset of a device that are in the database, ID only.
+  ///
+  /// Note: This method returns the HTTP [Response].
+  ///
+  /// Parameters:
+  ///
+  /// * [String] deviceId (required):
+  Future<Response> getAllUserAssetsByDeviceIdWithHttpInfo(String deviceId,) async {
+    // ignore: prefer_const_declarations
+    final apiPath = r'/assets/device/{deviceId}'
+      .replaceAll('{deviceId}', deviceId);
+
+    // ignore: prefer_final_locals
+    Object? postBody;
+
+    final queryParams = <QueryParam>[];
+    final headerParams = <String, String>{};
+    final formParams = <String, String>{};
+
+    const contentTypes = <String>[];
+
+
+    return apiClient.invokeAPI(
+      apiPath,
+      'GET',
+      queryParams,
+      postBody,
+      headerParams,
+      formParams,
+      contentTypes.isEmpty ? null : contentTypes.first,
+    );
+  }
+
+  /// Retrieve assets by device ID
+  ///
+  /// This property was deprecated in v2.0.0. Get all asset of a device that are in the database, ID only.
+  ///
+  /// Parameters:
+  ///
+  /// * [String] deviceId (required):
+  Future<List<String>?> getAllUserAssetsByDeviceId(String deviceId,) async {
+    final response = await getAllUserAssetsByDeviceIdWithHttpInfo(deviceId,);
+    if (response.statusCode >= HttpStatus.badRequest) {
+      throw ApiException(response.statusCode, await _decodeBodyBytes(response));
+    }
+    // When a remote server returns no body with a status of 204, we shall not decode it.
+    // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
+    // FormatException when trying to decode an empty string.
+    if (response.body.isNotEmpty && response.statusCode != HttpStatus.noContent) {
+      final responseBody = await _decodeBodyBytes(response);
+      return (await apiClient.deserializeAsync(responseBody, 'List<String>') as List)
+        .cast<String>()
+        .toList(growable: false);
+
+    }
+    return null;
+  }
+
+  /// Get delta sync for user
+  ///
+  /// This property was deprecated in v2.0.0. Retrieve changed assets since the last sync for the authenticated user.
+  ///
+  /// Note: This method returns the HTTP [Response].
+  ///
+  /// Parameters:
+  ///
+  /// * [AssetDeltaSyncDto] assetDeltaSyncDto (required):
+  Future<Response> getDeltaSyncWithHttpInfo(AssetDeltaSyncDto assetDeltaSyncDto,) async {
+    // ignore: prefer_const_declarations
+    final apiPath = r'/sync/delta-sync';
+
+    // ignore: prefer_final_locals
+    Object? postBody = assetDeltaSyncDto;
+
+    final queryParams = <QueryParam>[];
+    final headerParams = <String, String>{};
+    final formParams = <String, String>{};
+
+    const contentTypes = <String>['application/json'];
+
+
+    return apiClient.invokeAPI(
+      apiPath,
+      'POST',
+      queryParams,
+      postBody,
+      headerParams,
+      formParams,
+      contentTypes.isEmpty ? null : contentTypes.first,
+    );
+  }
+
+  /// Get delta sync for user
+  ///
+  /// This property was deprecated in v2.0.0. Retrieve changed assets since the last sync for the authenticated user.
+  ///
+  /// Parameters:
+  ///
+  /// * [AssetDeltaSyncDto] assetDeltaSyncDto (required):
+  Future<AssetDeltaSyncResponseDto?> getDeltaSync(AssetDeltaSyncDto assetDeltaSyncDto,) async {
+    final response = await getDeltaSyncWithHttpInfo(assetDeltaSyncDto,);
+    if (response.statusCode >= HttpStatus.badRequest) {
+      throw ApiException(response.statusCode, await _decodeBodyBytes(response));
+    }
+    // When a remote server returns no body with a status of 204, we shall not decode it.
+    // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
+    // FormatException when trying to decode an empty string.
+    if (response.body.isNotEmpty && response.statusCode != HttpStatus.noContent) {
+      return await apiClient.deserializeAsync(await _decodeBodyBytes(response), 'AssetDeltaSyncResponseDto',) as AssetDeltaSyncResponseDto;
+    
+    }
+    return null;
+  }
+
+  /// Get full sync for user
+  ///
+  /// This property was deprecated in v2.0.0. Retrieve all assets for a full synchronization for the authenticated user.
+  ///
+  /// Note: This method returns the HTTP [Response].
+  ///
+  /// Parameters:
+  ///
+  /// * [AssetFullSyncDto] assetFullSyncDto (required):
+  Future<Response> getFullSyncForUserWithHttpInfo(AssetFullSyncDto assetFullSyncDto,) async {
+    // ignore: prefer_const_declarations
+    final apiPath = r'/sync/full-sync';
+
+    // ignore: prefer_final_locals
+    Object? postBody = assetFullSyncDto;
+
+    final queryParams = <QueryParam>[];
+    final headerParams = <String, String>{};
+    final formParams = <String, String>{};
+
+    const contentTypes = <String>['application/json'];
+
+
+    return apiClient.invokeAPI(
+      apiPath,
+      'POST',
+      queryParams,
+      postBody,
+      headerParams,
+      formParams,
+      contentTypes.isEmpty ? null : contentTypes.first,
+    );
+  }
+
+  /// Get full sync for user
+  ///
+  /// This property was deprecated in v2.0.0. Retrieve all assets for a full synchronization for the authenticated user.
+  ///
+  /// Parameters:
+  ///
+  /// * [AssetFullSyncDto] assetFullSyncDto (required):
+  Future<List<AssetResponseDto>?> getFullSyncForUser(AssetFullSyncDto assetFullSyncDto,) async {
+    final response = await getFullSyncForUserWithHttpInfo(assetFullSyncDto,);
+    if (response.statusCode >= HttpStatus.badRequest) {
+      throw ApiException(response.statusCode, await _decodeBodyBytes(response));
+    }
+    // When a remote server returns no body with a status of 204, we shall not decode it.
+    // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
+    // FormatException when trying to decode an empty string.
+    if (response.body.isNotEmpty && response.statusCode != HttpStatus.noContent) {
+      final responseBody = await _decodeBodyBytes(response);
+      return (await apiClient.deserializeAsync(responseBody, 'List<AssetResponseDto>') as List)
+        .cast<AssetResponseDto>()
+        .toList(growable: false);
+
+    }
+    return null;
+  }
+
+  /// Get random assets
+  ///
+  /// This property was deprecated in v1.116.0. Retrieve a specified number of random assets for the authenticated user.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -105,7 +286,9 @@ class DeprecatedApi {
     );
   }
 
-  /// This property was deprecated in v1.116.0. This endpoint requires the `asset.read` permission.
+  /// Get random assets
+  ///
+  /// This property was deprecated in v1.116.0. Retrieve a specified number of random assets for the authenticated user.
   ///
   /// Parameters:
   ///
@@ -128,9 +311,9 @@ class DeprecatedApi {
     return null;
   }
 
-  /// Replace the asset with new file, without changing its id
+  /// Replace asset
   ///
-  /// This property was deprecated in v1.142.0. Replace the asset with new file, without changing its id. This endpoint requires the `asset.replace` permission.
+  /// This property was deprecated in v1.142.0. Replace the asset with new file, without changing its id.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -222,9 +405,9 @@ class DeprecatedApi {
     );
   }
 
-  /// Replace the asset with new file, without changing its id
+  /// Replace asset
   ///
-  /// This property was deprecated in v1.142.0. Replace the asset with new file, without changing its id. This endpoint requires the `asset.replace` permission.
+  /// This property was deprecated in v1.142.0. Replace the asset with new file, without changing its id.
   ///
   /// Parameters:
   ///
diff --git a/mobile/openapi/lib/api/download_api.dart b/mobile/openapi/lib/api/download_api.dart
index 62c97bfc9c..5245622753 100644
--- a/mobile/openapi/lib/api/download_api.dart
+++ b/mobile/openapi/lib/api/download_api.dart
@@ -16,7 +16,9 @@ class DownloadApi {
 
   final ApiClient apiClient;
 
-  /// This endpoint requires the `asset.download` permission.
+  /// Download asset archive
+  ///
+  /// Download a ZIP archive containing the specified assets. The assets must have been previously requested via the \"getDownloadInfo\" endpoint.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -59,7 +61,9 @@ class DownloadApi {
     );
   }
 
-  /// This endpoint requires the `asset.download` permission.
+  /// Download asset archive
+  ///
+  /// Download a ZIP archive containing the specified assets. The assets must have been previously requested via the \"getDownloadInfo\" endpoint.
   ///
   /// Parameters:
   ///
@@ -83,7 +87,9 @@ class DownloadApi {
     return null;
   }
 
-  /// This endpoint requires the `asset.download` permission.
+  /// Retrieve download information
+  ///
+  /// Retrieve information about how to request a download for the specified assets or album. The response includes groups of assets that can be downloaded together.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -126,7 +132,9 @@ class DownloadApi {
     );
   }
 
-  /// This endpoint requires the `asset.download` permission.
+  /// Retrieve download information
+  ///
+  /// Retrieve information about how to request a download for the specified assets or album. The response includes groups of assets that can be downloaded together.
   ///
   /// Parameters:
   ///
diff --git a/mobile/openapi/lib/api/duplicates_api.dart b/mobile/openapi/lib/api/duplicates_api.dart
index 9df6e46586..7fa7b368b5 100644
--- a/mobile/openapi/lib/api/duplicates_api.dart
+++ b/mobile/openapi/lib/api/duplicates_api.dart
@@ -16,7 +16,9 @@ class DuplicatesApi {
 
   final ApiClient apiClient;
 
-  /// This endpoint requires the `duplicate.delete` permission.
+  /// Delete a duplicate
+  ///
+  /// Delete a single duplicate asset specified by its ID.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -49,7 +51,9 @@ class DuplicatesApi {
     );
   }
 
-  /// This endpoint requires the `duplicate.delete` permission.
+  /// Delete a duplicate
+  ///
+  /// Delete a single duplicate asset specified by its ID.
   ///
   /// Parameters:
   ///
@@ -61,7 +65,9 @@ class DuplicatesApi {
     }
   }
 
-  /// This endpoint requires the `duplicate.delete` permission.
+  /// Delete duplicates
+  ///
+  /// Delete multiple duplicate assets specified by their IDs.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -93,7 +99,9 @@ class DuplicatesApi {
     );
   }
 
-  /// This endpoint requires the `duplicate.delete` permission.
+  /// Delete duplicates
+  ///
+  /// Delete multiple duplicate assets specified by their IDs.
   ///
   /// Parameters:
   ///
@@ -105,7 +113,9 @@ class DuplicatesApi {
     }
   }
 
-  /// This endpoint requires the `duplicate.read` permission.
+  /// Retrieve duplicates
+  ///
+  /// Retrieve a list of duplicate assets available to the authenticated user.
   ///
   /// Note: This method returns the HTTP [Response].
   Future<Response> getAssetDuplicatesWithHttpInfo() async {
@@ -133,7 +143,9 @@ class DuplicatesApi {
     );
   }
 
-  /// This endpoint requires the `duplicate.read` permission.
+  /// Retrieve duplicates
+  ///
+  /// Retrieve a list of duplicate assets available to the authenticated user.
   Future<List<DuplicateResponseDto>?> getAssetDuplicates() async {
     final response = await getAssetDuplicatesWithHttpInfo();
     if (response.statusCode >= HttpStatus.badRequest) {
diff --git a/mobile/openapi/lib/api/faces_api.dart b/mobile/openapi/lib/api/faces_api.dart
index 2f8e6be60d..1d2e7401e8 100644
--- a/mobile/openapi/lib/api/faces_api.dart
+++ b/mobile/openapi/lib/api/faces_api.dart
@@ -16,7 +16,9 @@ class FacesApi {
 
   final ApiClient apiClient;
 
-  /// This endpoint requires the `face.create` permission.
+  /// Create a face
+  ///
+  /// Create a new face that has not been discovered by facial recognition. The content of the bounding box is considered a face.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -48,7 +50,9 @@ class FacesApi {
     );
   }
 
-  /// This endpoint requires the `face.create` permission.
+  /// Create a face
+  ///
+  /// Create a new face that has not been discovered by facial recognition. The content of the bounding box is considered a face.
   ///
   /// Parameters:
   ///
@@ -60,7 +64,9 @@ class FacesApi {
     }
   }
 
-  /// This endpoint requires the `face.delete` permission.
+  /// Delete a face
+  ///
+  /// Delete a face identified by the id. Optionally can be force deleted.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -95,7 +101,9 @@ class FacesApi {
     );
   }
 
-  /// This endpoint requires the `face.delete` permission.
+  /// Delete a face
+  ///
+  /// Delete a face identified by the id. Optionally can be force deleted.
   ///
   /// Parameters:
   ///
@@ -109,7 +117,9 @@ class FacesApi {
     }
   }
 
-  /// This endpoint requires the `face.read` permission.
+  /// Retrieve faces for asset
+  ///
+  /// Retrieve all faces belonging to an asset.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -143,7 +153,9 @@ class FacesApi {
     );
   }
 
-  /// This endpoint requires the `face.read` permission.
+  /// Retrieve faces for asset
+  ///
+  /// Retrieve all faces belonging to an asset.
   ///
   /// Parameters:
   ///
@@ -166,7 +178,9 @@ class FacesApi {
     return null;
   }
 
-  /// This endpoint requires the `face.update` permission.
+  /// Re-assign a face to another person
+  ///
+  /// Re-assign the face provided in the body to the person identified by the id in the path parameter.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -201,7 +215,9 @@ class FacesApi {
     );
   }
 
-  /// This endpoint requires the `face.update` permission.
+  /// Re-assign a face to another person
+  ///
+  /// Re-assign the face provided in the body to the person identified by the id in the path parameter.
   ///
   /// Parameters:
   ///
diff --git a/mobile/openapi/lib/api/jobs_api.dart b/mobile/openapi/lib/api/jobs_api.dart
index 4c935828a0..e783f93c7c 100644
--- a/mobile/openapi/lib/api/jobs_api.dart
+++ b/mobile/openapi/lib/api/jobs_api.dart
@@ -16,7 +16,9 @@ class JobsApi {
 
   final ApiClient apiClient;
 
-  /// This endpoint is an admin-only route, and requires the `job.create` permission.
+  /// Create a manual job
+  ///
+  /// Run a specific job. Most jobs are queued automatically, but this endpoint allows for manual creation of a handful of jobs, including various cleanup tasks, as well as creating a new database backup.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -48,7 +50,9 @@ class JobsApi {
     );
   }
 
-  /// This endpoint is an admin-only route, and requires the `job.create` permission.
+  /// Create a manual job
+  ///
+  /// Run a specific job. Most jobs are queued automatically, but this endpoint allows for manual creation of a handful of jobs, including various cleanup tasks, as well as creating a new database backup.
   ///
   /// Parameters:
   ///
@@ -60,7 +64,9 @@ class JobsApi {
     }
   }
 
-  /// This endpoint is an admin-only route, and requires the `job.read` permission.
+  /// Retrieve queue counts and status
+  ///
+  /// Retrieve the counts of the current queue, as well as the current status.
   ///
   /// Note: This method returns the HTTP [Response].
   Future<Response> getAllJobsStatusWithHttpInfo() async {
@@ -88,7 +94,9 @@ class JobsApi {
     );
   }
 
-  /// This endpoint is an admin-only route, and requires the `job.read` permission.
+  /// Retrieve queue counts and status
+  ///
+  /// Retrieve the counts of the current queue, as well as the current status.
   Future<AllJobStatusResponseDto?> getAllJobsStatus() async {
     final response = await getAllJobsStatusWithHttpInfo();
     if (response.statusCode >= HttpStatus.badRequest) {
@@ -104,7 +112,9 @@ class JobsApi {
     return null;
   }
 
-  /// This endpoint is an admin-only route, and requires the `job.create` permission.
+  /// Run jobs
+  ///
+  /// Queue all assets for a specific job type. Defaults to only queueing assets that have not yet been processed, but the force command can be used to re-process all assets.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -139,7 +149,9 @@ class JobsApi {
     );
   }
 
-  /// This endpoint is an admin-only route, and requires the `job.create` permission.
+  /// Run jobs
+  ///
+  /// Queue all assets for a specific job type. Defaults to only queueing assets that have not yet been processed, but the force command can be used to re-process all assets.
   ///
   /// Parameters:
   ///
diff --git a/mobile/openapi/lib/api/libraries_api.dart b/mobile/openapi/lib/api/libraries_api.dart
index 9258f8e3eb..ca59f823fe 100644
--- a/mobile/openapi/lib/api/libraries_api.dart
+++ b/mobile/openapi/lib/api/libraries_api.dart
@@ -16,7 +16,9 @@ class LibrariesApi {
 
   final ApiClient apiClient;
 
-  /// This endpoint is an admin-only route, and requires the `library.create` permission.
+  /// Create a library
+  ///
+  /// Create a new external library.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -48,7 +50,9 @@ class LibrariesApi {
     );
   }
 
-  /// This endpoint is an admin-only route, and requires the `library.create` permission.
+  /// Create a library
+  ///
+  /// Create a new external library.
   ///
   /// Parameters:
   ///
@@ -68,7 +72,9 @@ class LibrariesApi {
     return null;
   }
 
-  /// This endpoint is an admin-only route, and requires the `library.delete` permission.
+  /// Delete a library
+  ///
+  /// Delete an external library by its ID.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -101,7 +107,9 @@ class LibrariesApi {
     );
   }
 
-  /// This endpoint is an admin-only route, and requires the `library.delete` permission.
+  /// Delete a library
+  ///
+  /// Delete an external library by its ID.
   ///
   /// Parameters:
   ///
@@ -113,7 +121,9 @@ class LibrariesApi {
     }
   }
 
-  /// This endpoint is an admin-only route, and requires the `library.read` permission.
+  /// Retrieve libraries
+  ///
+  /// Retrieve a list of external libraries.
   ///
   /// Note: This method returns the HTTP [Response].
   Future<Response> getAllLibrariesWithHttpInfo() async {
@@ -141,7 +151,9 @@ class LibrariesApi {
     );
   }
 
-  /// This endpoint is an admin-only route, and requires the `library.read` permission.
+  /// Retrieve libraries
+  ///
+  /// Retrieve a list of external libraries.
   Future<List<LibraryResponseDto>?> getAllLibraries() async {
     final response = await getAllLibrariesWithHttpInfo();
     if (response.statusCode >= HttpStatus.badRequest) {
@@ -160,7 +172,9 @@ class LibrariesApi {
     return null;
   }
 
-  /// This endpoint is an admin-only route, and requires the `library.read` permission.
+  /// Retrieve a library
+  ///
+  /// Retrieve an external library by its ID.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -193,7 +207,9 @@ class LibrariesApi {
     );
   }
 
-  /// This endpoint is an admin-only route, and requires the `library.read` permission.
+  /// Retrieve a library
+  ///
+  /// Retrieve an external library by its ID.
   ///
   /// Parameters:
   ///
@@ -213,7 +229,9 @@ class LibrariesApi {
     return null;
   }
 
-  /// This endpoint is an admin-only route, and requires the `library.statistics` permission.
+  /// Retrieve library statistics
+  ///
+  /// Retrieve statistics for a specific external library, including number of videos, images, and storage usage.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -246,7 +264,9 @@ class LibrariesApi {
     );
   }
 
-  /// This endpoint is an admin-only route, and requires the `library.statistics` permission.
+  /// Retrieve library statistics
+  ///
+  /// Retrieve statistics for a specific external library, including number of videos, images, and storage usage.
   ///
   /// Parameters:
   ///
@@ -266,7 +286,9 @@ class LibrariesApi {
     return null;
   }
 
-  /// This endpoint is an admin-only route, and requires the `library.update` permission.
+  /// Scan a library
+  ///
+  /// Queue a scan for the external library to find and import new assets.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -299,7 +321,9 @@ class LibrariesApi {
     );
   }
 
-  /// This endpoint is an admin-only route, and requires the `library.update` permission.
+  /// Scan a library
+  ///
+  /// Queue a scan for the external library to find and import new assets.
   ///
   /// Parameters:
   ///
@@ -311,7 +335,9 @@ class LibrariesApi {
     }
   }
 
-  /// This endpoint is an admin-only route, and requires the `library.update` permission.
+  /// Update a library
+  ///
+  /// Update an existing external library.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -346,7 +372,9 @@ class LibrariesApi {
     );
   }
 
-  /// This endpoint is an admin-only route, and requires the `library.update` permission.
+  /// Update a library
+  ///
+  /// Update an existing external library.
   ///
   /// Parameters:
   ///
@@ -368,7 +396,12 @@ class LibrariesApi {
     return null;
   }
 
-  /// Performs an HTTP 'POST /libraries/{id}/validate' operation and returns the [Response].
+  /// Validate library settings
+  ///
+  /// Validate the settings of an external library.
+  ///
+  /// Note: This method returns the HTTP [Response].
+  ///
   /// Parameters:
   ///
   /// * [String] id (required):
@@ -400,6 +433,10 @@ class LibrariesApi {
     );
   }
 
+  /// Validate library settings
+  ///
+  /// Validate the settings of an external library.
+  ///
   /// Parameters:
   ///
   /// * [String] id (required):
diff --git a/mobile/openapi/lib/api/map_api.dart b/mobile/openapi/lib/api/map_api.dart
index da4f3dffcc..6302ac304e 100644
--- a/mobile/openapi/lib/api/map_api.dart
+++ b/mobile/openapi/lib/api/map_api.dart
@@ -16,21 +16,26 @@ class MapApi {
 
   final ApiClient apiClient;
 
-  /// Performs an HTTP 'GET /map/markers' operation and returns the [Response].
+  /// Retrieve map markers
+  ///
+  /// Retrieve a list of latitude and longitude coordinates for every asset with location data.
+  ///
+  /// Note: This method returns the HTTP [Response].
+  ///
   /// Parameters:
   ///
-  /// * [bool] isArchived:
-  ///
-  /// * [bool] isFavorite:
-  ///
   /// * [DateTime] fileCreatedAfter:
   ///
   /// * [DateTime] fileCreatedBefore:
   ///
+  /// * [bool] isArchived:
+  ///
+  /// * [bool] isFavorite:
+  ///
   /// * [bool] withPartners:
   ///
   /// * [bool] withSharedAlbums:
-  Future<Response> getMapMarkersWithHttpInfo({ bool? isArchived, bool? isFavorite, DateTime? fileCreatedAfter, DateTime? fileCreatedBefore, bool? withPartners, bool? withSharedAlbums, }) async {
+  Future<Response> getMapMarkersWithHttpInfo({ DateTime? fileCreatedAfter, DateTime? fileCreatedBefore, bool? isArchived, bool? isFavorite, bool? withPartners, bool? withSharedAlbums, }) async {
     // ignore: prefer_const_declarations
     final apiPath = r'/map/markers';
 
@@ -41,18 +46,18 @@ class MapApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
-    if (isArchived != null) {
-      queryParams.addAll(_queryParams('', 'isArchived', isArchived));
-    }
-    if (isFavorite != null) {
-      queryParams.addAll(_queryParams('', 'isFavorite', isFavorite));
-    }
     if (fileCreatedAfter != null) {
       queryParams.addAll(_queryParams('', 'fileCreatedAfter', fileCreatedAfter));
     }
     if (fileCreatedBefore != null) {
       queryParams.addAll(_queryParams('', 'fileCreatedBefore', fileCreatedBefore));
     }
+    if (isArchived != null) {
+      queryParams.addAll(_queryParams('', 'isArchived', isArchived));
+    }
+    if (isFavorite != null) {
+      queryParams.addAll(_queryParams('', 'isFavorite', isFavorite));
+    }
     if (withPartners != null) {
       queryParams.addAll(_queryParams('', 'withPartners', withPartners));
     }
@@ -74,21 +79,25 @@ class MapApi {
     );
   }
 
+  /// Retrieve map markers
+  ///
+  /// Retrieve a list of latitude and longitude coordinates for every asset with location data.
+  ///
   /// Parameters:
   ///
-  /// * [bool] isArchived:
-  ///
-  /// * [bool] isFavorite:
-  ///
   /// * [DateTime] fileCreatedAfter:
   ///
   /// * [DateTime] fileCreatedBefore:
   ///
+  /// * [bool] isArchived:
+  ///
+  /// * [bool] isFavorite:
+  ///
   /// * [bool] withPartners:
   ///
   /// * [bool] withSharedAlbums:
-  Future<List<MapMarkerResponseDto>?> getMapMarkers({ bool? isArchived, bool? isFavorite, DateTime? fileCreatedAfter, DateTime? fileCreatedBefore, bool? withPartners, bool? withSharedAlbums, }) async {
-    final response = await getMapMarkersWithHttpInfo( isArchived: isArchived, isFavorite: isFavorite, fileCreatedAfter: fileCreatedAfter, fileCreatedBefore: fileCreatedBefore, withPartners: withPartners, withSharedAlbums: withSharedAlbums, );
+  Future<List<MapMarkerResponseDto>?> getMapMarkers({ DateTime? fileCreatedAfter, DateTime? fileCreatedBefore, bool? isArchived, bool? isFavorite, bool? withPartners, bool? withSharedAlbums, }) async {
+    final response = await getMapMarkersWithHttpInfo( fileCreatedAfter: fileCreatedAfter, fileCreatedBefore: fileCreatedBefore, isArchived: isArchived, isFavorite: isFavorite, withPartners: withPartners, withSharedAlbums: withSharedAlbums, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -105,7 +114,12 @@ class MapApi {
     return null;
   }
 
-  /// Performs an HTTP 'GET /map/reverse-geocode' operation and returns the [Response].
+  /// Reverse geocode coordinates
+  ///
+  /// Retrieve location information (e.g., city, country) for given latitude and longitude coordinates.
+  ///
+  /// Note: This method returns the HTTP [Response].
+  ///
   /// Parameters:
   ///
   /// * [double] lat (required):
@@ -139,6 +153,10 @@ class MapApi {
     );
   }
 
+  /// Reverse geocode coordinates
+  ///
+  /// Retrieve location information (e.g., city, country) for given latitude and longitude coordinates.
+  ///
   /// Parameters:
   ///
   /// * [double] lat (required):
diff --git a/mobile/openapi/lib/api/memories_api.dart b/mobile/openapi/lib/api/memories_api.dart
index 9916029e0b..314595e84e 100644
--- a/mobile/openapi/lib/api/memories_api.dart
+++ b/mobile/openapi/lib/api/memories_api.dart
@@ -16,7 +16,9 @@ class MemoriesApi {
 
   final ApiClient apiClient;
 
-  /// This endpoint requires the `memoryAsset.create` permission.
+  /// Add assets to a memory
+  ///
+  /// Add a list of asset IDs to a specific memory.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -51,7 +53,9 @@ class MemoriesApi {
     );
   }
 
-  /// This endpoint requires the `memoryAsset.create` permission.
+  /// Add assets to a memory
+  ///
+  /// Add a list of asset IDs to a specific memory.
   ///
   /// Parameters:
   ///
@@ -76,7 +80,9 @@ class MemoriesApi {
     return null;
   }
 
-  /// This endpoint requires the `memory.create` permission.
+  /// Create a memory
+  ///
+  /// Create a new memory by providing a name, description, and a list of asset IDs to include in the memory.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -108,7 +114,9 @@ class MemoriesApi {
     );
   }
 
-  /// This endpoint requires the `memory.create` permission.
+  /// Create a memory
+  ///
+  /// Create a new memory by providing a name, description, and a list of asset IDs to include in the memory.
   ///
   /// Parameters:
   ///
@@ -128,7 +136,9 @@ class MemoriesApi {
     return null;
   }
 
-  /// This endpoint requires the `memory.delete` permission.
+  /// Delete a memory
+  ///
+  /// Delete a specific memory by its ID.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -161,7 +171,9 @@ class MemoriesApi {
     );
   }
 
-  /// This endpoint requires the `memory.delete` permission.
+  /// Delete a memory
+  ///
+  /// Delete a specific memory by its ID.
   ///
   /// Parameters:
   ///
@@ -173,7 +185,9 @@ class MemoriesApi {
     }
   }
 
-  /// This endpoint requires the `memory.read` permission.
+  /// Retrieve a memory
+  ///
+  /// Retrieve a specific memory by its ID.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -206,7 +220,9 @@ class MemoriesApi {
     );
   }
 
-  /// This endpoint requires the `memory.read` permission.
+  /// Retrieve a memory
+  ///
+  /// Retrieve a specific memory by its ID.
   ///
   /// Parameters:
   ///
@@ -226,7 +242,9 @@ class MemoriesApi {
     return null;
   }
 
-  /// This endpoint requires the `memory.statistics` permission.
+  /// Retrieve memories statistics
+  ///
+  /// Retrieve statistics about memories, such as total count and other relevant metrics.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -288,7 +306,9 @@ class MemoriesApi {
     );
   }
 
-  /// This endpoint requires the `memory.statistics` permission.
+  /// Retrieve memories statistics
+  ///
+  /// Retrieve statistics about memories, such as total count and other relevant metrics.
   ///
   /// Parameters:
   ///
@@ -319,7 +339,9 @@ class MemoriesApi {
     return null;
   }
 
-  /// This endpoint requires the `memoryAsset.delete` permission.
+  /// Remove assets from a memory
+  ///
+  /// Remove a list of asset IDs from a specific memory.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -354,7 +376,9 @@ class MemoriesApi {
     );
   }
 
-  /// This endpoint requires the `memoryAsset.delete` permission.
+  /// Remove assets from a memory
+  ///
+  /// Remove a list of asset IDs from a specific memory.
   ///
   /// Parameters:
   ///
@@ -379,7 +403,9 @@ class MemoriesApi {
     return null;
   }
 
-  /// This endpoint requires the `memory.read` permission.
+  /// Retrieve memories
+  ///
+  /// Retrieve a list of memories. Memories are sorted descending by creation date by default, although they can also be sorted in ascending order, or randomly.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -441,7 +467,9 @@ class MemoriesApi {
     );
   }
 
-  /// This endpoint requires the `memory.read` permission.
+  /// Retrieve memories
+  ///
+  /// Retrieve a list of memories. Memories are sorted descending by creation date by default, although they can also be sorted in ascending order, or randomly.
   ///
   /// Parameters:
   ///
@@ -475,7 +503,9 @@ class MemoriesApi {
     return null;
   }
 
-  /// This endpoint requires the `memory.update` permission.
+  /// Update a memory
+  ///
+  /// Update an existing memory by its ID.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -510,7 +540,9 @@ class MemoriesApi {
     );
   }
 
-  /// This endpoint requires the `memory.update` permission.
+  /// Update a memory
+  ///
+  /// Update an existing memory by its ID.
   ///
   /// Parameters:
   ///
diff --git a/mobile/openapi/lib/api/notifications_admin_api.dart b/mobile/openapi/lib/api/notifications_admin_api.dart
index 409683a950..7821553d30 100644
--- a/mobile/openapi/lib/api/notifications_admin_api.dart
+++ b/mobile/openapi/lib/api/notifications_admin_api.dart
@@ -16,7 +16,12 @@ class NotificationsAdminApi {
 
   final ApiClient apiClient;
 
-  /// Performs an HTTP 'POST /admin/notifications' operation and returns the [Response].
+  /// Create a notification
+  ///
+  /// Create a new notification for a specific user.
+  ///
+  /// Note: This method returns the HTTP [Response].
+  ///
   /// Parameters:
   ///
   /// * [NotificationCreateDto] notificationCreateDto (required):
@@ -45,6 +50,10 @@ class NotificationsAdminApi {
     );
   }
 
+  /// Create a notification
+  ///
+  /// Create a new notification for a specific user.
+  ///
   /// Parameters:
   ///
   /// * [NotificationCreateDto] notificationCreateDto (required):
@@ -63,7 +72,12 @@ class NotificationsAdminApi {
     return null;
   }
 
-  /// Performs an HTTP 'POST /admin/notifications/templates/{name}' operation and returns the [Response].
+  /// Render email template
+  ///
+  /// Retrieve a preview of the provided email template.
+  ///
+  /// Note: This method returns the HTTP [Response].
+  ///
   /// Parameters:
   ///
   /// * [String] name (required):
@@ -95,6 +109,10 @@ class NotificationsAdminApi {
     );
   }
 
+  /// Render email template
+  ///
+  /// Retrieve a preview of the provided email template.
+  ///
   /// Parameters:
   ///
   /// * [String] name (required):
@@ -115,7 +133,12 @@ class NotificationsAdminApi {
     return null;
   }
 
-  /// Performs an HTTP 'POST /admin/notifications/test-email' operation and returns the [Response].
+  /// Send test email
+  ///
+  /// Send a test email using the provided SMTP configuration.
+  ///
+  /// Note: This method returns the HTTP [Response].
+  ///
   /// Parameters:
   ///
   /// * [SystemConfigSmtpDto] systemConfigSmtpDto (required):
@@ -144,6 +167,10 @@ class NotificationsAdminApi {
     );
   }
 
+  /// Send test email
+  ///
+  /// Send a test email using the provided SMTP configuration.
+  ///
   /// Parameters:
   ///
   /// * [SystemConfigSmtpDto] systemConfigSmtpDto (required):
diff --git a/mobile/openapi/lib/api/notifications_api.dart b/mobile/openapi/lib/api/notifications_api.dart
index 1d276efaaf..2de59a0a76 100644
--- a/mobile/openapi/lib/api/notifications_api.dart
+++ b/mobile/openapi/lib/api/notifications_api.dart
@@ -16,7 +16,9 @@ class NotificationsApi {
 
   final ApiClient apiClient;
 
-  /// This endpoint requires the `notification.delete` permission.
+  /// Delete a notification
+  ///
+  /// Delete a specific notification.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -49,7 +51,9 @@ class NotificationsApi {
     );
   }
 
-  /// This endpoint requires the `notification.delete` permission.
+  /// Delete a notification
+  ///
+  /// Delete a specific notification.
   ///
   /// Parameters:
   ///
@@ -61,7 +65,9 @@ class NotificationsApi {
     }
   }
 
-  /// This endpoint requires the `notification.delete` permission.
+  /// Delete notifications
+  ///
+  /// Delete a list of notifications at once.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -93,7 +99,9 @@ class NotificationsApi {
     );
   }
 
-  /// This endpoint requires the `notification.delete` permission.
+  /// Delete notifications
+  ///
+  /// Delete a list of notifications at once.
   ///
   /// Parameters:
   ///
@@ -105,7 +113,9 @@ class NotificationsApi {
     }
   }
 
-  /// This endpoint requires the `notification.read` permission.
+  /// Get a notification
+  ///
+  /// Retrieve a specific notification identified by id.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -138,7 +148,9 @@ class NotificationsApi {
     );
   }
 
-  /// This endpoint requires the `notification.read` permission.
+  /// Get a notification
+  ///
+  /// Retrieve a specific notification identified by id.
   ///
   /// Parameters:
   ///
@@ -158,7 +170,9 @@ class NotificationsApi {
     return null;
   }
 
-  /// This endpoint requires the `notification.read` permission.
+  /// Retrieve notifications
+  ///
+  /// Retrieve a list of notifications.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -209,7 +223,9 @@ class NotificationsApi {
     );
   }
 
-  /// This endpoint requires the `notification.read` permission.
+  /// Retrieve notifications
+  ///
+  /// Retrieve a list of notifications.
   ///
   /// Parameters:
   ///
@@ -238,7 +254,9 @@ class NotificationsApi {
     return null;
   }
 
-  /// This endpoint requires the `notification.update` permission.
+  /// Update a notification
+  ///
+  /// Update a specific notification to set its read status.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -273,7 +291,9 @@ class NotificationsApi {
     );
   }
 
-  /// This endpoint requires the `notification.update` permission.
+  /// Update a notification
+  ///
+  /// Update a specific notification to set its read status.
   ///
   /// Parameters:
   ///
@@ -295,7 +315,9 @@ class NotificationsApi {
     return null;
   }
 
-  /// This endpoint requires the `notification.update` permission.
+  /// Update notifications
+  ///
+  /// Update a list of notifications. Allows to bulk-set the read status of notifications.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -327,7 +349,9 @@ class NotificationsApi {
     );
   }
 
-  /// This endpoint requires the `notification.update` permission.
+  /// Update notifications
+  ///
+  /// Update a list of notifications. Allows to bulk-set the read status of notifications.
   ///
   /// Parameters:
   ///
diff --git a/mobile/openapi/lib/api/o_auth_api.dart b/mobile/openapi/lib/api/o_auth_api.dart
deleted file mode 100644
index 9f16e37c70..0000000000
--- a/mobile/openapi/lib/api/o_auth_api.dart
+++ /dev/null
@@ -1,233 +0,0 @@
-//
-// AUTO-GENERATED FILE, DO NOT MODIFY!
-//
-// @dart=2.18
-
-// ignore_for_file: unused_element, unused_import
-// ignore_for_file: always_put_required_named_parameters_first
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: lines_longer_than_80_chars
-
-part of openapi.api;
-
-
-class OAuthApi {
-  OAuthApi([ApiClient? apiClient]) : apiClient = apiClient ?? defaultApiClient;
-
-  final ApiClient apiClient;
-
-  /// Performs an HTTP 'POST /oauth/callback' operation and returns the [Response].
-  /// Parameters:
-  ///
-  /// * [OAuthCallbackDto] oAuthCallbackDto (required):
-  Future<Response> finishOAuthWithHttpInfo(OAuthCallbackDto oAuthCallbackDto,) async {
-    // ignore: prefer_const_declarations
-    final apiPath = r'/oauth/callback';
-
-    // ignore: prefer_final_locals
-    Object? postBody = oAuthCallbackDto;
-
-    final queryParams = <QueryParam>[];
-    final headerParams = <String, String>{};
-    final formParams = <String, String>{};
-
-    const contentTypes = <String>['application/json'];
-
-
-    return apiClient.invokeAPI(
-      apiPath,
-      'POST',
-      queryParams,
-      postBody,
-      headerParams,
-      formParams,
-      contentTypes.isEmpty ? null : contentTypes.first,
-    );
-  }
-
-  /// Parameters:
-  ///
-  /// * [OAuthCallbackDto] oAuthCallbackDto (required):
-  Future<LoginResponseDto?> finishOAuth(OAuthCallbackDto oAuthCallbackDto,) async {
-    final response = await finishOAuthWithHttpInfo(oAuthCallbackDto,);
-    if (response.statusCode >= HttpStatus.badRequest) {
-      throw ApiException(response.statusCode, await _decodeBodyBytes(response));
-    }
-    // When a remote server returns no body with a status of 204, we shall not decode it.
-    // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
-    // FormatException when trying to decode an empty string.
-    if (response.body.isNotEmpty && response.statusCode != HttpStatus.noContent) {
-      return await apiClient.deserializeAsync(await _decodeBodyBytes(response), 'LoginResponseDto',) as LoginResponseDto;
-    
-    }
-    return null;
-  }
-
-  /// Performs an HTTP 'POST /oauth/link' operation and returns the [Response].
-  /// Parameters:
-  ///
-  /// * [OAuthCallbackDto] oAuthCallbackDto (required):
-  Future<Response> linkOAuthAccountWithHttpInfo(OAuthCallbackDto oAuthCallbackDto,) async {
-    // ignore: prefer_const_declarations
-    final apiPath = r'/oauth/link';
-
-    // ignore: prefer_final_locals
-    Object? postBody = oAuthCallbackDto;
-
-    final queryParams = <QueryParam>[];
-    final headerParams = <String, String>{};
-    final formParams = <String, String>{};
-
-    const contentTypes = <String>['application/json'];
-
-
-    return apiClient.invokeAPI(
-      apiPath,
-      'POST',
-      queryParams,
-      postBody,
-      headerParams,
-      formParams,
-      contentTypes.isEmpty ? null : contentTypes.first,
-    );
-  }
-
-  /// Parameters:
-  ///
-  /// * [OAuthCallbackDto] oAuthCallbackDto (required):
-  Future<UserAdminResponseDto?> linkOAuthAccount(OAuthCallbackDto oAuthCallbackDto,) async {
-    final response = await linkOAuthAccountWithHttpInfo(oAuthCallbackDto,);
-    if (response.statusCode >= HttpStatus.badRequest) {
-      throw ApiException(response.statusCode, await _decodeBodyBytes(response));
-    }
-    // When a remote server returns no body with a status of 204, we shall not decode it.
-    // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
-    // FormatException when trying to decode an empty string.
-    if (response.body.isNotEmpty && response.statusCode != HttpStatus.noContent) {
-      return await apiClient.deserializeAsync(await _decodeBodyBytes(response), 'UserAdminResponseDto',) as UserAdminResponseDto;
-    
-    }
-    return null;
-  }
-
-  /// Performs an HTTP 'GET /oauth/mobile-redirect' operation and returns the [Response].
-  Future<Response> redirectOAuthToMobileWithHttpInfo() async {
-    // ignore: prefer_const_declarations
-    final apiPath = r'/oauth/mobile-redirect';
-
-    // ignore: prefer_final_locals
-    Object? postBody;
-
-    final queryParams = <QueryParam>[];
-    final headerParams = <String, String>{};
-    final formParams = <String, String>{};
-
-    const contentTypes = <String>[];
-
-
-    return apiClient.invokeAPI(
-      apiPath,
-      'GET',
-      queryParams,
-      postBody,
-      headerParams,
-      formParams,
-      contentTypes.isEmpty ? null : contentTypes.first,
-    );
-  }
-
-  Future<void> redirectOAuthToMobile() async {
-    final response = await redirectOAuthToMobileWithHttpInfo();
-    if (response.statusCode >= HttpStatus.badRequest) {
-      throw ApiException(response.statusCode, await _decodeBodyBytes(response));
-    }
-  }
-
-  /// Performs an HTTP 'POST /oauth/authorize' operation and returns the [Response].
-  /// Parameters:
-  ///
-  /// * [OAuthConfigDto] oAuthConfigDto (required):
-  Future<Response> startOAuthWithHttpInfo(OAuthConfigDto oAuthConfigDto,) async {
-    // ignore: prefer_const_declarations
-    final apiPath = r'/oauth/authorize';
-
-    // ignore: prefer_final_locals
-    Object? postBody = oAuthConfigDto;
-
-    final queryParams = <QueryParam>[];
-    final headerParams = <String, String>{};
-    final formParams = <String, String>{};
-
-    const contentTypes = <String>['application/json'];
-
-
-    return apiClient.invokeAPI(
-      apiPath,
-      'POST',
-      queryParams,
-      postBody,
-      headerParams,
-      formParams,
-      contentTypes.isEmpty ? null : contentTypes.first,
-    );
-  }
-
-  /// Parameters:
-  ///
-  /// * [OAuthConfigDto] oAuthConfigDto (required):
-  Future<OAuthAuthorizeResponseDto?> startOAuth(OAuthConfigDto oAuthConfigDto,) async {
-    final response = await startOAuthWithHttpInfo(oAuthConfigDto,);
-    if (response.statusCode >= HttpStatus.badRequest) {
-      throw ApiException(response.statusCode, await _decodeBodyBytes(response));
-    }
-    // When a remote server returns no body with a status of 204, we shall not decode it.
-    // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
-    // FormatException when trying to decode an empty string.
-    if (response.body.isNotEmpty && response.statusCode != HttpStatus.noContent) {
-      return await apiClient.deserializeAsync(await _decodeBodyBytes(response), 'OAuthAuthorizeResponseDto',) as OAuthAuthorizeResponseDto;
-    
-    }
-    return null;
-  }
-
-  /// Performs an HTTP 'POST /oauth/unlink' operation and returns the [Response].
-  Future<Response> unlinkOAuthAccountWithHttpInfo() async {
-    // ignore: prefer_const_declarations
-    final apiPath = r'/oauth/unlink';
-
-    // ignore: prefer_final_locals
-    Object? postBody;
-
-    final queryParams = <QueryParam>[];
-    final headerParams = <String, String>{};
-    final formParams = <String, String>{};
-
-    const contentTypes = <String>[];
-
-
-    return apiClient.invokeAPI(
-      apiPath,
-      'POST',
-      queryParams,
-      postBody,
-      headerParams,
-      formParams,
-      contentTypes.isEmpty ? null : contentTypes.first,
-    );
-  }
-
-  Future<UserAdminResponseDto?> unlinkOAuthAccount() async {
-    final response = await unlinkOAuthAccountWithHttpInfo();
-    if (response.statusCode >= HttpStatus.badRequest) {
-      throw ApiException(response.statusCode, await _decodeBodyBytes(response));
-    }
-    // When a remote server returns no body with a status of 204, we shall not decode it.
-    // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
-    // FormatException when trying to decode an empty string.
-    if (response.body.isNotEmpty && response.statusCode != HttpStatus.noContent) {
-      return await apiClient.deserializeAsync(await _decodeBodyBytes(response), 'UserAdminResponseDto',) as UserAdminResponseDto;
-    
-    }
-    return null;
-  }
-}
diff --git a/mobile/openapi/lib/api/partners_api.dart b/mobile/openapi/lib/api/partners_api.dart
index a5fdf53ab5..9cbd4bfedb 100644
--- a/mobile/openapi/lib/api/partners_api.dart
+++ b/mobile/openapi/lib/api/partners_api.dart
@@ -16,7 +16,9 @@ class PartnersApi {
 
   final ApiClient apiClient;
 
-  /// This endpoint requires the `partner.create` permission.
+  /// Create a partner
+  ///
+  /// Create a new partner to share assets with.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -48,7 +50,9 @@ class PartnersApi {
     );
   }
 
-  /// This endpoint requires the `partner.create` permission.
+  /// Create a partner
+  ///
+  /// Create a new partner to share assets with.
   ///
   /// Parameters:
   ///
@@ -68,7 +72,9 @@ class PartnersApi {
     return null;
   }
 
-  /// This property was deprecated in v1.141.0. This endpoint requires the `partner.create` permission.
+  /// Create a partner
+  ///
+  /// This property was deprecated in v1.141.0. Create a new partner to share assets with.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -101,7 +107,9 @@ class PartnersApi {
     );
   }
 
-  /// This property was deprecated in v1.141.0. This endpoint requires the `partner.create` permission.
+  /// Create a partner
+  ///
+  /// This property was deprecated in v1.141.0. Create a new partner to share assets with.
   ///
   /// Parameters:
   ///
@@ -121,7 +129,9 @@ class PartnersApi {
     return null;
   }
 
-  /// This endpoint requires the `partner.read` permission.
+  /// Retrieve partners
+  ///
+  /// Retrieve a list of partners with whom assets are shared.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -155,7 +165,9 @@ class PartnersApi {
     );
   }
 
-  /// This endpoint requires the `partner.read` permission.
+  /// Retrieve partners
+  ///
+  /// Retrieve a list of partners with whom assets are shared.
   ///
   /// Parameters:
   ///
@@ -178,7 +190,9 @@ class PartnersApi {
     return null;
   }
 
-  /// This endpoint requires the `partner.delete` permission.
+  /// Remove a partner
+  ///
+  /// Stop sharing assets with a partner.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -211,7 +225,9 @@ class PartnersApi {
     );
   }
 
-  /// This endpoint requires the `partner.delete` permission.
+  /// Remove a partner
+  ///
+  /// Stop sharing assets with a partner.
   ///
   /// Parameters:
   ///
@@ -223,7 +239,9 @@ class PartnersApi {
     }
   }
 
-  /// This endpoint requires the `partner.update` permission.
+  /// Update a partner
+  ///
+  /// Specify whether a partner's assets should appear in the user's timeline.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -258,7 +276,9 @@ class PartnersApi {
     );
   }
 
-  /// This endpoint requires the `partner.update` permission.
+  /// Update a partner
+  ///
+  /// Specify whether a partner's assets should appear in the user's timeline.
   ///
   /// Parameters:
   ///
diff --git a/mobile/openapi/lib/api/people_api.dart b/mobile/openapi/lib/api/people_api.dart
index 68c16785cc..c38e61584e 100644
--- a/mobile/openapi/lib/api/people_api.dart
+++ b/mobile/openapi/lib/api/people_api.dart
@@ -16,7 +16,9 @@ class PeopleApi {
 
   final ApiClient apiClient;
 
-  /// This endpoint requires the `person.create` permission.
+  /// Create a person
+  ///
+  /// Create a new person that can have multiple faces assigned to them.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -48,7 +50,9 @@ class PeopleApi {
     );
   }
 
-  /// This endpoint requires the `person.create` permission.
+  /// Create a person
+  ///
+  /// Create a new person that can have multiple faces assigned to them.
   ///
   /// Parameters:
   ///
@@ -68,7 +72,9 @@ class PeopleApi {
     return null;
   }
 
-  /// This endpoint requires the `person.delete` permission.
+  /// Delete people
+  ///
+  /// Bulk delete a list of people at once.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -100,7 +106,9 @@ class PeopleApi {
     );
   }
 
-  /// This endpoint requires the `person.delete` permission.
+  /// Delete people
+  ///
+  /// Bulk delete a list of people at once.
   ///
   /// Parameters:
   ///
@@ -112,7 +120,9 @@ class PeopleApi {
     }
   }
 
-  /// This endpoint requires the `person.delete` permission.
+  /// Delete person
+  ///
+  /// Delete an individual person.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -145,7 +155,9 @@ class PeopleApi {
     );
   }
 
-  /// This endpoint requires the `person.delete` permission.
+  /// Delete person
+  ///
+  /// Delete an individual person.
   ///
   /// Parameters:
   ///
@@ -157,7 +169,9 @@ class PeopleApi {
     }
   }
 
-  /// This endpoint requires the `person.read` permission.
+  /// Get all people
+  ///
+  /// Retrieve a list of all people.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -215,7 +229,9 @@ class PeopleApi {
     );
   }
 
-  /// This endpoint requires the `person.read` permission.
+  /// Get all people
+  ///
+  /// Retrieve a list of all people.
   ///
   /// Parameters:
   ///
@@ -245,7 +261,9 @@ class PeopleApi {
     return null;
   }
 
-  /// This endpoint requires the `person.read` permission.
+  /// Get a person
+  ///
+  /// Retrieve a person by id.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -278,7 +296,9 @@ class PeopleApi {
     );
   }
 
-  /// This endpoint requires the `person.read` permission.
+  /// Get a person
+  ///
+  /// Retrieve a person by id.
   ///
   /// Parameters:
   ///
@@ -298,7 +318,9 @@ class PeopleApi {
     return null;
   }
 
-  /// This endpoint requires the `person.statistics` permission.
+  /// Get person statistics
+  ///
+  /// Retrieve statistics about a specific person.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -331,7 +353,9 @@ class PeopleApi {
     );
   }
 
-  /// This endpoint requires the `person.statistics` permission.
+  /// Get person statistics
+  ///
+  /// Retrieve statistics about a specific person.
   ///
   /// Parameters:
   ///
@@ -351,7 +375,9 @@ class PeopleApi {
     return null;
   }
 
-  /// This endpoint requires the `person.read` permission.
+  /// Get person thumbnail
+  ///
+  /// Retrieve the thumbnail file for a person.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -384,7 +410,9 @@ class PeopleApi {
     );
   }
 
-  /// This endpoint requires the `person.read` permission.
+  /// Get person thumbnail
+  ///
+  /// Retrieve the thumbnail file for a person.
   ///
   /// Parameters:
   ///
@@ -404,7 +432,9 @@ class PeopleApi {
     return null;
   }
 
-  /// This endpoint requires the `person.merge` permission.
+  /// Merge people
+  ///
+  /// Merge a list of people into the person specified in the path parameter.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -439,7 +469,9 @@ class PeopleApi {
     );
   }
 
-  /// This endpoint requires the `person.merge` permission.
+  /// Merge people
+  ///
+  /// Merge a list of people into the person specified in the path parameter.
   ///
   /// Parameters:
   ///
@@ -464,7 +496,9 @@ class PeopleApi {
     return null;
   }
 
-  /// This endpoint requires the `person.reassign` permission.
+  /// Reassign faces
+  ///
+  /// Bulk reassign a list of faces to a different person.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -499,7 +533,9 @@ class PeopleApi {
     );
   }
 
-  /// This endpoint requires the `person.reassign` permission.
+  /// Reassign faces
+  ///
+  /// Bulk reassign a list of faces to a different person.
   ///
   /// Parameters:
   ///
@@ -524,7 +560,9 @@ class PeopleApi {
     return null;
   }
 
-  /// This endpoint requires the `person.update` permission.
+  /// Update people
+  ///
+  /// Bulk update multiple people at once.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -556,7 +594,9 @@ class PeopleApi {
     );
   }
 
-  /// This endpoint requires the `person.update` permission.
+  /// Update people
+  ///
+  /// Bulk update multiple people at once.
   ///
   /// Parameters:
   ///
@@ -579,7 +619,9 @@ class PeopleApi {
     return null;
   }
 
-  /// This endpoint requires the `person.update` permission.
+  /// Update person
+  ///
+  /// Update an individual person.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -614,7 +656,9 @@ class PeopleApi {
     );
   }
 
-  /// This endpoint requires the `person.update` permission.
+  /// Update person
+  ///
+  /// Update an individual person.
   ///
   /// Parameters:
   ///
diff --git a/mobile/openapi/lib/api/search_api.dart b/mobile/openapi/lib/api/search_api.dart
index 6c279a3503..375e9a1e87 100644
--- a/mobile/openapi/lib/api/search_api.dart
+++ b/mobile/openapi/lib/api/search_api.dart
@@ -16,7 +16,9 @@ class SearchApi {
 
   final ApiClient apiClient;
 
-  /// This endpoint requires the `asset.read` permission.
+  /// Retrieve assets by city
+  ///
+  /// Retrieve a list of assets with each asset belonging to a different city. This endpoint is used on the places pages to show a single thumbnail for each city the user has assets in.
   ///
   /// Note: This method returns the HTTP [Response].
   Future<Response> getAssetsByCityWithHttpInfo() async {
@@ -44,7 +46,9 @@ class SearchApi {
     );
   }
 
-  /// This endpoint requires the `asset.read` permission.
+  /// Retrieve assets by city
+  ///
+  /// Retrieve a list of assets with each asset belonging to a different city. This endpoint is used on the places pages to show a single thumbnail for each city the user has assets in.
   Future<List<AssetResponseDto>?> getAssetsByCity() async {
     final response = await getAssetsByCityWithHttpInfo();
     if (response.statusCode >= HttpStatus.badRequest) {
@@ -63,7 +67,9 @@ class SearchApi {
     return null;
   }
 
-  /// This endpoint requires the `asset.read` permission.
+  /// Retrieve explore data
+  ///
+  /// Retrieve data for the explore section, such as popular people and places.
   ///
   /// Note: This method returns the HTTP [Response].
   Future<Response> getExploreDataWithHttpInfo() async {
@@ -91,7 +97,9 @@ class SearchApi {
     );
   }
 
-  /// This endpoint requires the `asset.read` permission.
+  /// Retrieve explore data
+  ///
+  /// Retrieve data for the explore section, such as popular people and places.
   Future<List<SearchExploreResponseDto>?> getExploreData() async {
     final response = await getExploreDataWithHttpInfo();
     if (response.statusCode >= HttpStatus.badRequest) {
@@ -110,7 +118,9 @@ class SearchApi {
     return null;
   }
 
-  /// This endpoint requires the `asset.read` permission.
+  /// Retrieve search suggestions
+  ///
+  /// Retrieve search suggestions based on partial input. This endpoint is used for typeahead search features.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -175,7 +185,9 @@ class SearchApi {
     );
   }
 
-  /// This endpoint requires the `asset.read` permission.
+  /// Retrieve search suggestions
+  ///
+  /// Retrieve search suggestions based on partial input. This endpoint is used for typeahead search features.
   ///
   /// Parameters:
   ///
@@ -211,7 +223,9 @@ class SearchApi {
     return null;
   }
 
-  /// This endpoint requires the `asset.statistics` permission.
+  /// Search asset statistics
+  ///
+  /// Retrieve statistical data about assets based on search criteria, such as the total matching count.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -243,7 +257,9 @@ class SearchApi {
     );
   }
 
-  /// This endpoint requires the `asset.statistics` permission.
+  /// Search asset statistics
+  ///
+  /// Retrieve statistical data about assets based on search criteria, such as the total matching count.
   ///
   /// Parameters:
   ///
@@ -263,7 +279,9 @@ class SearchApi {
     return null;
   }
 
-  /// This endpoint requires the `asset.read` permission.
+  /// Search assets by metadata
+  ///
+  /// Search for assets based on various metadata criteria.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -295,7 +313,9 @@ class SearchApi {
     );
   }
 
-  /// This endpoint requires the `asset.read` permission.
+  /// Search assets by metadata
+  ///
+  /// Search for assets based on various metadata criteria.
   ///
   /// Parameters:
   ///
@@ -315,7 +335,9 @@ class SearchApi {
     return null;
   }
 
-  /// This endpoint requires the `asset.read` permission.
+  /// Search large assets
+  ///
+  /// Search for assets that are considered large based on specified criteria.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -506,7 +528,9 @@ class SearchApi {
     );
   }
 
-  /// This endpoint requires the `asset.read` permission.
+  /// Search large assets
+  ///
+  /// Search for assets that are considered large based on specified criteria.
   ///
   /// Parameters:
   ///
@@ -591,7 +615,9 @@ class SearchApi {
     return null;
   }
 
-  /// This endpoint requires the `person.read` permission.
+  /// Search people
+  ///
+  /// Search for people by name.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -630,7 +656,9 @@ class SearchApi {
     );
   }
 
-  /// This endpoint requires the `person.read` permission.
+  /// Search people
+  ///
+  /// Search for people by name.
   ///
   /// Parameters:
   ///
@@ -655,7 +683,9 @@ class SearchApi {
     return null;
   }
 
-  /// This endpoint requires the `asset.read` permission.
+  /// Search places
+  ///
+  /// Search for places by name.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -689,7 +719,9 @@ class SearchApi {
     );
   }
 
-  /// This endpoint requires the `asset.read` permission.
+  /// Search places
+  ///
+  /// Search for places by name.
   ///
   /// Parameters:
   ///
@@ -712,7 +744,9 @@ class SearchApi {
     return null;
   }
 
-  /// This endpoint requires the `asset.read` permission.
+  /// Search random assets
+  ///
+  /// Retrieve a random selection of assets based on the provided criteria.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -744,7 +778,9 @@ class SearchApi {
     );
   }
 
-  /// This endpoint requires the `asset.read` permission.
+  /// Search random assets
+  ///
+  /// Retrieve a random selection of assets based on the provided criteria.
   ///
   /// Parameters:
   ///
@@ -767,7 +803,9 @@ class SearchApi {
     return null;
   }
 
-  /// This endpoint requires the `asset.read` permission.
+  /// Smart asset search
+  ///
+  /// Perform a smart search for assets by using machine learning vectors to determine relevance.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -799,7 +837,9 @@ class SearchApi {
     );
   }
 
-  /// This endpoint requires the `asset.read` permission.
+  /// Smart asset search
+  ///
+  /// Perform a smart search for assets by using machine learning vectors to determine relevance.
   ///
   /// Parameters:
   ///
diff --git a/mobile/openapi/lib/api/server_api.dart b/mobile/openapi/lib/api/server_api.dart
index 9fa8f2016d..f5b70a9ea4 100644
--- a/mobile/openapi/lib/api/server_api.dart
+++ b/mobile/openapi/lib/api/server_api.dart
@@ -16,7 +16,9 @@ class ServerApi {
 
   final ApiClient apiClient;
 
-  /// This endpoint is an admin-only route, and requires the `serverLicense.delete` permission.
+  /// Delete server product key
+  ///
+  /// Delete the currently set server product key.
   ///
   /// Note: This method returns the HTTP [Response].
   Future<Response> deleteServerLicenseWithHttpInfo() async {
@@ -44,7 +46,9 @@ class ServerApi {
     );
   }
 
-  /// This endpoint is an admin-only route, and requires the `serverLicense.delete` permission.
+  /// Delete server product key
+  ///
+  /// Delete the currently set server product key.
   Future<void> deleteServerLicense() async {
     final response = await deleteServerLicenseWithHttpInfo();
     if (response.statusCode >= HttpStatus.badRequest) {
@@ -52,7 +56,9 @@ class ServerApi {
     }
   }
 
-  /// This endpoint requires the `server.about` permission.
+  /// Get server information
+  ///
+  /// Retrieve a list of information about the server.
   ///
   /// Note: This method returns the HTTP [Response].
   Future<Response> getAboutInfoWithHttpInfo() async {
@@ -80,7 +86,9 @@ class ServerApi {
     );
   }
 
-  /// This endpoint requires the `server.about` permission.
+  /// Get server information
+  ///
+  /// Retrieve a list of information about the server.
   Future<ServerAboutResponseDto?> getAboutInfo() async {
     final response = await getAboutInfoWithHttpInfo();
     if (response.statusCode >= HttpStatus.badRequest) {
@@ -96,7 +104,9 @@ class ServerApi {
     return null;
   }
 
-  /// This endpoint requires the `server.apkLinks` permission.
+  /// Get APK links
+  ///
+  /// Retrieve links to the APKs for the current server version.
   ///
   /// Note: This method returns the HTTP [Response].
   Future<Response> getApkLinksWithHttpInfo() async {
@@ -124,7 +134,9 @@ class ServerApi {
     );
   }
 
-  /// This endpoint requires the `server.apkLinks` permission.
+  /// Get APK links
+  ///
+  /// Retrieve links to the APKs for the current server version.
   Future<ServerApkLinksDto?> getApkLinks() async {
     final response = await getApkLinksWithHttpInfo();
     if (response.statusCode >= HttpStatus.badRequest) {
@@ -140,7 +152,11 @@ class ServerApi {
     return null;
   }
 
-  /// Performs an HTTP 'GET /server/config' operation and returns the [Response].
+  /// Get config
+  ///
+  /// Retrieve the current server configuration.
+  ///
+  /// Note: This method returns the HTTP [Response].
   Future<Response> getServerConfigWithHttpInfo() async {
     // ignore: prefer_const_declarations
     final apiPath = r'/server/config';
@@ -166,6 +182,9 @@ class ServerApi {
     );
   }
 
+  /// Get config
+  ///
+  /// Retrieve the current server configuration.
   Future<ServerConfigDto?> getServerConfig() async {
     final response = await getServerConfigWithHttpInfo();
     if (response.statusCode >= HttpStatus.badRequest) {
@@ -181,7 +200,11 @@ class ServerApi {
     return null;
   }
 
-  /// Performs an HTTP 'GET /server/features' operation and returns the [Response].
+  /// Get features
+  ///
+  /// Retrieve available features supported by this server.
+  ///
+  /// Note: This method returns the HTTP [Response].
   Future<Response> getServerFeaturesWithHttpInfo() async {
     // ignore: prefer_const_declarations
     final apiPath = r'/server/features';
@@ -207,6 +230,9 @@ class ServerApi {
     );
   }
 
+  /// Get features
+  ///
+  /// Retrieve available features supported by this server.
   Future<ServerFeaturesDto?> getServerFeatures() async {
     final response = await getServerFeaturesWithHttpInfo();
     if (response.statusCode >= HttpStatus.badRequest) {
@@ -222,7 +248,9 @@ class ServerApi {
     return null;
   }
 
-  /// This endpoint is an admin-only route, and requires the `serverLicense.read` permission.
+  /// Get product key
+  ///
+  /// Retrieve information about whether the server currently has a product key registered.
   ///
   /// Note: This method returns the HTTP [Response].
   Future<Response> getServerLicenseWithHttpInfo() async {
@@ -250,7 +278,9 @@ class ServerApi {
     );
   }
 
-  /// This endpoint is an admin-only route, and requires the `serverLicense.read` permission.
+  /// Get product key
+  ///
+  /// Retrieve information about whether the server currently has a product key registered.
   Future<LicenseResponseDto?> getServerLicense() async {
     final response = await getServerLicenseWithHttpInfo();
     if (response.statusCode >= HttpStatus.badRequest) {
@@ -266,7 +296,9 @@ class ServerApi {
     return null;
   }
 
-  /// This endpoint is an admin-only route, and requires the `server.statistics` permission.
+  /// Get statistics
+  ///
+  /// Retrieve statistics about the entire Immich instance such as asset counts.
   ///
   /// Note: This method returns the HTTP [Response].
   Future<Response> getServerStatisticsWithHttpInfo() async {
@@ -294,7 +326,9 @@ class ServerApi {
     );
   }
 
-  /// This endpoint is an admin-only route, and requires the `server.statistics` permission.
+  /// Get statistics
+  ///
+  /// Retrieve statistics about the entire Immich instance such as asset counts.
   Future<ServerStatsResponseDto?> getServerStatistics() async {
     final response = await getServerStatisticsWithHttpInfo();
     if (response.statusCode >= HttpStatus.badRequest) {
@@ -310,7 +344,11 @@ class ServerApi {
     return null;
   }
 
-  /// Performs an HTTP 'GET /server/version' operation and returns the [Response].
+  /// Get server version
+  ///
+  /// Retrieve the current server version in semantic versioning (semver) format.
+  ///
+  /// Note: This method returns the HTTP [Response].
   Future<Response> getServerVersionWithHttpInfo() async {
     // ignore: prefer_const_declarations
     final apiPath = r'/server/version';
@@ -336,6 +374,9 @@ class ServerApi {
     );
   }
 
+  /// Get server version
+  ///
+  /// Retrieve the current server version in semantic versioning (semver) format.
   Future<ServerVersionResponseDto?> getServerVersion() async {
     final response = await getServerVersionWithHttpInfo();
     if (response.statusCode >= HttpStatus.badRequest) {
@@ -351,7 +392,9 @@ class ServerApi {
     return null;
   }
 
-  /// This endpoint requires the `server.storage` permission.
+  /// Get storage
+  ///
+  /// Retrieve the current storage utilization information of the server.
   ///
   /// Note: This method returns the HTTP [Response].
   Future<Response> getStorageWithHttpInfo() async {
@@ -379,7 +422,9 @@ class ServerApi {
     );
   }
 
-  /// This endpoint requires the `server.storage` permission.
+  /// Get storage
+  ///
+  /// Retrieve the current storage utilization information of the server.
   Future<ServerStorageResponseDto?> getStorage() async {
     final response = await getStorageWithHttpInfo();
     if (response.statusCode >= HttpStatus.badRequest) {
@@ -395,7 +440,11 @@ class ServerApi {
     return null;
   }
 
-  /// Performs an HTTP 'GET /server/media-types' operation and returns the [Response].
+  /// Get supported media types
+  ///
+  /// Retrieve all media types supported by the server.
+  ///
+  /// Note: This method returns the HTTP [Response].
   Future<Response> getSupportedMediaTypesWithHttpInfo() async {
     // ignore: prefer_const_declarations
     final apiPath = r'/server/media-types';
@@ -421,6 +470,9 @@ class ServerApi {
     );
   }
 
+  /// Get supported media types
+  ///
+  /// Retrieve all media types supported by the server.
   Future<ServerMediaTypesResponseDto?> getSupportedMediaTypes() async {
     final response = await getSupportedMediaTypesWithHttpInfo();
     if (response.statusCode >= HttpStatus.badRequest) {
@@ -436,7 +488,11 @@ class ServerApi {
     return null;
   }
 
-  /// Performs an HTTP 'GET /server/theme' operation and returns the [Response].
+  /// Get theme
+  ///
+  /// Retrieve the custom CSS, if existent.
+  ///
+  /// Note: This method returns the HTTP [Response].
   Future<Response> getThemeWithHttpInfo() async {
     // ignore: prefer_const_declarations
     final apiPath = r'/server/theme';
@@ -462,6 +518,9 @@ class ServerApi {
     );
   }
 
+  /// Get theme
+  ///
+  /// Retrieve the custom CSS, if existent.
   Future<ServerThemeDto?> getTheme() async {
     final response = await getThemeWithHttpInfo();
     if (response.statusCode >= HttpStatus.badRequest) {
@@ -477,7 +536,9 @@ class ServerApi {
     return null;
   }
 
-  /// This endpoint requires the `server.versionCheck` permission.
+  /// Get version check status
+  ///
+  /// Retrieve information about the last time the version check ran.
   ///
   /// Note: This method returns the HTTP [Response].
   Future<Response> getVersionCheckWithHttpInfo() async {
@@ -505,7 +566,9 @@ class ServerApi {
     );
   }
 
-  /// This endpoint requires the `server.versionCheck` permission.
+  /// Get version check status
+  ///
+  /// Retrieve information about the last time the version check ran.
   Future<VersionCheckStateResponseDto?> getVersionCheck() async {
     final response = await getVersionCheckWithHttpInfo();
     if (response.statusCode >= HttpStatus.badRequest) {
@@ -521,7 +584,11 @@ class ServerApi {
     return null;
   }
 
-  /// Performs an HTTP 'GET /server/version-history' operation and returns the [Response].
+  /// Get version history
+  ///
+  /// Retrieve a list of past versions the server has been on.
+  ///
+  /// Note: This method returns the HTTP [Response].
   Future<Response> getVersionHistoryWithHttpInfo() async {
     // ignore: prefer_const_declarations
     final apiPath = r'/server/version-history';
@@ -547,6 +614,9 @@ class ServerApi {
     );
   }
 
+  /// Get version history
+  ///
+  /// Retrieve a list of past versions the server has been on.
   Future<List<ServerVersionHistoryResponseDto>?> getVersionHistory() async {
     final response = await getVersionHistoryWithHttpInfo();
     if (response.statusCode >= HttpStatus.badRequest) {
@@ -565,7 +635,11 @@ class ServerApi {
     return null;
   }
 
-  /// Performs an HTTP 'GET /server/ping' operation and returns the [Response].
+  /// Ping
+  ///
+  /// Pong
+  ///
+  /// Note: This method returns the HTTP [Response].
   Future<Response> pingServerWithHttpInfo() async {
     // ignore: prefer_const_declarations
     final apiPath = r'/server/ping';
@@ -591,6 +665,9 @@ class ServerApi {
     );
   }
 
+  /// Ping
+  ///
+  /// Pong
   Future<ServerPingResponse?> pingServer() async {
     final response = await pingServerWithHttpInfo();
     if (response.statusCode >= HttpStatus.badRequest) {
@@ -606,7 +683,9 @@ class ServerApi {
     return null;
   }
 
-  /// This endpoint is an admin-only route, and requires the `serverLicense.update` permission.
+  /// Set server product key
+  ///
+  /// Validate and set the server product key if successful.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -638,7 +717,9 @@ class ServerApi {
     );
   }
 
-  /// This endpoint is an admin-only route, and requires the `serverLicense.update` permission.
+  /// Set server product key
+  ///
+  /// Validate and set the server product key if successful.
   ///
   /// Parameters:
   ///
diff --git a/mobile/openapi/lib/api/sessions_api.dart b/mobile/openapi/lib/api/sessions_api.dart
index 63528d17a7..da508059bc 100644
--- a/mobile/openapi/lib/api/sessions_api.dart
+++ b/mobile/openapi/lib/api/sessions_api.dart
@@ -16,7 +16,9 @@ class SessionsApi {
 
   final ApiClient apiClient;
 
-  /// This endpoint requires the `session.create` permission.
+  /// Create a session
+  ///
+  /// Create a session as a child to the current session. This endpoint is used for casting.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -48,7 +50,9 @@ class SessionsApi {
     );
   }
 
-  /// This endpoint requires the `session.create` permission.
+  /// Create a session
+  ///
+  /// Create a session as a child to the current session. This endpoint is used for casting.
   ///
   /// Parameters:
   ///
@@ -68,7 +72,9 @@ class SessionsApi {
     return null;
   }
 
-  /// This endpoint requires the `session.delete` permission.
+  /// Delete all sessions
+  ///
+  /// Delete all sessions for the user. This will not delete the current session.
   ///
   /// Note: This method returns the HTTP [Response].
   Future<Response> deleteAllSessionsWithHttpInfo() async {
@@ -96,7 +102,9 @@ class SessionsApi {
     );
   }
 
-  /// This endpoint requires the `session.delete` permission.
+  /// Delete all sessions
+  ///
+  /// Delete all sessions for the user. This will not delete the current session.
   Future<void> deleteAllSessions() async {
     final response = await deleteAllSessionsWithHttpInfo();
     if (response.statusCode >= HttpStatus.badRequest) {
@@ -104,7 +112,9 @@ class SessionsApi {
     }
   }
 
-  /// This endpoint requires the `session.delete` permission.
+  /// Delete a session
+  ///
+  /// Delete a specific session by id.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -137,7 +147,9 @@ class SessionsApi {
     );
   }
 
-  /// This endpoint requires the `session.delete` permission.
+  /// Delete a session
+  ///
+  /// Delete a specific session by id.
   ///
   /// Parameters:
   ///
@@ -149,7 +161,9 @@ class SessionsApi {
     }
   }
 
-  /// This endpoint requires the `session.read` permission.
+  /// Retrieve sessions
+  ///
+  /// Retrieve a list of sessions for the user.
   ///
   /// Note: This method returns the HTTP [Response].
   Future<Response> getSessionsWithHttpInfo() async {
@@ -177,7 +191,9 @@ class SessionsApi {
     );
   }
 
-  /// This endpoint requires the `session.read` permission.
+  /// Retrieve sessions
+  ///
+  /// Retrieve a list of sessions for the user.
   Future<List<SessionResponseDto>?> getSessions() async {
     final response = await getSessionsWithHttpInfo();
     if (response.statusCode >= HttpStatus.badRequest) {
@@ -196,7 +212,9 @@ class SessionsApi {
     return null;
   }
 
-  /// This endpoint requires the `session.lock` permission.
+  /// Lock a session
+  ///
+  /// Lock a specific session by id.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -229,7 +247,9 @@ class SessionsApi {
     );
   }
 
-  /// This endpoint requires the `session.lock` permission.
+  /// Lock a session
+  ///
+  /// Lock a specific session by id.
   ///
   /// Parameters:
   ///
@@ -241,7 +261,9 @@ class SessionsApi {
     }
   }
 
-  /// This endpoint requires the `session.update` permission.
+  /// Update a session
+  ///
+  /// Update a specific session identified by id.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -276,7 +298,9 @@ class SessionsApi {
     );
   }
 
-  /// This endpoint requires the `session.update` permission.
+  /// Update a session
+  ///
+  /// Update a specific session identified by id.
   ///
   /// Parameters:
   ///
diff --git a/mobile/openapi/lib/api/shared_links_api.dart b/mobile/openapi/lib/api/shared_links_api.dart
index e32c566754..79106e5db6 100644
--- a/mobile/openapi/lib/api/shared_links_api.dart
+++ b/mobile/openapi/lib/api/shared_links_api.dart
@@ -16,7 +16,12 @@ class SharedLinksApi {
 
   final ApiClient apiClient;
 
-  /// Performs an HTTP 'PUT /shared-links/{id}/assets' operation and returns the [Response].
+  /// Add assets to a shared link
+  ///
+  /// Add assets to a specific shared link by its ID. This endpoint is only relevant for shared link of type individual.
+  ///
+  /// Note: This method returns the HTTP [Response].
+  ///
   /// Parameters:
   ///
   /// * [String] id (required):
@@ -59,6 +64,10 @@ class SharedLinksApi {
     );
   }
 
+  /// Add assets to a shared link
+  ///
+  /// Add assets to a specific shared link by its ID. This endpoint is only relevant for shared link of type individual.
+  ///
   /// Parameters:
   ///
   /// * [String] id (required):
@@ -86,7 +95,9 @@ class SharedLinksApi {
     return null;
   }
 
-  /// This endpoint requires the `sharedLink.create` permission.
+  /// Create a shared link
+  ///
+  /// Create a new shared link.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -118,7 +129,9 @@ class SharedLinksApi {
     );
   }
 
-  /// This endpoint requires the `sharedLink.create` permission.
+  /// Create a shared link
+  ///
+  /// Create a new shared link.
   ///
   /// Parameters:
   ///
@@ -138,7 +151,9 @@ class SharedLinksApi {
     return null;
   }
 
-  /// This endpoint requires the `sharedLink.read` permission.
+  /// Retrieve all shared links
+  ///
+  /// Retrieve a list of all shared links.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -174,7 +189,9 @@ class SharedLinksApi {
     );
   }
 
-  /// This endpoint requires the `sharedLink.read` permission.
+  /// Retrieve all shared links
+  ///
+  /// Retrieve a list of all shared links.
   ///
   /// Parameters:
   ///
@@ -197,17 +214,22 @@ class SharedLinksApi {
     return null;
   }
 
-  /// Performs an HTTP 'GET /shared-links/me' operation and returns the [Response].
+  /// Retrieve current shared link
+  ///
+  /// Retrieve the current shared link associated with authentication method.
+  ///
+  /// Note: This method returns the HTTP [Response].
+  ///
   /// Parameters:
   ///
-  /// * [String] password:
-  ///
-  /// * [String] token:
-  ///
   /// * [String] key:
   ///
+  /// * [String] password:
+  ///
   /// * [String] slug:
-  Future<Response> getMySharedLinkWithHttpInfo({ String? password, String? token, String? key, String? slug, }) async {
+  ///
+  /// * [String] token:
+  Future<Response> getMySharedLinkWithHttpInfo({ String? key, String? password, String? slug, String? token, }) async {
     // ignore: prefer_const_declarations
     final apiPath = r'/shared-links/me';
 
@@ -218,18 +240,18 @@ class SharedLinksApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
-    if (password != null) {
-      queryParams.addAll(_queryParams('', 'password', password));
-    }
-    if (token != null) {
-      queryParams.addAll(_queryParams('', 'token', token));
-    }
     if (key != null) {
       queryParams.addAll(_queryParams('', 'key', key));
     }
+    if (password != null) {
+      queryParams.addAll(_queryParams('', 'password', password));
+    }
     if (slug != null) {
       queryParams.addAll(_queryParams('', 'slug', slug));
     }
+    if (token != null) {
+      queryParams.addAll(_queryParams('', 'token', token));
+    }
 
     const contentTypes = <String>[];
 
@@ -245,17 +267,21 @@ class SharedLinksApi {
     );
   }
 
+  /// Retrieve current shared link
+  ///
+  /// Retrieve the current shared link associated with authentication method.
+  ///
   /// Parameters:
   ///
-  /// * [String] password:
-  ///
-  /// * [String] token:
-  ///
   /// * [String] key:
   ///
+  /// * [String] password:
+  ///
   /// * [String] slug:
-  Future<SharedLinkResponseDto?> getMySharedLink({ String? password, String? token, String? key, String? slug, }) async {
-    final response = await getMySharedLinkWithHttpInfo( password: password, token: token, key: key, slug: slug, );
+  ///
+  /// * [String] token:
+  Future<SharedLinkResponseDto?> getMySharedLink({ String? key, String? password, String? slug, String? token, }) async {
+    final response = await getMySharedLinkWithHttpInfo( key: key, password: password, slug: slug, token: token, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -269,7 +295,9 @@ class SharedLinksApi {
     return null;
   }
 
-  /// This endpoint requires the `sharedLink.read` permission.
+  /// Retrieve a shared link
+  ///
+  /// Retrieve a specific shared link by its ID.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -302,7 +330,9 @@ class SharedLinksApi {
     );
   }
 
-  /// This endpoint requires the `sharedLink.read` permission.
+  /// Retrieve a shared link
+  ///
+  /// Retrieve a specific shared link by its ID.
   ///
   /// Parameters:
   ///
@@ -322,7 +352,9 @@ class SharedLinksApi {
     return null;
   }
 
-  /// This endpoint requires the `sharedLink.delete` permission.
+  /// Delete a shared link
+  ///
+  /// Delete a specific shared link by its ID.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -355,7 +387,9 @@ class SharedLinksApi {
     );
   }
 
-  /// This endpoint requires the `sharedLink.delete` permission.
+  /// Delete a shared link
+  ///
+  /// Delete a specific shared link by its ID.
   ///
   /// Parameters:
   ///
@@ -367,7 +401,12 @@ class SharedLinksApi {
     }
   }
 
-  /// Performs an HTTP 'DELETE /shared-links/{id}/assets' operation and returns the [Response].
+  /// Remove assets from a shared link
+  ///
+  /// Remove assets from a specific shared link by its ID. This endpoint is only relevant for shared link of type individual.
+  ///
+  /// Note: This method returns the HTTP [Response].
+  ///
   /// Parameters:
   ///
   /// * [String] id (required):
@@ -410,6 +449,10 @@ class SharedLinksApi {
     );
   }
 
+  /// Remove assets from a shared link
+  ///
+  /// Remove assets from a specific shared link by its ID. This endpoint is only relevant for shared link of type individual.
+  ///
   /// Parameters:
   ///
   /// * [String] id (required):
@@ -437,7 +480,9 @@ class SharedLinksApi {
     return null;
   }
 
-  /// This endpoint requires the `sharedLink.update` permission.
+  /// Update a shared link
+  ///
+  /// Update an existing shared link by its ID.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -472,7 +517,9 @@ class SharedLinksApi {
     );
   }
 
-  /// This endpoint requires the `sharedLink.update` permission.
+  /// Update a shared link
+  ///
+  /// Update an existing shared link by its ID.
   ///
   /// Parameters:
   ///
diff --git a/mobile/openapi/lib/api/stacks_api.dart b/mobile/openapi/lib/api/stacks_api.dart
index 0f76f3396b..66fa1881ac 100644
--- a/mobile/openapi/lib/api/stacks_api.dart
+++ b/mobile/openapi/lib/api/stacks_api.dart
@@ -16,7 +16,9 @@ class StacksApi {
 
   final ApiClient apiClient;
 
-  /// This endpoint requires the `stack.create` permission.
+  /// Create a stack
+  ///
+  /// Create a new stack by providing a name and a list of asset IDs to include in the stack. If any of the provided asset IDs are primary assets of an existing stack, the existing stack will be merged into the newly created stack.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -48,7 +50,9 @@ class StacksApi {
     );
   }
 
-  /// This endpoint requires the `stack.create` permission.
+  /// Create a stack
+  ///
+  /// Create a new stack by providing a name and a list of asset IDs to include in the stack. If any of the provided asset IDs are primary assets of an existing stack, the existing stack will be merged into the newly created stack.
   ///
   /// Parameters:
   ///
@@ -68,7 +72,9 @@ class StacksApi {
     return null;
   }
 
-  /// This endpoint requires the `stack.delete` permission.
+  /// Delete a stack
+  ///
+  /// Delete a specific stack by its ID.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -101,7 +107,9 @@ class StacksApi {
     );
   }
 
-  /// This endpoint requires the `stack.delete` permission.
+  /// Delete a stack
+  ///
+  /// Delete a specific stack by its ID.
   ///
   /// Parameters:
   ///
@@ -113,7 +121,9 @@ class StacksApi {
     }
   }
 
-  /// This endpoint requires the `stack.delete` permission.
+  /// Delete stacks
+  ///
+  /// Delete multiple stacks by providing a list of stack IDs.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -145,7 +155,9 @@ class StacksApi {
     );
   }
 
-  /// This endpoint requires the `stack.delete` permission.
+  /// Delete stacks
+  ///
+  /// Delete multiple stacks by providing a list of stack IDs.
   ///
   /// Parameters:
   ///
@@ -157,7 +169,9 @@ class StacksApi {
     }
   }
 
-  /// This endpoint requires the `stack.read` permission.
+  /// Retrieve a stack
+  ///
+  /// Retrieve a specific stack by its ID.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -190,7 +204,9 @@ class StacksApi {
     );
   }
 
-  /// This endpoint requires the `stack.read` permission.
+  /// Retrieve a stack
+  ///
+  /// Retrieve a specific stack by its ID.
   ///
   /// Parameters:
   ///
@@ -210,7 +226,9 @@ class StacksApi {
     return null;
   }
 
-  /// This endpoint requires the `stack.update` permission.
+  /// Remove an asset from a stack
+  ///
+  /// Remove a specific asset from a stack by providing the stack ID and asset ID.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -246,7 +264,9 @@ class StacksApi {
     );
   }
 
-  /// This endpoint requires the `stack.update` permission.
+  /// Remove an asset from a stack
+  ///
+  /// Remove a specific asset from a stack by providing the stack ID and asset ID.
   ///
   /// Parameters:
   ///
@@ -260,7 +280,9 @@ class StacksApi {
     }
   }
 
-  /// This endpoint requires the `stack.read` permission.
+  /// Retrieve stacks
+  ///
+  /// Retrieve a list of stacks.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -296,7 +318,9 @@ class StacksApi {
     );
   }
 
-  /// This endpoint requires the `stack.read` permission.
+  /// Retrieve stacks
+  ///
+  /// Retrieve a list of stacks.
   ///
   /// Parameters:
   ///
@@ -319,7 +343,9 @@ class StacksApi {
     return null;
   }
 
-  /// This endpoint requires the `stack.update` permission.
+  /// Update a stack
+  ///
+  /// Update an existing stack by its ID.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -354,7 +380,9 @@ class StacksApi {
     );
   }
 
-  /// This endpoint requires the `stack.update` permission.
+  /// Update a stack
+  ///
+  /// Update an existing stack by its ID.
   ///
   /// Parameters:
   ///
diff --git a/mobile/openapi/lib/api/sync_api.dart b/mobile/openapi/lib/api/sync_api.dart
index 9e594d6ace..b1a3e61455 100644
--- a/mobile/openapi/lib/api/sync_api.dart
+++ b/mobile/openapi/lib/api/sync_api.dart
@@ -16,7 +16,9 @@ class SyncApi {
 
   final ApiClient apiClient;
 
-  /// This endpoint requires the `syncCheckpoint.delete` permission.
+  /// Delete acknowledgements
+  ///
+  /// Delete specific synchronization acknowledgments.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -48,7 +50,9 @@ class SyncApi {
     );
   }
 
-  /// This endpoint requires the `syncCheckpoint.delete` permission.
+  /// Delete acknowledgements
+  ///
+  /// Delete specific synchronization acknowledgments.
   ///
   /// Parameters:
   ///
@@ -60,7 +64,12 @@ class SyncApi {
     }
   }
 
-  /// Performs an HTTP 'POST /sync/delta-sync' operation and returns the [Response].
+  /// Get delta sync for user
+  ///
+  /// This property was deprecated in v2.0.0. Retrieve changed assets since the last sync for the authenticated user.
+  ///
+  /// Note: This method returns the HTTP [Response].
+  ///
   /// Parameters:
   ///
   /// * [AssetDeltaSyncDto] assetDeltaSyncDto (required):
@@ -89,6 +98,10 @@ class SyncApi {
     );
   }
 
+  /// Get delta sync for user
+  ///
+  /// This property was deprecated in v2.0.0. Retrieve changed assets since the last sync for the authenticated user.
+  ///
   /// Parameters:
   ///
   /// * [AssetDeltaSyncDto] assetDeltaSyncDto (required):
@@ -107,7 +120,12 @@ class SyncApi {
     return null;
   }
 
-  /// Performs an HTTP 'POST /sync/full-sync' operation and returns the [Response].
+  /// Get full sync for user
+  ///
+  /// This property was deprecated in v2.0.0. Retrieve all assets for a full synchronization for the authenticated user.
+  ///
+  /// Note: This method returns the HTTP [Response].
+  ///
   /// Parameters:
   ///
   /// * [AssetFullSyncDto] assetFullSyncDto (required):
@@ -136,6 +154,10 @@ class SyncApi {
     );
   }
 
+  /// Get full sync for user
+  ///
+  /// This property was deprecated in v2.0.0. Retrieve all assets for a full synchronization for the authenticated user.
+  ///
   /// Parameters:
   ///
   /// * [AssetFullSyncDto] assetFullSyncDto (required):
@@ -157,7 +179,9 @@ class SyncApi {
     return null;
   }
 
-  /// This endpoint requires the `syncCheckpoint.read` permission.
+  /// Retrieve acknowledgements
+  ///
+  /// Retrieve the synchronization acknowledgments for the current session.
   ///
   /// Note: This method returns the HTTP [Response].
   Future<Response> getSyncAckWithHttpInfo() async {
@@ -185,7 +209,9 @@ class SyncApi {
     );
   }
 
-  /// This endpoint requires the `syncCheckpoint.read` permission.
+  /// Retrieve acknowledgements
+  ///
+  /// Retrieve the synchronization acknowledgments for the current session.
   Future<List<SyncAckDto>?> getSyncAck() async {
     final response = await getSyncAckWithHttpInfo();
     if (response.statusCode >= HttpStatus.badRequest) {
@@ -204,7 +230,9 @@ class SyncApi {
     return null;
   }
 
-  /// This endpoint requires the `sync.stream` permission.
+  /// Stream sync changes
+  ///
+  /// Retrieve a JSON lines streamed response of changes for synchronization. This endpoint is used by the mobile app to efficiently stay up to date with changes.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -236,7 +264,9 @@ class SyncApi {
     );
   }
 
-  /// This endpoint requires the `sync.stream` permission.
+  /// Stream sync changes
+  ///
+  /// Retrieve a JSON lines streamed response of changes for synchronization. This endpoint is used by the mobile app to efficiently stay up to date with changes.
   ///
   /// Parameters:
   ///
@@ -248,7 +278,9 @@ class SyncApi {
     }
   }
 
-  /// This endpoint requires the `syncCheckpoint.update` permission.
+  /// Acknowledge changes
+  ///
+  /// Send a list of synchronization acknowledgements to confirm that the latest changes have been received.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -280,7 +312,9 @@ class SyncApi {
     );
   }
 
-  /// This endpoint requires the `syncCheckpoint.update` permission.
+  /// Acknowledge changes
+  ///
+  /// Send a list of synchronization acknowledgements to confirm that the latest changes have been received.
   ///
   /// Parameters:
   ///
diff --git a/mobile/openapi/lib/api/system_config_api.dart b/mobile/openapi/lib/api/system_config_api.dart
index 2ab3879b8a..b04da71273 100644
--- a/mobile/openapi/lib/api/system_config_api.dart
+++ b/mobile/openapi/lib/api/system_config_api.dart
@@ -16,7 +16,9 @@ class SystemConfigApi {
 
   final ApiClient apiClient;
 
-  /// This endpoint is an admin-only route, and requires the `systemConfig.read` permission.
+  /// Get system configuration
+  ///
+  /// Retrieve the current system configuration.
   ///
   /// Note: This method returns the HTTP [Response].
   Future<Response> getConfigWithHttpInfo() async {
@@ -44,7 +46,9 @@ class SystemConfigApi {
     );
   }
 
-  /// This endpoint is an admin-only route, and requires the `systemConfig.read` permission.
+  /// Get system configuration
+  ///
+  /// Retrieve the current system configuration.
   Future<SystemConfigDto?> getConfig() async {
     final response = await getConfigWithHttpInfo();
     if (response.statusCode >= HttpStatus.badRequest) {
@@ -60,7 +64,9 @@ class SystemConfigApi {
     return null;
   }
 
-  /// This endpoint is an admin-only route, and requires the `systemConfig.read` permission.
+  /// Get system configuration defaults
+  ///
+  /// Retrieve the default values for the system configuration.
   ///
   /// Note: This method returns the HTTP [Response].
   Future<Response> getConfigDefaultsWithHttpInfo() async {
@@ -88,7 +94,9 @@ class SystemConfigApi {
     );
   }
 
-  /// This endpoint is an admin-only route, and requires the `systemConfig.read` permission.
+  /// Get system configuration defaults
+  ///
+  /// Retrieve the default values for the system configuration.
   Future<SystemConfigDto?> getConfigDefaults() async {
     final response = await getConfigDefaultsWithHttpInfo();
     if (response.statusCode >= HttpStatus.badRequest) {
@@ -104,7 +112,9 @@ class SystemConfigApi {
     return null;
   }
 
-  /// This endpoint is an admin-only route, and requires the `systemConfig.read` permission.
+  /// Get storage template options
+  ///
+  /// Retrieve exemplary storage template options.
   ///
   /// Note: This method returns the HTTP [Response].
   Future<Response> getStorageTemplateOptionsWithHttpInfo() async {
@@ -132,7 +142,9 @@ class SystemConfigApi {
     );
   }
 
-  /// This endpoint is an admin-only route, and requires the `systemConfig.read` permission.
+  /// Get storage template options
+  ///
+  /// Retrieve exemplary storage template options.
   Future<SystemConfigTemplateStorageOptionDto?> getStorageTemplateOptions() async {
     final response = await getStorageTemplateOptionsWithHttpInfo();
     if (response.statusCode >= HttpStatus.badRequest) {
@@ -148,7 +160,9 @@ class SystemConfigApi {
     return null;
   }
 
-  /// This endpoint is an admin-only route, and requires the `systemConfig.update` permission.
+  /// Update system configuration
+  ///
+  /// Update the system configuration with a new system configuration.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -180,7 +194,9 @@ class SystemConfigApi {
     );
   }
 
-  /// This endpoint is an admin-only route, and requires the `systemConfig.update` permission.
+  /// Update system configuration
+  ///
+  /// Update the system configuration with a new system configuration.
   ///
   /// Parameters:
   ///
diff --git a/mobile/openapi/lib/api/system_metadata_api.dart b/mobile/openapi/lib/api/system_metadata_api.dart
index f6b9bad1d6..63fd7628ec 100644
--- a/mobile/openapi/lib/api/system_metadata_api.dart
+++ b/mobile/openapi/lib/api/system_metadata_api.dart
@@ -16,7 +16,9 @@ class SystemMetadataApi {
 
   final ApiClient apiClient;
 
-  /// This endpoint is an admin-only route, and requires the `systemMetadata.read` permission.
+  /// Retrieve admin onboarding
+  ///
+  /// Retrieve the current admin onboarding status.
   ///
   /// Note: This method returns the HTTP [Response].
   Future<Response> getAdminOnboardingWithHttpInfo() async {
@@ -44,7 +46,9 @@ class SystemMetadataApi {
     );
   }
 
-  /// This endpoint is an admin-only route, and requires the `systemMetadata.read` permission.
+  /// Retrieve admin onboarding
+  ///
+  /// Retrieve the current admin onboarding status.
   Future<AdminOnboardingUpdateDto?> getAdminOnboarding() async {
     final response = await getAdminOnboardingWithHttpInfo();
     if (response.statusCode >= HttpStatus.badRequest) {
@@ -60,7 +64,9 @@ class SystemMetadataApi {
     return null;
   }
 
-  /// This endpoint is an admin-only route, and requires the `systemMetadata.read` permission.
+  /// Retrieve reverse geocoding state
+  ///
+  /// Retrieve the current state of the reverse geocoding import.
   ///
   /// Note: This method returns the HTTP [Response].
   Future<Response> getReverseGeocodingStateWithHttpInfo() async {
@@ -88,7 +94,9 @@ class SystemMetadataApi {
     );
   }
 
-  /// This endpoint is an admin-only route, and requires the `systemMetadata.read` permission.
+  /// Retrieve reverse geocoding state
+  ///
+  /// Retrieve the current state of the reverse geocoding import.
   Future<ReverseGeocodingStateResponseDto?> getReverseGeocodingState() async {
     final response = await getReverseGeocodingStateWithHttpInfo();
     if (response.statusCode >= HttpStatus.badRequest) {
@@ -104,7 +112,9 @@ class SystemMetadataApi {
     return null;
   }
 
-  /// This endpoint is an admin-only route, and requires the `systemMetadata.read` permission.
+  /// Retrieve version check state
+  ///
+  /// Retrieve the current state of the version check process.
   ///
   /// Note: This method returns the HTTP [Response].
   Future<Response> getVersionCheckStateWithHttpInfo() async {
@@ -132,7 +142,9 @@ class SystemMetadataApi {
     );
   }
 
-  /// This endpoint is an admin-only route, and requires the `systemMetadata.read` permission.
+  /// Retrieve version check state
+  ///
+  /// Retrieve the current state of the version check process.
   Future<VersionCheckStateResponseDto?> getVersionCheckState() async {
     final response = await getVersionCheckStateWithHttpInfo();
     if (response.statusCode >= HttpStatus.badRequest) {
@@ -148,7 +160,9 @@ class SystemMetadataApi {
     return null;
   }
 
-  /// This endpoint is an admin-only route, and requires the `systemMetadata.update` permission.
+  /// Update admin onboarding
+  ///
+  /// Update the admin onboarding status.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -180,7 +194,9 @@ class SystemMetadataApi {
     );
   }
 
-  /// This endpoint is an admin-only route, and requires the `systemMetadata.update` permission.
+  /// Update admin onboarding
+  ///
+  /// Update the admin onboarding status.
   ///
   /// Parameters:
   ///
diff --git a/mobile/openapi/lib/api/tags_api.dart b/mobile/openapi/lib/api/tags_api.dart
index a0cdb91acf..a6840f9483 100644
--- a/mobile/openapi/lib/api/tags_api.dart
+++ b/mobile/openapi/lib/api/tags_api.dart
@@ -16,7 +16,9 @@ class TagsApi {
 
   final ApiClient apiClient;
 
-  /// This endpoint requires the `tag.asset` permission.
+  /// Tag assets
+  ///
+  /// Add multiple tags to multiple assets in a single request.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -48,7 +50,9 @@ class TagsApi {
     );
   }
 
-  /// This endpoint requires the `tag.asset` permission.
+  /// Tag assets
+  ///
+  /// Add multiple tags to multiple assets in a single request.
   ///
   /// Parameters:
   ///
@@ -68,7 +72,9 @@ class TagsApi {
     return null;
   }
 
-  /// This endpoint requires the `tag.create` permission.
+  /// Create a tag
+  ///
+  /// Create a new tag by providing a name and optional color.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -100,7 +106,9 @@ class TagsApi {
     );
   }
 
-  /// This endpoint requires the `tag.create` permission.
+  /// Create a tag
+  ///
+  /// Create a new tag by providing a name and optional color.
   ///
   /// Parameters:
   ///
@@ -120,7 +128,9 @@ class TagsApi {
     return null;
   }
 
-  /// This endpoint requires the `tag.delete` permission.
+  /// Delete a tag
+  ///
+  /// Delete a specific tag by its ID.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -153,7 +163,9 @@ class TagsApi {
     );
   }
 
-  /// This endpoint requires the `tag.delete` permission.
+  /// Delete a tag
+  ///
+  /// Delete a specific tag by its ID.
   ///
   /// Parameters:
   ///
@@ -165,7 +177,9 @@ class TagsApi {
     }
   }
 
-  /// This endpoint requires the `tag.read` permission.
+  /// Retrieve tags
+  ///
+  /// Retrieve a list of all tags.
   ///
   /// Note: This method returns the HTTP [Response].
   Future<Response> getAllTagsWithHttpInfo() async {
@@ -193,7 +207,9 @@ class TagsApi {
     );
   }
 
-  /// This endpoint requires the `tag.read` permission.
+  /// Retrieve tags
+  ///
+  /// Retrieve a list of all tags.
   Future<List<TagResponseDto>?> getAllTags() async {
     final response = await getAllTagsWithHttpInfo();
     if (response.statusCode >= HttpStatus.badRequest) {
@@ -212,7 +228,9 @@ class TagsApi {
     return null;
   }
 
-  /// This endpoint requires the `tag.read` permission.
+  /// Retrieve a tag
+  ///
+  /// Retrieve a specific tag by its ID.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -245,7 +263,9 @@ class TagsApi {
     );
   }
 
-  /// This endpoint requires the `tag.read` permission.
+  /// Retrieve a tag
+  ///
+  /// Retrieve a specific tag by its ID.
   ///
   /// Parameters:
   ///
@@ -265,7 +285,9 @@ class TagsApi {
     return null;
   }
 
-  /// This endpoint requires the `tag.asset` permission.
+  /// Tag assets
+  ///
+  /// Add a tag to all the specified assets.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -300,7 +322,9 @@ class TagsApi {
     );
   }
 
-  /// This endpoint requires the `tag.asset` permission.
+  /// Tag assets
+  ///
+  /// Add a tag to all the specified assets.
   ///
   /// Parameters:
   ///
@@ -325,7 +349,9 @@ class TagsApi {
     return null;
   }
 
-  /// This endpoint requires the `tag.asset` permission.
+  /// Untag assets
+  ///
+  /// Remove a tag from all the specified assets.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -360,7 +386,9 @@ class TagsApi {
     );
   }
 
-  /// This endpoint requires the `tag.asset` permission.
+  /// Untag assets
+  ///
+  /// Remove a tag from all the specified assets.
   ///
   /// Parameters:
   ///
@@ -385,7 +413,9 @@ class TagsApi {
     return null;
   }
 
-  /// This endpoint requires the `tag.update` permission.
+  /// Update a tag
+  ///
+  /// Update an existing tag identified by its ID.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -420,7 +450,9 @@ class TagsApi {
     );
   }
 
-  /// This endpoint requires the `tag.update` permission.
+  /// Update a tag
+  ///
+  /// Update an existing tag identified by its ID.
   ///
   /// Parameters:
   ///
@@ -442,7 +474,9 @@ class TagsApi {
     return null;
   }
 
-  /// This endpoint requires the `tag.create` permission.
+  /// Upsert tags
+  ///
+  /// Create or update multiple tags in a single request.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -474,7 +508,9 @@ class TagsApi {
     );
   }
 
-  /// This endpoint requires the `tag.create` permission.
+  /// Upsert tags
+  ///
+  /// Create or update multiple tags in a single request.
   ///
   /// Parameters:
   ///
diff --git a/mobile/openapi/lib/api/timeline_api.dart b/mobile/openapi/lib/api/timeline_api.dart
index 70ac076c9d..2afcea20ff 100644
--- a/mobile/openapi/lib/api/timeline_api.dart
+++ b/mobile/openapi/lib/api/timeline_api.dart
@@ -16,7 +16,9 @@ class TimelineApi {
 
   final ApiClient apiClient;
 
-  /// This endpoint requires the `asset.read` permission.
+  /// Get time bucket
+  ///
+  /// Retrieve a string of all asset ids in a given time bucket.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -127,7 +129,9 @@ class TimelineApi {
     );
   }
 
-  /// This endpoint requires the `asset.read` permission.
+  /// Get time bucket
+  ///
+  /// Retrieve a string of all asset ids in a given time bucket.
   ///
   /// Parameters:
   ///
@@ -185,7 +189,9 @@ class TimelineApi {
     return null;
   }
 
-  /// This endpoint requires the `asset.read` permission.
+  /// Get time buckets
+  ///
+  /// Retrieve a list of all minimal time buckets.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -292,7 +298,9 @@ class TimelineApi {
     );
   }
 
-  /// This endpoint requires the `asset.read` permission.
+  /// Get time buckets
+  ///
+  /// Retrieve a list of all minimal time buckets.
   ///
   /// Parameters:
   ///
diff --git a/mobile/openapi/lib/api/trash_api.dart b/mobile/openapi/lib/api/trash_api.dart
index 480d19960a..f1dcbb8896 100644
--- a/mobile/openapi/lib/api/trash_api.dart
+++ b/mobile/openapi/lib/api/trash_api.dart
@@ -16,7 +16,9 @@ class TrashApi {
 
   final ApiClient apiClient;
 
-  /// This endpoint requires the `asset.delete` permission.
+  /// Empty trash
+  ///
+  /// Permanently delete all items in the trash.
   ///
   /// Note: This method returns the HTTP [Response].
   Future<Response> emptyTrashWithHttpInfo() async {
@@ -44,7 +46,9 @@ class TrashApi {
     );
   }
 
-  /// This endpoint requires the `asset.delete` permission.
+  /// Empty trash
+  ///
+  /// Permanently delete all items in the trash.
   Future<TrashResponseDto?> emptyTrash() async {
     final response = await emptyTrashWithHttpInfo();
     if (response.statusCode >= HttpStatus.badRequest) {
@@ -60,7 +64,9 @@ class TrashApi {
     return null;
   }
 
-  /// This endpoint requires the `asset.delete` permission.
+  /// Restore assets
+  ///
+  /// Restore specific assets from the trash.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -92,7 +98,9 @@ class TrashApi {
     );
   }
 
-  /// This endpoint requires the `asset.delete` permission.
+  /// Restore assets
+  ///
+  /// Restore specific assets from the trash.
   ///
   /// Parameters:
   ///
@@ -112,7 +120,9 @@ class TrashApi {
     return null;
   }
 
-  /// This endpoint requires the `asset.delete` permission.
+  /// Restore trash
+  ///
+  /// Restore all items in the trash.
   ///
   /// Note: This method returns the HTTP [Response].
   Future<Response> restoreTrashWithHttpInfo() async {
@@ -140,7 +150,9 @@ class TrashApi {
     );
   }
 
-  /// This endpoint requires the `asset.delete` permission.
+  /// Restore trash
+  ///
+  /// Restore all items in the trash.
   Future<TrashResponseDto?> restoreTrash() async {
     final response = await restoreTrashWithHttpInfo();
     if (response.statusCode >= HttpStatus.badRequest) {
diff --git a/mobile/openapi/lib/api/users_admin_api.dart b/mobile/openapi/lib/api/users_admin_api.dart
index 4a4301ff43..842a3ebc5b 100644
--- a/mobile/openapi/lib/api/users_admin_api.dart
+++ b/mobile/openapi/lib/api/users_admin_api.dart
@@ -16,7 +16,9 @@ class UsersAdminApi {
 
   final ApiClient apiClient;
 
-  /// This endpoint is an admin-only route, and requires the `adminUser.create` permission.
+  /// Create a user
+  ///
+  /// Create a new user.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -48,7 +50,9 @@ class UsersAdminApi {
     );
   }
 
-  /// This endpoint is an admin-only route, and requires the `adminUser.create` permission.
+  /// Create a user
+  ///
+  /// Create a new user.
   ///
   /// Parameters:
   ///
@@ -68,7 +72,9 @@ class UsersAdminApi {
     return null;
   }
 
-  /// This endpoint is an admin-only route, and requires the `adminUser.delete` permission.
+  /// Delete a user
+  ///
+  /// Delete a user.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -103,7 +109,9 @@ class UsersAdminApi {
     );
   }
 
-  /// This endpoint is an admin-only route, and requires the `adminUser.delete` permission.
+  /// Delete a user
+  ///
+  /// Delete a user.
   ///
   /// Parameters:
   ///
@@ -125,7 +133,9 @@ class UsersAdminApi {
     return null;
   }
 
-  /// This endpoint is an admin-only route, and requires the `adminUser.read` permission.
+  /// Retrieve a user
+  ///
+  /// Retrieve  a specific user by their ID.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -158,7 +168,9 @@ class UsersAdminApi {
     );
   }
 
-  /// This endpoint is an admin-only route, and requires the `adminUser.read` permission.
+  /// Retrieve a user
+  ///
+  /// Retrieve  a specific user by their ID.
   ///
   /// Parameters:
   ///
@@ -178,7 +190,9 @@ class UsersAdminApi {
     return null;
   }
 
-  /// This endpoint is an admin-only route, and requires the `adminUser.read` permission.
+  /// Retrieve user preferences
+  ///
+  /// Retrieve the preferences of a specific user.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -211,7 +225,9 @@ class UsersAdminApi {
     );
   }
 
-  /// This endpoint is an admin-only route, and requires the `adminUser.read` permission.
+  /// Retrieve user preferences
+  ///
+  /// Retrieve the preferences of a specific user.
   ///
   /// Parameters:
   ///
@@ -231,7 +247,9 @@ class UsersAdminApi {
     return null;
   }
 
-  /// This endpoint is an admin-only route, and requires the `adminSession.read` permission.
+  /// Retrieve user sessions
+  ///
+  /// Retrieve all sessions for a specific user.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -264,7 +282,9 @@ class UsersAdminApi {
     );
   }
 
-  /// This endpoint is an admin-only route, and requires the `adminSession.read` permission.
+  /// Retrieve user sessions
+  ///
+  /// Retrieve all sessions for a specific user.
   ///
   /// Parameters:
   ///
@@ -287,7 +307,9 @@ class UsersAdminApi {
     return null;
   }
 
-  /// This endpoint is an admin-only route, and requires the `adminUser.read` permission.
+  /// Retrieve user statistics
+  ///
+  /// Retrieve asset statistics for a specific user.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -336,7 +358,9 @@ class UsersAdminApi {
     );
   }
 
-  /// This endpoint is an admin-only route, and requires the `adminUser.read` permission.
+  /// Retrieve user statistics
+  ///
+  /// Retrieve asset statistics for a specific user.
   ///
   /// Parameters:
   ///
@@ -362,7 +386,9 @@ class UsersAdminApi {
     return null;
   }
 
-  /// This endpoint is an admin-only route, and requires the `adminUser.delete` permission.
+  /// Restore a deleted user
+  ///
+  /// Restore a previously deleted user.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -395,7 +421,9 @@ class UsersAdminApi {
     );
   }
 
-  /// This endpoint is an admin-only route, and requires the `adminUser.delete` permission.
+  /// Restore a deleted user
+  ///
+  /// Restore a previously deleted user.
   ///
   /// Parameters:
   ///
@@ -415,7 +443,9 @@ class UsersAdminApi {
     return null;
   }
 
-  /// This endpoint is an admin-only route, and requires the `adminUser.read` permission.
+  /// Search users
+  ///
+  /// Search for users.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -456,7 +486,9 @@ class UsersAdminApi {
     );
   }
 
-  /// This endpoint is an admin-only route, and requires the `adminUser.read` permission.
+  /// Search users
+  ///
+  /// Search for users.
   ///
   /// Parameters:
   ///
@@ -481,7 +513,9 @@ class UsersAdminApi {
     return null;
   }
 
-  /// This endpoint is an admin-only route, and requires the `adminUser.update` permission.
+  /// Update a user
+  ///
+  /// Update an existing user.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -516,7 +550,9 @@ class UsersAdminApi {
     );
   }
 
-  /// This endpoint is an admin-only route, and requires the `adminUser.update` permission.
+  /// Update a user
+  ///
+  /// Update an existing user.
   ///
   /// Parameters:
   ///
@@ -538,7 +574,9 @@ class UsersAdminApi {
     return null;
   }
 
-  /// This endpoint is an admin-only route, and requires the `adminUser.update` permission.
+  /// Update user preferences
+  ///
+  /// Update the preferences of a specific user.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -573,7 +611,9 @@ class UsersAdminApi {
     );
   }
 
-  /// This endpoint is an admin-only route, and requires the `adminUser.update` permission.
+  /// Update user preferences
+  ///
+  /// Update the preferences of a specific user.
   ///
   /// Parameters:
   ///
diff --git a/mobile/openapi/lib/api/users_api.dart b/mobile/openapi/lib/api/users_api.dart
index c8891ba0c2..f398d9c813 100644
--- a/mobile/openapi/lib/api/users_api.dart
+++ b/mobile/openapi/lib/api/users_api.dart
@@ -16,7 +16,9 @@ class UsersApi {
 
   final ApiClient apiClient;
 
-  /// This endpoint requires the `userProfileImage.update` permission.
+  /// Create user profile image
+  ///
+  /// Upload and set a new profile image for the current user.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -58,7 +60,9 @@ class UsersApi {
     );
   }
 
-  /// This endpoint requires the `userProfileImage.update` permission.
+  /// Create user profile image
+  ///
+  /// Upload and set a new profile image for the current user.
   ///
   /// Parameters:
   ///
@@ -78,7 +82,9 @@ class UsersApi {
     return null;
   }
 
-  /// This endpoint requires the `userProfileImage.delete` permission.
+  /// Delete user profile image
+  ///
+  /// Delete the profile image of the current user.
   ///
   /// Note: This method returns the HTTP [Response].
   Future<Response> deleteProfileImageWithHttpInfo() async {
@@ -106,7 +112,9 @@ class UsersApi {
     );
   }
 
-  /// This endpoint requires the `userProfileImage.delete` permission.
+  /// Delete user profile image
+  ///
+  /// Delete the profile image of the current user.
   Future<void> deleteProfileImage() async {
     final response = await deleteProfileImageWithHttpInfo();
     if (response.statusCode >= HttpStatus.badRequest) {
@@ -114,7 +122,9 @@ class UsersApi {
     }
   }
 
-  /// This endpoint requires the `userLicense.delete` permission.
+  /// Delete user product key
+  ///
+  /// Delete the registered product key for the current user.
   ///
   /// Note: This method returns the HTTP [Response].
   Future<Response> deleteUserLicenseWithHttpInfo() async {
@@ -142,7 +152,9 @@ class UsersApi {
     );
   }
 
-  /// This endpoint requires the `userLicense.delete` permission.
+  /// Delete user product key
+  ///
+  /// Delete the registered product key for the current user.
   Future<void> deleteUserLicense() async {
     final response = await deleteUserLicenseWithHttpInfo();
     if (response.statusCode >= HttpStatus.badRequest) {
@@ -150,7 +162,9 @@ class UsersApi {
     }
   }
 
-  /// This endpoint requires the `userOnboarding.delete` permission.
+  /// Delete user onboarding
+  ///
+  /// Delete the onboarding status of the current user.
   ///
   /// Note: This method returns the HTTP [Response].
   Future<Response> deleteUserOnboardingWithHttpInfo() async {
@@ -178,7 +192,9 @@ class UsersApi {
     );
   }
 
-  /// This endpoint requires the `userOnboarding.delete` permission.
+  /// Delete user onboarding
+  ///
+  /// Delete the onboarding status of the current user.
   Future<void> deleteUserOnboarding() async {
     final response = await deleteUserOnboardingWithHttpInfo();
     if (response.statusCode >= HttpStatus.badRequest) {
@@ -186,7 +202,9 @@ class UsersApi {
     }
   }
 
-  /// This endpoint requires the `userPreference.read` permission.
+  /// Get my preferences
+  ///
+  /// Retrieve the preferences for the current user.
   ///
   /// Note: This method returns the HTTP [Response].
   Future<Response> getMyPreferencesWithHttpInfo() async {
@@ -214,7 +232,9 @@ class UsersApi {
     );
   }
 
-  /// This endpoint requires the `userPreference.read` permission.
+  /// Get my preferences
+  ///
+  /// Retrieve the preferences for the current user.
   Future<UserPreferencesResponseDto?> getMyPreferences() async {
     final response = await getMyPreferencesWithHttpInfo();
     if (response.statusCode >= HttpStatus.badRequest) {
@@ -230,7 +250,9 @@ class UsersApi {
     return null;
   }
 
-  /// This endpoint requires the `user.read` permission.
+  /// Get current user
+  ///
+  /// Retrieve information about the user making the API request.
   ///
   /// Note: This method returns the HTTP [Response].
   Future<Response> getMyUserWithHttpInfo() async {
@@ -258,7 +280,9 @@ class UsersApi {
     );
   }
 
-  /// This endpoint requires the `user.read` permission.
+  /// Get current user
+  ///
+  /// Retrieve information about the user making the API request.
   Future<UserAdminResponseDto?> getMyUser() async {
     final response = await getMyUserWithHttpInfo();
     if (response.statusCode >= HttpStatus.badRequest) {
@@ -274,7 +298,9 @@ class UsersApi {
     return null;
   }
 
-  /// This endpoint requires the `userProfileImage.read` permission.
+  /// Retrieve user profile image
+  ///
+  /// Retrieve the profile image file for a user.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -307,7 +333,9 @@ class UsersApi {
     );
   }
 
-  /// This endpoint requires the `userProfileImage.read` permission.
+  /// Retrieve user profile image
+  ///
+  /// Retrieve the profile image file for a user.
   ///
   /// Parameters:
   ///
@@ -327,7 +355,9 @@ class UsersApi {
     return null;
   }
 
-  /// This endpoint requires the `user.read` permission.
+  /// Retrieve a user
+  ///
+  /// Retrieve a specific user by their ID.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -360,7 +390,9 @@ class UsersApi {
     );
   }
 
-  /// This endpoint requires the `user.read` permission.
+  /// Retrieve a user
+  ///
+  /// Retrieve a specific user by their ID.
   ///
   /// Parameters:
   ///
@@ -380,7 +412,9 @@ class UsersApi {
     return null;
   }
 
-  /// This endpoint requires the `userLicense.read` permission.
+  /// Retrieve user product key
+  ///
+  /// Retrieve information about whether the current user has a registered product key.
   ///
   /// Note: This method returns the HTTP [Response].
   Future<Response> getUserLicenseWithHttpInfo() async {
@@ -408,7 +442,9 @@ class UsersApi {
     );
   }
 
-  /// This endpoint requires the `userLicense.read` permission.
+  /// Retrieve user product key
+  ///
+  /// Retrieve information about whether the current user has a registered product key.
   Future<LicenseResponseDto?> getUserLicense() async {
     final response = await getUserLicenseWithHttpInfo();
     if (response.statusCode >= HttpStatus.badRequest) {
@@ -424,7 +460,9 @@ class UsersApi {
     return null;
   }
 
-  /// This endpoint requires the `userOnboarding.read` permission.
+  /// Retrieve user onboarding
+  ///
+  /// Retrieve the onboarding status of the current user.
   ///
   /// Note: This method returns the HTTP [Response].
   Future<Response> getUserOnboardingWithHttpInfo() async {
@@ -452,7 +490,9 @@ class UsersApi {
     );
   }
 
-  /// This endpoint requires the `userOnboarding.read` permission.
+  /// Retrieve user onboarding
+  ///
+  /// Retrieve the onboarding status of the current user.
   Future<OnboardingResponseDto?> getUserOnboarding() async {
     final response = await getUserOnboardingWithHttpInfo();
     if (response.statusCode >= HttpStatus.badRequest) {
@@ -468,7 +508,9 @@ class UsersApi {
     return null;
   }
 
-  /// This endpoint requires the `user.read` permission.
+  /// Get all users
+  ///
+  /// Retrieve a list of all users on the server.
   ///
   /// Note: This method returns the HTTP [Response].
   Future<Response> searchUsersWithHttpInfo() async {
@@ -496,7 +538,9 @@ class UsersApi {
     );
   }
 
-  /// This endpoint requires the `user.read` permission.
+  /// Get all users
+  ///
+  /// Retrieve a list of all users on the server.
   Future<List<UserResponseDto>?> searchUsers() async {
     final response = await searchUsersWithHttpInfo();
     if (response.statusCode >= HttpStatus.badRequest) {
@@ -515,7 +559,9 @@ class UsersApi {
     return null;
   }
 
-  /// This endpoint requires the `userLicense.update` permission.
+  /// Set user product key
+  ///
+  /// Register a product key for the current user.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -547,7 +593,9 @@ class UsersApi {
     );
   }
 
-  /// This endpoint requires the `userLicense.update` permission.
+  /// Set user product key
+  ///
+  /// Register a product key for the current user.
   ///
   /// Parameters:
   ///
@@ -567,7 +615,9 @@ class UsersApi {
     return null;
   }
 
-  /// This endpoint requires the `userOnboarding.update` permission.
+  /// Update user onboarding
+  ///
+  /// Update the onboarding status of the current user.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -599,7 +649,9 @@ class UsersApi {
     );
   }
 
-  /// This endpoint requires the `userOnboarding.update` permission.
+  /// Update user onboarding
+  ///
+  /// Update the onboarding status of the current user.
   ///
   /// Parameters:
   ///
@@ -619,7 +671,9 @@ class UsersApi {
     return null;
   }
 
-  /// This endpoint requires the `userPreference.update` permission.
+  /// Update my preferences
+  ///
+  /// Update the preferences of the current user.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -651,7 +705,9 @@ class UsersApi {
     );
   }
 
-  /// This endpoint requires the `userPreference.update` permission.
+  /// Update my preferences
+  ///
+  /// Update the preferences of the current user.
   ///
   /// Parameters:
   ///
@@ -671,7 +727,9 @@ class UsersApi {
     return null;
   }
 
-  /// This endpoint requires the `user.update` permission.
+  /// Update current user
+  ///
+  /// Update the current user making teh API request.
   ///
   /// Note: This method returns the HTTP [Response].
   ///
@@ -703,7 +761,9 @@ class UsersApi {
     );
   }
 
-  /// This endpoint requires the `user.update` permission.
+  /// Update current user
+  ///
+  /// Update the current user making teh API request.
   ///
   /// Parameters:
   ///
diff --git a/mobile/openapi/lib/api/view_api.dart b/mobile/openapi/lib/api/views_api.dart
similarity index 83%
rename from mobile/openapi/lib/api/view_api.dart
rename to mobile/openapi/lib/api/views_api.dart
index 1fcaec759c..a45e89d58f 100644
--- a/mobile/openapi/lib/api/view_api.dart
+++ b/mobile/openapi/lib/api/views_api.dart
@@ -11,12 +11,17 @@
 part of openapi.api;
 
 
-class ViewApi {
-  ViewApi([ApiClient? apiClient]) : apiClient = apiClient ?? defaultApiClient;
+class ViewsApi {
+  ViewsApi([ApiClient? apiClient]) : apiClient = apiClient ?? defaultApiClient;
 
   final ApiClient apiClient;
 
-  /// Performs an HTTP 'GET /view/folder' operation and returns the [Response].
+  /// Retrieve assets by original path
+  ///
+  /// Retrieve assets that are children of a specific folder.
+  ///
+  /// Note: This method returns the HTTP [Response].
+  ///
   /// Parameters:
   ///
   /// * [String] path (required):
@@ -47,6 +52,10 @@ class ViewApi {
     );
   }
 
+  /// Retrieve assets by original path
+  ///
+  /// Retrieve assets that are children of a specific folder.
+  ///
   /// Parameters:
   ///
   /// * [String] path (required):
@@ -68,7 +77,11 @@ class ViewApi {
     return null;
   }
 
-  /// Performs an HTTP 'GET /view/folder/unique-paths' operation and returns the [Response].
+  /// Retrieve unique paths
+  ///
+  /// Retrieve a list of unique folder paths from asset original paths.
+  ///
+  /// Note: This method returns the HTTP [Response].
   Future<Response> getUniqueOriginalPathsWithHttpInfo() async {
     // ignore: prefer_const_declarations
     final apiPath = r'/view/folder/unique-paths';
@@ -94,6 +107,9 @@ class ViewApi {
     );
   }
 
+  /// Retrieve unique paths
+  ///
+  /// Retrieve a list of unique folder paths from asset original paths.
   Future<List<String>?> getUniqueOriginalPaths() async {
     final response = await getUniqueOriginalPathsWithHttpInfo();
     if (response.statusCode >= HttpStatus.badRequest) {
diff --git a/open-api/immich-openapi-specs.json b/open-api/immich-openapi-specs.json
index ed3d7a0bab..c6dc9061e9 100644
--- a/open-api/immich-openapi-specs.json
+++ b/open-api/immich-openapi-specs.json
@@ -3,6 +3,7 @@
   "paths": {
     "/activities": {
       "get": {
+        "description": "Returns a list of activities for the selected asset or album. The activities are returned in sorted order, with the oldest activities appearing first.",
         "operationId": "getActivities",
         "parameters": [
           {
@@ -75,13 +76,14 @@
             "api_key": []
           }
         ],
+        "summary": "List all activities",
         "tags": [
           "Activities"
         ],
-        "x-immich-permission": "activity.read",
-        "description": "This endpoint requires the `activity.read` permission."
+        "x-immich-permission": "activity.read"
       },
       "post": {
+        "description": "Create a like or a comment for an album, or an asset in an album.",
         "operationId": "createActivity",
         "parameters": [],
         "requestBody": {
@@ -117,15 +119,16 @@
             "api_key": []
           }
         ],
+        "summary": "Create an activity",
         "tags": [
           "Activities"
         ],
-        "x-immich-permission": "activity.create",
-        "description": "This endpoint requires the `activity.create` permission."
+        "x-immich-permission": "activity.create"
       }
     },
     "/activities/statistics": {
       "get": {
+        "description": "Returns the number of likes and comments for a given album or asset in an album.",
         "operationId": "getActivityStatistics",
         "parameters": [
           {
@@ -170,15 +173,16 @@
             "api_key": []
           }
         ],
+        "summary": "Retrieve activity statistics",
         "tags": [
           "Activities"
         ],
-        "x-immich-permission": "activity.statistics",
-        "description": "This endpoint requires the `activity.statistics` permission."
+        "x-immich-permission": "activity.statistics"
       }
     },
     "/activities/{id}": {
       "delete": {
+        "description": "Removes a like or comment from a given album or asset in an album.",
         "operationId": "deleteActivity",
         "parameters": [
           {
@@ -207,15 +211,16 @@
             "api_key": []
           }
         ],
+        "summary": "Delete an activity",
         "tags": [
           "Activities"
         ],
-        "x-immich-permission": "activity.delete",
-        "description": "This endpoint requires the `activity.delete` permission."
+        "x-immich-permission": "activity.delete"
       }
     },
     "/admin/auth/unlink-all": {
       "post": {
+        "description": "Unlinks all OAuth accounts associated with user accounts in the system.",
         "operationId": "unlinkAllOAuthAccountsAdmin",
         "parameters": [],
         "responses": {
@@ -234,16 +239,17 @@
             "api_key": []
           }
         ],
+        "summary": "Unlink all OAuth accounts",
         "tags": [
-          "Auth (admin)"
+          "Authentication (admin)"
         ],
         "x-immich-admin-only": true,
-        "x-immich-permission": "adminAuth.unlinkAll",
-        "description": "This endpoint is an admin-only route, and requires the `adminAuth.unlinkAll` permission."
+        "x-immich-permission": "adminAuth.unlinkAll"
       }
     },
     "/admin/notifications": {
       "post": {
+        "description": "Create a new notification for a specific user.",
         "operationId": "createNotification",
         "parameters": [],
         "requestBody": {
@@ -279,14 +285,16 @@
             "api_key": []
           }
         ],
+        "summary": "Create a notification",
         "tags": [
-          "Notifications (Admin)"
+          "Notifications (admin)"
         ],
         "x-immich-admin-only": true
       }
     },
     "/admin/notifications/templates/{name}": {
       "post": {
+        "description": "Retrieve a preview of the provided email template.",
         "operationId": "getNotificationTemplateAdmin",
         "parameters": [
           {
@@ -331,14 +339,16 @@
             "api_key": []
           }
         ],
+        "summary": "Render email template",
         "tags": [
-          "Notifications (Admin)"
+          "Notifications (admin)"
         ],
         "x-immich-admin-only": true
       }
     },
     "/admin/notifications/test-email": {
       "post": {
+        "description": "Send a test email using the provided SMTP configuration.",
         "operationId": "sendTestEmailAdmin",
         "parameters": [],
         "requestBody": {
@@ -374,14 +384,16 @@
             "api_key": []
           }
         ],
+        "summary": "Send test email",
         "tags": [
-          "Notifications (Admin)"
+          "Notifications (admin)"
         ],
         "x-immich-admin-only": true
       }
     },
     "/admin/users": {
       "get": {
+        "description": "Search for users.",
         "operationId": "searchUsersAdmin",
         "parameters": [
           {
@@ -428,14 +440,15 @@
             "api_key": []
           }
         ],
+        "summary": "Search users",
         "tags": [
           "Users (admin)"
         ],
         "x-immich-admin-only": true,
-        "x-immich-permission": "adminUser.read",
-        "description": "This endpoint is an admin-only route, and requires the `adminUser.read` permission."
+        "x-immich-permission": "adminUser.read"
       },
       "post": {
+        "description": "Create a new user.",
         "operationId": "createUserAdmin",
         "parameters": [],
         "requestBody": {
@@ -471,16 +484,17 @@
             "api_key": []
           }
         ],
+        "summary": "Create a user",
         "tags": [
           "Users (admin)"
         ],
         "x-immich-admin-only": true,
-        "x-immich-permission": "adminUser.create",
-        "description": "This endpoint is an admin-only route, and requires the `adminUser.create` permission."
+        "x-immich-permission": "adminUser.create"
       }
     },
     "/admin/users/{id}": {
       "delete": {
+        "description": "Delete a user.",
         "operationId": "deleteUserAdmin",
         "parameters": [
           {
@@ -526,14 +540,15 @@
             "api_key": []
           }
         ],
+        "summary": "Delete a user",
         "tags": [
           "Users (admin)"
         ],
         "x-immich-admin-only": true,
-        "x-immich-permission": "adminUser.delete",
-        "description": "This endpoint is an admin-only route, and requires the `adminUser.delete` permission."
+        "x-immich-permission": "adminUser.delete"
       },
       "get": {
+        "description": "Retrieve  a specific user by their ID.",
         "operationId": "getUserAdmin",
         "parameters": [
           {
@@ -569,14 +584,15 @@
             "api_key": []
           }
         ],
+        "summary": "Retrieve a user",
         "tags": [
           "Users (admin)"
         ],
         "x-immich-admin-only": true,
-        "x-immich-permission": "adminUser.read",
-        "description": "This endpoint is an admin-only route, and requires the `adminUser.read` permission."
+        "x-immich-permission": "adminUser.read"
       },
       "put": {
+        "description": "Update an existing user.",
         "operationId": "updateUserAdmin",
         "parameters": [
           {
@@ -622,16 +638,17 @@
             "api_key": []
           }
         ],
+        "summary": "Update a user",
         "tags": [
           "Users (admin)"
         ],
         "x-immich-admin-only": true,
-        "x-immich-permission": "adminUser.update",
-        "description": "This endpoint is an admin-only route, and requires the `adminUser.update` permission."
+        "x-immich-permission": "adminUser.update"
       }
     },
     "/admin/users/{id}/preferences": {
       "get": {
+        "description": "Retrieve the preferences of a specific user.",
         "operationId": "getUserPreferencesAdmin",
         "parameters": [
           {
@@ -667,14 +684,15 @@
             "api_key": []
           }
         ],
+        "summary": "Retrieve user preferences",
         "tags": [
           "Users (admin)"
         ],
         "x-immich-admin-only": true,
-        "x-immich-permission": "adminUser.read",
-        "description": "This endpoint is an admin-only route, and requires the `adminUser.read` permission."
+        "x-immich-permission": "adminUser.read"
       },
       "put": {
+        "description": "Update the preferences of a specific user.",
         "operationId": "updateUserPreferencesAdmin",
         "parameters": [
           {
@@ -720,16 +738,17 @@
             "api_key": []
           }
         ],
+        "summary": "Update user preferences",
         "tags": [
           "Users (admin)"
         ],
         "x-immich-admin-only": true,
-        "x-immich-permission": "adminUser.update",
-        "description": "This endpoint is an admin-only route, and requires the `adminUser.update` permission."
+        "x-immich-permission": "adminUser.update"
       }
     },
     "/admin/users/{id}/restore": {
       "post": {
+        "description": "Restore a previously deleted user.",
         "operationId": "restoreUserAdmin",
         "parameters": [
           {
@@ -765,16 +784,17 @@
             "api_key": []
           }
         ],
+        "summary": "Restore a deleted user",
         "tags": [
           "Users (admin)"
         ],
         "x-immich-admin-only": true,
-        "x-immich-permission": "adminUser.delete",
-        "description": "This endpoint is an admin-only route, and requires the `adminUser.delete` permission."
+        "x-immich-permission": "adminUser.delete"
       }
     },
     "/admin/users/{id}/sessions": {
       "get": {
+        "description": "Retrieve all sessions for a specific user.",
         "operationId": "getUserSessionsAdmin",
         "parameters": [
           {
@@ -813,16 +833,17 @@
             "api_key": []
           }
         ],
+        "summary": "Retrieve user sessions",
         "tags": [
           "Users (admin)"
         ],
         "x-immich-admin-only": true,
-        "x-immich-permission": "adminSession.read",
-        "description": "This endpoint is an admin-only route, and requires the `adminSession.read` permission."
+        "x-immich-permission": "adminSession.read"
       }
     },
     "/admin/users/{id}/statistics": {
       "get": {
+        "description": "Retrieve asset statistics for a specific user.",
         "operationId": "getUserStatisticsAdmin",
         "parameters": [
           {
@@ -882,16 +903,17 @@
             "api_key": []
           }
         ],
+        "summary": "Retrieve user statistics",
         "tags": [
           "Users (admin)"
         ],
         "x-immich-admin-only": true,
-        "x-immich-permission": "adminUser.read",
-        "description": "This endpoint is an admin-only route, and requires the `adminUser.read` permission."
+        "x-immich-permission": "adminUser.read"
       }
     },
     "/albums": {
       "get": {
+        "description": "Retrieve a list of albums available to the authenticated user.",
         "operationId": "getAllAlbums",
         "parameters": [
           {
@@ -939,13 +961,14 @@
             "api_key": []
           }
         ],
+        "summary": "List all albums",
         "tags": [
           "Albums"
         ],
-        "x-immich-permission": "album.read",
-        "description": "This endpoint requires the `album.read` permission."
+        "x-immich-permission": "album.read"
       },
       "post": {
+        "description": "Create a new album. The album can also be created with initial users and assets.",
         "operationId": "createAlbum",
         "parameters": [],
         "requestBody": {
@@ -981,15 +1004,16 @@
             "api_key": []
           }
         ],
+        "summary": "Create an album",
         "tags": [
           "Albums"
         ],
-        "x-immich-permission": "album.create",
-        "description": "This endpoint requires the `album.create` permission."
+        "x-immich-permission": "album.create"
       }
     },
     "/albums/assets": {
       "put": {
+        "description": "Send a list of asset IDs and album IDs to add each asset to each album.",
         "operationId": "addAssetsToAlbums",
         "parameters": [
           {
@@ -1042,15 +1066,16 @@
             "api_key": []
           }
         ],
+        "summary": "Add assets to albums",
         "tags": [
           "Albums"
         ],
-        "x-immich-permission": "albumAsset.create",
-        "description": "This endpoint requires the `albumAsset.create` permission."
+        "x-immich-permission": "albumAsset.create"
       }
     },
     "/albums/statistics": {
       "get": {
+        "description": "Returns statistics about the albums available to the authenticated user.",
         "operationId": "getAlbumStatistics",
         "parameters": [],
         "responses": {
@@ -1076,15 +1101,16 @@
             "api_key": []
           }
         ],
+        "summary": "Retrieve album statistics",
         "tags": [
           "Albums"
         ],
-        "x-immich-permission": "album.statistics",
-        "description": "This endpoint requires the `album.statistics` permission."
+        "x-immich-permission": "album.statistics"
       }
     },
     "/albums/{id}": {
       "delete": {
+        "description": "Delete a specific album by its ID. Note the album is initially trashed and then immediately scheduled for deletion, but relies on a background job to complete the process.",
         "operationId": "deleteAlbum",
         "parameters": [
           {
@@ -1113,13 +1139,14 @@
             "api_key": []
           }
         ],
+        "summary": "Delete an album",
         "tags": [
           "Albums"
         ],
-        "x-immich-permission": "album.delete",
-        "description": "This endpoint requires the `album.delete` permission."
+        "x-immich-permission": "album.delete"
       },
       "get": {
+        "description": "Retrieve information about a specific album by its ID.",
         "operationId": "getAlbumInfo",
         "parameters": [
           {
@@ -1179,13 +1206,14 @@
             "api_key": []
           }
         ],
+        "summary": "Retrieve an album",
         "tags": [
           "Albums"
         ],
-        "x-immich-permission": "album.read",
-        "description": "This endpoint requires the `album.read` permission."
+        "x-immich-permission": "album.read"
       },
       "patch": {
+        "description": "Update the information of a specific album by its ID. This endpoint can be used to update the album name, description, sort order, etc. However, it is not used to add or remove assets or users from the album.",
         "operationId": "updateAlbumInfo",
         "parameters": [
           {
@@ -1231,15 +1259,16 @@
             "api_key": []
           }
         ],
+        "summary": "Update an album",
         "tags": [
           "Albums"
         ],
-        "x-immich-permission": "album.update",
-        "description": "This endpoint requires the `album.update` permission."
+        "x-immich-permission": "album.update"
       }
     },
     "/albums/{id}/assets": {
       "delete": {
+        "description": "Remove multiple assets from a specific album by its ID.",
         "operationId": "removeAssetFromAlbum",
         "parameters": [
           {
@@ -1288,13 +1317,14 @@
             "api_key": []
           }
         ],
+        "summary": "Remove assets from an album",
         "tags": [
           "Albums"
         ],
-        "x-immich-permission": "albumAsset.delete",
-        "description": "This endpoint requires the `albumAsset.delete` permission."
+        "x-immich-permission": "albumAsset.delete"
       },
       "put": {
+        "description": "Add multiple assets to a specific album by its ID.",
         "operationId": "addAssetsToAlbum",
         "parameters": [
           {
@@ -1359,15 +1389,16 @@
             "api_key": []
           }
         ],
+        "summary": "Add assets to an album",
         "tags": [
           "Albums"
         ],
-        "x-immich-permission": "albumAsset.create",
-        "description": "This endpoint requires the `albumAsset.create` permission."
+        "x-immich-permission": "albumAsset.create"
       }
     },
     "/albums/{id}/user/{userId}": {
       "delete": {
+        "description": "Remove a user from an album. Use an ID of \"me\" to leave a shared album.",
         "operationId": "removeUserFromAlbum",
         "parameters": [
           {
@@ -1404,13 +1435,14 @@
             "api_key": []
           }
         ],
+        "summary": "Remove user from album",
         "tags": [
           "Albums"
         ],
-        "x-immich-permission": "albumUser.delete",
-        "description": "This endpoint requires the `albumUser.delete` permission."
+        "x-immich-permission": "albumUser.delete"
       },
       "put": {
+        "description": "Change the role for a specific user in a specific album.",
         "operationId": "updateAlbumUser",
         "parameters": [
           {
@@ -1457,15 +1489,16 @@
             "api_key": []
           }
         ],
+        "summary": "Update user role",
         "tags": [
           "Albums"
         ],
-        "x-immich-permission": "albumUser.update",
-        "description": "This endpoint requires the `albumUser.update` permission."
+        "x-immich-permission": "albumUser.update"
       }
     },
     "/albums/{id}/users": {
       "put": {
+        "description": "Share an album with multiple users. Each user can be given a specific role in the album.",
         "operationId": "addUsersToAlbum",
         "parameters": [
           {
@@ -1511,15 +1544,16 @@
             "api_key": []
           }
         ],
+        "summary": "Share album with users",
         "tags": [
           "Albums"
         ],
-        "x-immich-permission": "albumUser.create",
-        "description": "This endpoint requires the `albumUser.create` permission."
+        "x-immich-permission": "albumUser.create"
       }
     },
     "/api-keys": {
       "get": {
+        "description": "Retrieve all API keys of the current user.",
         "operationId": "getApiKeys",
         "parameters": [],
         "responses": {
@@ -1548,13 +1582,14 @@
             "api_key": []
           }
         ],
+        "summary": "List all API keys",
         "tags": [
-          "API Keys"
+          "API keys"
         ],
-        "x-immich-permission": "apiKey.read",
-        "description": "This endpoint requires the `apiKey.read` permission."
+        "x-immich-permission": "apiKey.read"
       },
       "post": {
+        "description": "Creates a new API key. It will be limited to the permissions specified.",
         "operationId": "createApiKey",
         "parameters": [],
         "requestBody": {
@@ -1590,15 +1625,16 @@
             "api_key": []
           }
         ],
+        "summary": "Create an API key",
         "tags": [
-          "API Keys"
+          "API keys"
         ],
-        "x-immich-permission": "apiKey.create",
-        "description": "This endpoint requires the `apiKey.create` permission."
+        "x-immich-permission": "apiKey.create"
       }
     },
     "/api-keys/me": {
       "get": {
+        "description": "Retrieve the API key that is used to access this endpoint.",
         "operationId": "getMyApiKey",
         "parameters": [],
         "responses": {
@@ -1624,13 +1660,15 @@
             "api_key": []
           }
         ],
+        "summary": "Retrieve the current API key",
         "tags": [
-          "API Keys"
+          "API keys"
         ]
       }
     },
     "/api-keys/{id}": {
       "delete": {
+        "description": "Deletes an API key identified by its ID. The current user must own this API key.",
         "operationId": "deleteApiKey",
         "parameters": [
           {
@@ -1659,13 +1697,14 @@
             "api_key": []
           }
         ],
+        "summary": "Delete an API key",
         "tags": [
-          "API Keys"
+          "API keys"
         ],
-        "x-immich-permission": "apiKey.delete",
-        "description": "This endpoint requires the `apiKey.delete` permission."
+        "x-immich-permission": "apiKey.delete"
       },
       "get": {
+        "description": "Retrieve an API key by its ID. The current user must own this API key.",
         "operationId": "getApiKey",
         "parameters": [
           {
@@ -1701,13 +1740,14 @@
             "api_key": []
           }
         ],
+        "summary": "Retrieve an API key",
         "tags": [
-          "API Keys"
+          "API keys"
         ],
-        "x-immich-permission": "apiKey.read",
-        "description": "This endpoint requires the `apiKey.read` permission."
+        "x-immich-permission": "apiKey.read"
       },
       "put": {
+        "description": "Updates the name and permissions of an API key by its ID. The current user must own this API key.",
         "operationId": "updateApiKey",
         "parameters": [
           {
@@ -1753,15 +1793,16 @@
             "api_key": []
           }
         ],
+        "summary": "Update an API key",
         "tags": [
-          "API Keys"
+          "API keys"
         ],
-        "x-immich-permission": "apiKey.update",
-        "description": "This endpoint requires the `apiKey.update` permission."
+        "x-immich-permission": "apiKey.update"
       }
     },
     "/assets": {
       "delete": {
+        "description": "Deletes multiple assets at the same time.",
         "operationId": "deleteAssets",
         "parameters": [],
         "requestBody": {
@@ -1790,13 +1831,14 @@
             "api_key": []
           }
         ],
+        "summary": "Delete assets",
         "tags": [
           "Assets"
         ],
-        "x-immich-permission": "asset.delete",
-        "description": "This endpoint requires the `asset.delete` permission."
+        "x-immich-permission": "asset.delete"
       },
       "post": {
+        "description": "Uploads a new asset to the server.",
         "operationId": "uploadAsset",
         "parameters": [
           {
@@ -1859,13 +1901,14 @@
             "api_key": []
           }
         ],
+        "summary": "Upload asset",
         "tags": [
           "Assets"
         ],
-        "x-immich-permission": "asset.upload",
-        "description": "This endpoint requires the `asset.upload` permission."
+        "x-immich-permission": "asset.upload"
       },
       "put": {
+        "description": "Updates multiple assets at the same time.",
         "operationId": "updateAssets",
         "parameters": [],
         "requestBody": {
@@ -1894,16 +1937,16 @@
             "api_key": []
           }
         ],
+        "summary": "Update assets",
         "tags": [
           "Assets"
         ],
-        "x-immich-permission": "asset.update",
-        "description": "This endpoint requires the `asset.update` permission."
+        "x-immich-permission": "asset.update"
       }
     },
     "/assets/bulk-upload-check": {
       "post": {
-        "description": "Checks if assets exist by checksums. This endpoint requires the `asset.upload` permission.",
+        "description": "Determine which assets have already been uploaded to the server based on their SHA1 checksums.",
         "operationId": "checkBulkUpload",
         "parameters": [],
         "requestBody": {
@@ -1939,7 +1982,7 @@
             "api_key": []
           }
         ],
-        "summary": "checkBulkUpload",
+        "summary": "Check bulk upload",
         "tags": [
           "Assets"
         ],
@@ -1948,6 +1991,7 @@
     },
     "/assets/copy": {
       "put": {
+        "description": "Copy asset information like albums, tags, etc. from one asset to another.",
         "operationId": "copyAsset",
         "parameters": [],
         "requestBody": {
@@ -1976,16 +2020,17 @@
             "api_key": []
           }
         ],
+        "summary": "Copy asset",
         "tags": [
           "Assets"
         ],
-        "x-immich-permission": "asset.copy",
-        "description": "This endpoint requires the `asset.copy` permission."
+        "x-immich-permission": "asset.copy"
       }
     },
     "/assets/device/{deviceId}": {
       "get": {
-        "description": "Get all asset of a device that are in the database, ID only.",
+        "deprecated": true,
+        "description": "This property was deprecated in v2.0.0. Get all asset of a device that are in the database, ID only.",
         "operationId": "getAllUserAssetsByDeviceId",
         "parameters": [
           {
@@ -2023,10 +2068,14 @@
             "api_key": []
           }
         ],
-        "summary": "getAllUserAssetsByDeviceId",
+        "summary": "Retrieve assets by device ID",
         "tags": [
-          "Assets"
-        ]
+          "Assets",
+          "Deprecated"
+        ],
+        "x-immich-lifecycle": {
+          "deprecatedAt": "v2.0.0"
+        }
       }
     },
     "/assets/exist": {
@@ -2067,7 +2116,7 @@
             "api_key": []
           }
         ],
-        "summary": "checkExistingAssets",
+        "summary": "Check existing assets",
         "tags": [
           "Assets"
         ]
@@ -2075,6 +2124,7 @@
     },
     "/assets/jobs": {
       "post": {
+        "description": "Run a specific job on a set of assets.",
         "operationId": "runAssetJobs",
         "parameters": [],
         "requestBody": {
@@ -2103,6 +2153,7 @@
             "api_key": []
           }
         ],
+        "summary": "Run an asset job",
         "tags": [
           "Assets"
         ]
@@ -2111,7 +2162,7 @@
     "/assets/random": {
       "get": {
         "deprecated": true,
-        "description": "This property was deprecated in v1.116.0. This endpoint requires the `asset.read` permission.",
+        "description": "This property was deprecated in v1.116.0. Retrieve a specified number of random assets for the authenticated user.",
         "operationId": "getRandom",
         "parameters": [
           {
@@ -2150,6 +2201,7 @@
             "api_key": []
           }
         ],
+        "summary": "Get random assets",
         "tags": [
           "Assets",
           "Deprecated"
@@ -2162,6 +2214,7 @@
     },
     "/assets/statistics": {
       "get": {
+        "description": "Retrieve various statistics about the assets owned by the authenticated user.",
         "operationId": "getAssetStatistics",
         "parameters": [
           {
@@ -2212,15 +2265,16 @@
             "api_key": []
           }
         ],
+        "summary": "Get asset statistics",
         "tags": [
           "Assets"
         ],
-        "x-immich-permission": "asset.statistics",
-        "description": "This endpoint requires the `asset.statistics` permission."
+        "x-immich-permission": "asset.statistics"
       }
     },
     "/assets/{id}": {
       "get": {
+        "description": "Retrieve detailed information about a specific asset.",
         "operationId": "getAssetInfo",
         "parameters": [
           {
@@ -2272,13 +2326,14 @@
             "api_key": []
           }
         ],
+        "summary": "Retrieve an asset",
         "tags": [
           "Assets"
         ],
-        "x-immich-permission": "asset.read",
-        "description": "This endpoint requires the `asset.read` permission."
+        "x-immich-permission": "asset.read"
       },
       "put": {
+        "description": "Update information of a specific asset.",
         "operationId": "updateAsset",
         "parameters": [
           {
@@ -2324,15 +2379,16 @@
             "api_key": []
           }
         ],
+        "summary": "Update an asset",
         "tags": [
           "Assets"
         ],
-        "x-immich-permission": "asset.update",
-        "description": "This endpoint requires the `asset.update` permission."
+        "x-immich-permission": "asset.update"
       }
     },
     "/assets/{id}/metadata": {
       "get": {
+        "description": "Retrieve all metadata key-value pairs associated with the specified asset.",
         "operationId": "getAssetMetadata",
         "parameters": [
           {
@@ -2371,13 +2427,14 @@
             "api_key": []
           }
         ],
+        "summary": "Get asset metadata",
         "tags": [
           "Assets"
         ],
-        "x-immich-permission": "asset.read",
-        "description": "This endpoint requires the `asset.read` permission."
+        "x-immich-permission": "asset.read"
       },
       "put": {
+        "description": "Update or add metadata key-value pairs for the specified asset.",
         "operationId": "updateAssetMetadata",
         "parameters": [
           {
@@ -2426,15 +2483,16 @@
             "api_key": []
           }
         ],
+        "summary": "Update asset metadata",
         "tags": [
           "Assets"
         ],
-        "x-immich-permission": "asset.update",
-        "description": "This endpoint requires the `asset.update` permission."
+        "x-immich-permission": "asset.update"
       }
     },
     "/assets/{id}/metadata/{key}": {
       "delete": {
+        "description": "Delete a specific metadata key-value pair associated with the specified asset.",
         "operationId": "deleteAssetMetadata",
         "parameters": [
           {
@@ -2471,13 +2529,14 @@
             "api_key": []
           }
         ],
+        "summary": "Delete asset metadata by key",
         "tags": [
           "Assets"
         ],
-        "x-immich-permission": "asset.update",
-        "description": "This endpoint requires the `asset.update` permission."
+        "x-immich-permission": "asset.update"
       },
       "get": {
+        "description": "Retrieve the value of a specific metadata key associated with the specified asset.",
         "operationId": "getAssetMetadataByKey",
         "parameters": [
           {
@@ -2521,15 +2580,16 @@
             "api_key": []
           }
         ],
+        "summary": "Retrieve asset metadata by key",
         "tags": [
           "Assets"
         ],
-        "x-immich-permission": "asset.read",
-        "description": "This endpoint requires the `asset.read` permission."
+        "x-immich-permission": "asset.read"
       }
     },
     "/assets/{id}/ocr": {
       "get": {
+        "description": "Retrieve all OCR (Optical Character Recognition) data associated with the specified asset.",
         "operationId": "getAssetOcr",
         "parameters": [
           {
@@ -2568,15 +2628,16 @@
             "api_key": []
           }
         ],
+        "summary": "Retrieve asset OCR data",
         "tags": [
           "Assets"
         ],
-        "x-immich-permission": "asset.read",
-        "description": "This endpoint requires the `asset.read` permission."
+        "x-immich-permission": "asset.read"
       }
     },
     "/assets/{id}/original": {
       "get": {
+        "description": "Downloads the original file of the specified asset.",
         "operationId": "downloadAsset",
         "parameters": [
           {
@@ -2629,15 +2690,15 @@
             "api_key": []
           }
         ],
+        "summary": "Download original asset",
         "tags": [
           "Assets"
         ],
-        "x-immich-permission": "asset.download",
-        "description": "This endpoint requires the `asset.download` permission."
+        "x-immich-permission": "asset.download"
       },
       "put": {
         "deprecated": true,
-        "description": "This property was deprecated in v1.142.0. Replace the asset with new file, without changing its id. This endpoint requires the `asset.replace` permission.",
+        "description": "This property was deprecated in v1.142.0. Replace the asset with new file, without changing its id.",
         "operationId": "replaceAsset",
         "parameters": [
           {
@@ -2699,7 +2760,7 @@
             "api_key": []
           }
         ],
-        "summary": "Replace the asset with new file, without changing its id",
+        "summary": "Replace asset",
         "tags": [
           "Assets",
           "Deprecated"
@@ -2713,6 +2774,7 @@
     },
     "/assets/{id}/thumbnail": {
       "get": {
+        "description": "Retrieve the thumbnail image for the specified asset.",
         "operationId": "viewAsset",
         "parameters": [
           {
@@ -2773,15 +2835,16 @@
             "api_key": []
           }
         ],
+        "summary": "View asset thumbnail",
         "tags": [
           "Assets"
         ],
-        "x-immich-permission": "asset.view",
-        "description": "This endpoint requires the `asset.view` permission."
+        "x-immich-permission": "asset.view"
       }
     },
     "/assets/{id}/video/playback": {
       "get": {
+        "description": "Streams the video file for the specified asset. This endpoint also supports byte range requests.",
         "operationId": "playAssetVideo",
         "parameters": [
           {
@@ -2834,15 +2897,16 @@
             "api_key": []
           }
         ],
+        "summary": "Play asset video",
         "tags": [
           "Assets"
         ],
-        "x-immich-permission": "asset.view",
-        "description": "This endpoint requires the `asset.view` permission."
+        "x-immich-permission": "asset.view"
       }
     },
     "/auth/admin-sign-up": {
       "post": {
+        "description": "Create the first admin user in the system.",
         "operationId": "signUpAdmin",
         "parameters": [],
         "requestBody": {
@@ -2867,6 +2931,7 @@
             "description": ""
           }
         },
+        "summary": "Register admin",
         "tags": [
           "Authentication"
         ]
@@ -2874,6 +2939,7 @@
     },
     "/auth/change-password": {
       "post": {
+        "description": "Change the password of the current user.",
         "operationId": "changePassword",
         "parameters": [],
         "requestBody": {
@@ -2909,15 +2975,16 @@
             "api_key": []
           }
         ],
+        "summary": "Change password",
         "tags": [
           "Authentication"
         ],
-        "x-immich-permission": "auth.changePassword",
-        "description": "This endpoint requires the `auth.changePassword` permission."
+        "x-immich-permission": "auth.changePassword"
       }
     },
     "/auth/login": {
       "post": {
+        "description": "Login with username and password and receive a session token.",
         "operationId": "login",
         "parameters": [],
         "requestBody": {
@@ -2942,6 +3009,7 @@
             "description": ""
           }
         },
+        "summary": "Login",
         "tags": [
           "Authentication"
         ]
@@ -2949,6 +3017,7 @@
     },
     "/auth/logout": {
       "post": {
+        "description": "Logout the current user and invalidate the session token.",
         "operationId": "logout",
         "parameters": [],
         "responses": {
@@ -2974,6 +3043,7 @@
             "api_key": []
           }
         ],
+        "summary": "Logout",
         "tags": [
           "Authentication"
         ]
@@ -2981,6 +3051,7 @@
     },
     "/auth/pin-code": {
       "delete": {
+        "description": "Reset the pin code for the current user by providing the account password",
         "operationId": "resetPinCode",
         "parameters": [],
         "requestBody": {
@@ -3009,13 +3080,14 @@
             "api_key": []
           }
         ],
+        "summary": "Reset pin code",
         "tags": [
           "Authentication"
         ],
-        "x-immich-permission": "pinCode.delete",
-        "description": "This endpoint requires the `pinCode.delete` permission."
+        "x-immich-permission": "pinCode.delete"
       },
       "post": {
+        "description": "Setup a new pin code for the current user.",
         "operationId": "setupPinCode",
         "parameters": [],
         "requestBody": {
@@ -3044,13 +3116,14 @@
             "api_key": []
           }
         ],
+        "summary": "Setup pin code",
         "tags": [
           "Authentication"
         ],
-        "x-immich-permission": "pinCode.create",
-        "description": "This endpoint requires the `pinCode.create` permission."
+        "x-immich-permission": "pinCode.create"
       },
       "put": {
+        "description": "Change the pin code for the current user.",
         "operationId": "changePinCode",
         "parameters": [],
         "requestBody": {
@@ -3079,15 +3152,16 @@
             "api_key": []
           }
         ],
+        "summary": "Change pin code",
         "tags": [
           "Authentication"
         ],
-        "x-immich-permission": "pinCode.update",
-        "description": "This endpoint requires the `pinCode.update` permission."
+        "x-immich-permission": "pinCode.update"
       }
     },
     "/auth/session/lock": {
       "post": {
+        "description": "Remove elevated access to locked assets from the current session.",
         "operationId": "lockAuthSession",
         "parameters": [],
         "responses": {
@@ -3106,6 +3180,7 @@
             "api_key": []
           }
         ],
+        "summary": "Lock auth session",
         "tags": [
           "Authentication"
         ]
@@ -3113,6 +3188,7 @@
     },
     "/auth/session/unlock": {
       "post": {
+        "description": "Temporarily grant the session elevated access to locked assets by providing the correct PIN code.",
         "operationId": "unlockAuthSession",
         "parameters": [],
         "requestBody": {
@@ -3141,6 +3217,7 @@
             "api_key": []
           }
         ],
+        "summary": "Unlock auth session",
         "tags": [
           "Authentication"
         ]
@@ -3148,6 +3225,7 @@
     },
     "/auth/status": {
       "get": {
+        "description": "Get information about the current session, including whether the user has a password, and if the session can access locked assets.",
         "operationId": "getAuthStatus",
         "parameters": [],
         "responses": {
@@ -3173,6 +3251,7 @@
             "api_key": []
           }
         ],
+        "summary": "Retrieve auth status",
         "tags": [
           "Authentication"
         ]
@@ -3180,6 +3259,7 @@
     },
     "/auth/validateToken": {
       "post": {
+        "description": "Validate the current authorization method is still valid.",
         "operationId": "validateAccessToken",
         "parameters": [],
         "responses": {
@@ -3205,6 +3285,7 @@
             "api_key": []
           }
         ],
+        "summary": "Validate access token",
         "tags": [
           "Authentication"
         ]
@@ -3212,6 +3293,7 @@
     },
     "/download/archive": {
       "post": {
+        "description": "Download a ZIP archive containing the specified assets. The assets must have been previously requested via the \"getDownloadInfo\" endpoint.",
         "operationId": "downloadArchive",
         "parameters": [
           {
@@ -3265,15 +3347,16 @@
             "api_key": []
           }
         ],
+        "summary": "Download asset archive",
         "tags": [
           "Download"
         ],
-        "x-immich-permission": "asset.download",
-        "description": "This endpoint requires the `asset.download` permission."
+        "x-immich-permission": "asset.download"
       }
     },
     "/download/info": {
       "post": {
+        "description": "Retrieve information about how to request a download for the specified assets or album. The response includes groups of assets that can be downloaded together.",
         "operationId": "getDownloadInfo",
         "parameters": [
           {
@@ -3326,15 +3409,16 @@
             "api_key": []
           }
         ],
+        "summary": "Retrieve download information",
         "tags": [
           "Download"
         ],
-        "x-immich-permission": "asset.download",
-        "description": "This endpoint requires the `asset.download` permission."
+        "x-immich-permission": "asset.download"
       }
     },
     "/duplicates": {
       "delete": {
+        "description": "Delete multiple duplicate assets specified by their IDs.",
         "operationId": "deleteDuplicates",
         "parameters": [],
         "requestBody": {
@@ -3363,13 +3447,14 @@
             "api_key": []
           }
         ],
+        "summary": "Delete duplicates",
         "tags": [
           "Duplicates"
         ],
-        "x-immich-permission": "duplicate.delete",
-        "description": "This endpoint requires the `duplicate.delete` permission."
+        "x-immich-permission": "duplicate.delete"
       },
       "get": {
+        "description": "Retrieve a list of duplicate assets available to the authenticated user.",
         "operationId": "getAssetDuplicates",
         "parameters": [],
         "responses": {
@@ -3398,15 +3483,16 @@
             "api_key": []
           }
         ],
+        "summary": "Retrieve duplicates",
         "tags": [
           "Duplicates"
         ],
-        "x-immich-permission": "duplicate.read",
-        "description": "This endpoint requires the `duplicate.read` permission."
+        "x-immich-permission": "duplicate.read"
       }
     },
     "/duplicates/{id}": {
       "delete": {
+        "description": "Delete a single duplicate asset specified by its ID.",
         "operationId": "deleteDuplicate",
         "parameters": [
           {
@@ -3435,15 +3521,16 @@
             "api_key": []
           }
         ],
+        "summary": "Delete a duplicate",
         "tags": [
           "Duplicates"
         ],
-        "x-immich-permission": "duplicate.delete",
-        "description": "This endpoint requires the `duplicate.delete` permission."
+        "x-immich-permission": "duplicate.delete"
       }
     },
     "/faces": {
       "get": {
+        "description": "Retrieve all faces belonging to an asset.",
         "operationId": "getFaces",
         "parameters": [
           {
@@ -3482,13 +3569,14 @@
             "api_key": []
           }
         ],
+        "summary": "Retrieve faces for asset",
         "tags": [
           "Faces"
         ],
-        "x-immich-permission": "face.read",
-        "description": "This endpoint requires the `face.read` permission."
+        "x-immich-permission": "face.read"
       },
       "post": {
+        "description": "Create a new face that has not been discovered by facial recognition. The content of the bounding box is considered a face.",
         "operationId": "createFace",
         "parameters": [],
         "requestBody": {
@@ -3517,15 +3605,16 @@
             "api_key": []
           }
         ],
+        "summary": "Create a face",
         "tags": [
           "Faces"
         ],
-        "x-immich-permission": "face.create",
-        "description": "This endpoint requires the `face.create` permission."
+        "x-immich-permission": "face.create"
       }
     },
     "/faces/{id}": {
       "delete": {
+        "description": "Delete a face identified by the id. Optionally can be force deleted.",
         "operationId": "deleteFace",
         "parameters": [
           {
@@ -3564,13 +3653,14 @@
             "api_key": []
           }
         ],
+        "summary": "Delete a face",
         "tags": [
           "Faces"
         ],
-        "x-immich-permission": "face.delete",
-        "description": "This endpoint requires the `face.delete` permission."
+        "x-immich-permission": "face.delete"
       },
       "put": {
+        "description": "Re-assign the face provided in the body to the person identified by the id in the path parameter.",
         "operationId": "reassignFacesById",
         "parameters": [
           {
@@ -3616,15 +3706,16 @@
             "api_key": []
           }
         ],
+        "summary": "Re-assign a face to another person",
         "tags": [
           "Faces"
         ],
-        "x-immich-permission": "face.update",
-        "description": "This endpoint requires the `face.update` permission."
+        "x-immich-permission": "face.update"
       }
     },
     "/jobs": {
       "get": {
+        "description": "Retrieve the counts of the current queue, as well as the current status.",
         "operationId": "getAllJobsStatus",
         "parameters": [],
         "responses": {
@@ -3650,14 +3741,15 @@
             "api_key": []
           }
         ],
+        "summary": "Retrieve queue counts and status",
         "tags": [
           "Jobs"
         ],
         "x-immich-admin-only": true,
-        "x-immich-permission": "job.read",
-        "description": "This endpoint is an admin-only route, and requires the `job.read` permission."
+        "x-immich-permission": "job.read"
       },
       "post": {
+        "description": "Run a specific job. Most jobs are queued automatically, but this endpoint allows for manual creation of a handful of jobs, including various cleanup tasks, as well as creating a new database backup.",
         "operationId": "createJob",
         "parameters": [],
         "requestBody": {
@@ -3686,16 +3778,17 @@
             "api_key": []
           }
         ],
+        "summary": "Create a manual job",
         "tags": [
           "Jobs"
         ],
         "x-immich-admin-only": true,
-        "x-immich-permission": "job.create",
-        "description": "This endpoint is an admin-only route, and requires the `job.create` permission."
+        "x-immich-permission": "job.create"
       }
     },
     "/jobs/{id}": {
       "put": {
+        "description": "Queue all assets for a specific job type. Defaults to only queueing assets that have not yet been processed, but the force command can be used to re-process all assets.",
         "operationId": "sendJobCommand",
         "parameters": [
           {
@@ -3740,16 +3833,17 @@
             "api_key": []
           }
         ],
+        "summary": "Run jobs",
         "tags": [
           "Jobs"
         ],
         "x-immich-admin-only": true,
-        "x-immich-permission": "job.create",
-        "description": "This endpoint is an admin-only route, and requires the `job.create` permission."
+        "x-immich-permission": "job.create"
       }
     },
     "/libraries": {
       "get": {
+        "description": "Retrieve a list of external libraries.",
         "operationId": "getAllLibraries",
         "parameters": [],
         "responses": {
@@ -3778,14 +3872,15 @@
             "api_key": []
           }
         ],
+        "summary": "Retrieve libraries",
         "tags": [
           "Libraries"
         ],
         "x-immich-admin-only": true,
-        "x-immich-permission": "library.read",
-        "description": "This endpoint is an admin-only route, and requires the `library.read` permission."
+        "x-immich-permission": "library.read"
       },
       "post": {
+        "description": "Create a new external library.",
         "operationId": "createLibrary",
         "parameters": [],
         "requestBody": {
@@ -3821,16 +3916,17 @@
             "api_key": []
           }
         ],
+        "summary": "Create a library",
         "tags": [
           "Libraries"
         ],
         "x-immich-admin-only": true,
-        "x-immich-permission": "library.create",
-        "description": "This endpoint is an admin-only route, and requires the `library.create` permission."
+        "x-immich-permission": "library.create"
       }
     },
     "/libraries/{id}": {
       "delete": {
+        "description": "Delete an external library by its ID.",
         "operationId": "deleteLibrary",
         "parameters": [
           {
@@ -3859,14 +3955,15 @@
             "api_key": []
           }
         ],
+        "summary": "Delete a library",
         "tags": [
           "Libraries"
         ],
         "x-immich-admin-only": true,
-        "x-immich-permission": "library.delete",
-        "description": "This endpoint is an admin-only route, and requires the `library.delete` permission."
+        "x-immich-permission": "library.delete"
       },
       "get": {
+        "description": "Retrieve an external library by its ID.",
         "operationId": "getLibrary",
         "parameters": [
           {
@@ -3902,14 +3999,15 @@
             "api_key": []
           }
         ],
+        "summary": "Retrieve a library",
         "tags": [
           "Libraries"
         ],
         "x-immich-admin-only": true,
-        "x-immich-permission": "library.read",
-        "description": "This endpoint is an admin-only route, and requires the `library.read` permission."
+        "x-immich-permission": "library.read"
       },
       "put": {
+        "description": "Update an existing external library.",
         "operationId": "updateLibrary",
         "parameters": [
           {
@@ -3955,16 +4053,17 @@
             "api_key": []
           }
         ],
+        "summary": "Update a library",
         "tags": [
           "Libraries"
         ],
         "x-immich-admin-only": true,
-        "x-immich-permission": "library.update",
-        "description": "This endpoint is an admin-only route, and requires the `library.update` permission."
+        "x-immich-permission": "library.update"
       }
     },
     "/libraries/{id}/scan": {
       "post": {
+        "description": "Queue a scan for the external library to find and import new assets.",
         "operationId": "scanLibrary",
         "parameters": [
           {
@@ -3993,16 +4092,17 @@
             "api_key": []
           }
         ],
+        "summary": "Scan a library",
         "tags": [
           "Libraries"
         ],
         "x-immich-admin-only": true,
-        "x-immich-permission": "library.update",
-        "description": "This endpoint is an admin-only route, and requires the `library.update` permission."
+        "x-immich-permission": "library.update"
       }
     },
     "/libraries/{id}/statistics": {
       "get": {
+        "description": "Retrieve statistics for a specific external library, including number of videos, images, and storage usage.",
         "operationId": "getLibraryStatistics",
         "parameters": [
           {
@@ -4038,16 +4138,17 @@
             "api_key": []
           }
         ],
+        "summary": "Retrieve library statistics",
         "tags": [
           "Libraries"
         ],
         "x-immich-admin-only": true,
-        "x-immich-permission": "library.statistics",
-        "description": "This endpoint is an admin-only route, and requires the `library.statistics` permission."
+        "x-immich-permission": "library.statistics"
       }
     },
     "/libraries/{id}/validate": {
       "post": {
+        "description": "Validate the settings of an external library.",
         "operationId": "validate",
         "parameters": [
           {
@@ -4093,6 +4194,7 @@
             "api_key": []
           }
         ],
+        "summary": "Validate library settings",
         "tags": [
           "Libraries"
         ],
@@ -4101,24 +4203,9 @@
     },
     "/map/markers": {
       "get": {
+        "description": "Retrieve a list of latitude and longitude coordinates for every asset with location data.",
         "operationId": "getMapMarkers",
         "parameters": [
-          {
-            "name": "isArchived",
-            "required": false,
-            "in": "query",
-            "schema": {
-              "type": "boolean"
-            }
-          },
-          {
-            "name": "isFavorite",
-            "required": false,
-            "in": "query",
-            "schema": {
-              "type": "boolean"
-            }
-          },
           {
             "name": "fileCreatedAfter",
             "required": false,
@@ -4137,6 +4224,22 @@
               "type": "string"
             }
           },
+          {
+            "name": "isArchived",
+            "required": false,
+            "in": "query",
+            "schema": {
+              "type": "boolean"
+            }
+          },
+          {
+            "name": "isFavorite",
+            "required": false,
+            "in": "query",
+            "schema": {
+              "type": "boolean"
+            }
+          },
           {
             "name": "withPartners",
             "required": false,
@@ -4180,6 +4283,7 @@
             "api_key": []
           }
         ],
+        "summary": "Retrieve map markers",
         "tags": [
           "Map"
         ]
@@ -4187,6 +4291,7 @@
     },
     "/map/reverse-geocode": {
       "get": {
+        "description": "Retrieve location information (e.g., city, country) for given latitude and longitude coordinates.",
         "operationId": "reverseGeocode",
         "parameters": [
           {
@@ -4234,6 +4339,7 @@
             "api_key": []
           }
         ],
+        "summary": "Reverse geocode coordinates",
         "tags": [
           "Map"
         ]
@@ -4241,6 +4347,7 @@
     },
     "/memories": {
       "get": {
+        "description": "Retrieve a list of memories. Memories are sorted descending by creation date by default, although they can also be sorted in ascending order, or randomly.",
         "operationId": "searchMemories",
         "parameters": [
           {
@@ -4321,13 +4428,14 @@
             "api_key": []
           }
         ],
+        "summary": "Retrieve memories",
         "tags": [
           "Memories"
         ],
-        "x-immich-permission": "memory.read",
-        "description": "This endpoint requires the `memory.read` permission."
+        "x-immich-permission": "memory.read"
       },
       "post": {
+        "description": "Create a new memory by providing a name, description, and a list of asset IDs to include in the memory.",
         "operationId": "createMemory",
         "parameters": [],
         "requestBody": {
@@ -4363,15 +4471,16 @@
             "api_key": []
           }
         ],
+        "summary": "Create a memory",
         "tags": [
           "Memories"
         ],
-        "x-immich-permission": "memory.create",
-        "description": "This endpoint requires the `memory.create` permission."
+        "x-immich-permission": "memory.create"
       }
     },
     "/memories/statistics": {
       "get": {
+        "description": "Retrieve statistics about memories, such as total count and other relevant metrics.",
         "operationId": "memoriesStatistics",
         "parameters": [
           {
@@ -4449,15 +4558,16 @@
             "api_key": []
           }
         ],
+        "summary": "Retrieve memories statistics",
         "tags": [
           "Memories"
         ],
-        "x-immich-permission": "memory.statistics",
-        "description": "This endpoint requires the `memory.statistics` permission."
+        "x-immich-permission": "memory.statistics"
       }
     },
     "/memories/{id}": {
       "delete": {
+        "description": "Delete a specific memory by its ID.",
         "operationId": "deleteMemory",
         "parameters": [
           {
@@ -4486,13 +4596,14 @@
             "api_key": []
           }
         ],
+        "summary": "Delete a memory",
         "tags": [
           "Memories"
         ],
-        "x-immich-permission": "memory.delete",
-        "description": "This endpoint requires the `memory.delete` permission."
+        "x-immich-permission": "memory.delete"
       },
       "get": {
+        "description": "Retrieve a specific memory by its ID.",
         "operationId": "getMemory",
         "parameters": [
           {
@@ -4528,13 +4639,14 @@
             "api_key": []
           }
         ],
+        "summary": "Retrieve a memory",
         "tags": [
           "Memories"
         ],
-        "x-immich-permission": "memory.read",
-        "description": "This endpoint requires the `memory.read` permission."
+        "x-immich-permission": "memory.read"
       },
       "put": {
+        "description": "Update an existing memory by its ID.",
         "operationId": "updateMemory",
         "parameters": [
           {
@@ -4580,15 +4692,16 @@
             "api_key": []
           }
         ],
+        "summary": "Update a memory",
         "tags": [
           "Memories"
         ],
-        "x-immich-permission": "memory.update",
-        "description": "This endpoint requires the `memory.update` permission."
+        "x-immich-permission": "memory.update"
       }
     },
     "/memories/{id}/assets": {
       "delete": {
+        "description": "Remove a list of asset IDs from a specific memory.",
         "operationId": "removeMemoryAssets",
         "parameters": [
           {
@@ -4637,13 +4750,14 @@
             "api_key": []
           }
         ],
+        "summary": "Remove assets from a memory",
         "tags": [
           "Memories"
         ],
-        "x-immich-permission": "memoryAsset.delete",
-        "description": "This endpoint requires the `memoryAsset.delete` permission."
+        "x-immich-permission": "memoryAsset.delete"
       },
       "put": {
+        "description": "Add a list of asset IDs to a specific memory.",
         "operationId": "addMemoryAssets",
         "parameters": [
           {
@@ -4692,15 +4806,16 @@
             "api_key": []
           }
         ],
+        "summary": "Add assets to a memory",
         "tags": [
           "Memories"
         ],
-        "x-immich-permission": "memoryAsset.create",
-        "description": "This endpoint requires the `memoryAsset.create` permission."
+        "x-immich-permission": "memoryAsset.create"
       }
     },
     "/notifications": {
       "delete": {
+        "description": "Delete a list of notifications at once.",
         "operationId": "deleteNotifications",
         "parameters": [],
         "requestBody": {
@@ -4729,13 +4844,14 @@
             "api_key": []
           }
         ],
+        "summary": "Delete notifications",
         "tags": [
           "Notifications"
         ],
-        "x-immich-permission": "notification.delete",
-        "description": "This endpoint requires the `notification.delete` permission."
+        "x-immich-permission": "notification.delete"
       },
       "get": {
+        "description": "Retrieve a list of notifications.",
         "operationId": "getNotifications",
         "parameters": [
           {
@@ -4798,13 +4914,14 @@
             "api_key": []
           }
         ],
+        "summary": "Retrieve notifications",
         "tags": [
           "Notifications"
         ],
-        "x-immich-permission": "notification.read",
-        "description": "This endpoint requires the `notification.read` permission."
+        "x-immich-permission": "notification.read"
       },
       "put": {
+        "description": "Update a list of notifications. Allows to bulk-set the read status of notifications.",
         "operationId": "updateNotifications",
         "parameters": [],
         "requestBody": {
@@ -4833,15 +4950,16 @@
             "api_key": []
           }
         ],
+        "summary": "Update notifications",
         "tags": [
           "Notifications"
         ],
-        "x-immich-permission": "notification.update",
-        "description": "This endpoint requires the `notification.update` permission."
+        "x-immich-permission": "notification.update"
       }
     },
     "/notifications/{id}": {
       "delete": {
+        "description": "Delete a specific notification.",
         "operationId": "deleteNotification",
         "parameters": [
           {
@@ -4870,13 +4988,14 @@
             "api_key": []
           }
         ],
+        "summary": "Delete a notification",
         "tags": [
           "Notifications"
         ],
-        "x-immich-permission": "notification.delete",
-        "description": "This endpoint requires the `notification.delete` permission."
+        "x-immich-permission": "notification.delete"
       },
       "get": {
+        "description": "Retrieve a specific notification identified by id.",
         "operationId": "getNotification",
         "parameters": [
           {
@@ -4912,13 +5031,14 @@
             "api_key": []
           }
         ],
+        "summary": "Get a notification",
         "tags": [
           "Notifications"
         ],
-        "x-immich-permission": "notification.read",
-        "description": "This endpoint requires the `notification.read` permission."
+        "x-immich-permission": "notification.read"
       },
       "put": {
+        "description": "Update a specific notification to set its read status.",
         "operationId": "updateNotification",
         "parameters": [
           {
@@ -4964,15 +5084,16 @@
             "api_key": []
           }
         ],
+        "summary": "Update a notification",
         "tags": [
           "Notifications"
         ],
-        "x-immich-permission": "notification.update",
-        "description": "This endpoint requires the `notification.update` permission."
+        "x-immich-permission": "notification.update"
       }
     },
     "/oauth/authorize": {
       "post": {
+        "description": "Initiate the OAuth authorization process.",
         "operationId": "startOAuth",
         "parameters": [],
         "requestBody": {
@@ -4997,13 +5118,15 @@
             "description": ""
           }
         },
+        "summary": "Start OAuth",
         "tags": [
-          "OAuth"
+          "Authentication"
         ]
       }
     },
     "/oauth/callback": {
       "post": {
+        "description": "Complete the OAuth authorization process by exchanging the authorization code for a session token.",
         "operationId": "finishOAuth",
         "parameters": [],
         "requestBody": {
@@ -5028,13 +5151,15 @@
             "description": ""
           }
         },
+        "summary": "Finish OAuth",
         "tags": [
-          "OAuth"
+          "Authentication"
         ]
       }
     },
     "/oauth/link": {
       "post": {
+        "description": "Link an OAuth account to the authenticated user.",
         "operationId": "linkOAuthAccount",
         "parameters": [],
         "requestBody": {
@@ -5070,13 +5195,15 @@
             "api_key": []
           }
         ],
+        "summary": "Link OAuth account",
         "tags": [
-          "OAuth"
+          "Authentication"
         ]
       }
     },
     "/oauth/mobile-redirect": {
       "get": {
+        "description": "Requests to this URL are automatically forwarded to the mobile app, and is used in some cases for OAuth redirecting.",
         "operationId": "redirectOAuthToMobile",
         "parameters": [],
         "responses": {
@@ -5084,13 +5211,15 @@
             "description": ""
           }
         },
+        "summary": "Redirect OAuth to mobile",
         "tags": [
-          "OAuth"
+          "Authentication"
         ]
       }
     },
     "/oauth/unlink": {
       "post": {
+        "description": "Unlink the OAuth account from the authenticated user.",
         "operationId": "unlinkOAuthAccount",
         "parameters": [],
         "responses": {
@@ -5116,13 +5245,15 @@
             "api_key": []
           }
         ],
+        "summary": "Unlink OAuth account",
         "tags": [
-          "OAuth"
+          "Authentication"
         ]
       }
     },
     "/partners": {
       "get": {
+        "description": "Retrieve a list of partners with whom assets are shared.",
         "operationId": "getPartners",
         "parameters": [
           {
@@ -5160,13 +5291,14 @@
             "api_key": []
           }
         ],
+        "summary": "Retrieve partners",
         "tags": [
           "Partners"
         ],
-        "x-immich-permission": "partner.read",
-        "description": "This endpoint requires the `partner.read` permission."
+        "x-immich-permission": "partner.read"
       },
       "post": {
+        "description": "Create a new partner to share assets with.",
         "operationId": "createPartner",
         "parameters": [],
         "requestBody": {
@@ -5202,15 +5334,16 @@
             "api_key": []
           }
         ],
+        "summary": "Create a partner",
         "tags": [
           "Partners"
         ],
-        "x-immich-permission": "partner.create",
-        "description": "This endpoint requires the `partner.create` permission."
+        "x-immich-permission": "partner.create"
       }
     },
     "/partners/{id}": {
       "delete": {
+        "description": "Stop sharing assets with a partner.",
         "operationId": "removePartner",
         "parameters": [
           {
@@ -5239,15 +5372,15 @@
             "api_key": []
           }
         ],
+        "summary": "Remove a partner",
         "tags": [
           "Partners"
         ],
-        "x-immich-permission": "partner.delete",
-        "description": "This endpoint requires the `partner.delete` permission."
+        "x-immich-permission": "partner.delete"
       },
       "post": {
         "deprecated": true,
-        "description": "This property was deprecated in v1.141.0. This endpoint requires the `partner.create` permission.",
+        "description": "This property was deprecated in v1.141.0. Create a new partner to share assets with.",
         "operationId": "createPartnerDeprecated",
         "parameters": [
           {
@@ -5283,6 +5416,7 @@
             "api_key": []
           }
         ],
+        "summary": "Create a partner",
         "tags": [
           "Partners",
           "Deprecated"
@@ -5293,6 +5427,7 @@
         "x-immich-permission": "partner.create"
       },
       "put": {
+        "description": "Specify whether a partner's assets should appear in the user's timeline.",
         "operationId": "updatePartner",
         "parameters": [
           {
@@ -5338,15 +5473,16 @@
             "api_key": []
           }
         ],
+        "summary": "Update a partner",
         "tags": [
           "Partners"
         ],
-        "x-immich-permission": "partner.update",
-        "description": "This endpoint requires the `partner.update` permission."
+        "x-immich-permission": "partner.update"
       }
     },
     "/people": {
       "delete": {
+        "description": "Bulk delete a list of people at once.",
         "operationId": "deletePeople",
         "parameters": [],
         "requestBody": {
@@ -5375,13 +5511,14 @@
             "api_key": []
           }
         ],
+        "summary": "Delete people",
         "tags": [
           "People"
         ],
-        "x-immich-permission": "person.delete",
-        "description": "This endpoint requires the `person.delete` permission."
+        "x-immich-permission": "person.delete"
       },
       "get": {
+        "description": "Retrieve a list of all people.",
         "operationId": "getAllPeople",
         "parameters": [
           {
@@ -5457,13 +5594,14 @@
             "api_key": []
           }
         ],
+        "summary": "Get all people",
         "tags": [
           "People"
         ],
-        "x-immich-permission": "person.read",
-        "description": "This endpoint requires the `person.read` permission."
+        "x-immich-permission": "person.read"
       },
       "post": {
+        "description": "Create a new person that can have multiple faces assigned to them.",
         "operationId": "createPerson",
         "parameters": [],
         "requestBody": {
@@ -5499,13 +5637,14 @@
             "api_key": []
           }
         ],
+        "summary": "Create a person",
         "tags": [
           "People"
         ],
-        "x-immich-permission": "person.create",
-        "description": "This endpoint requires the `person.create` permission."
+        "x-immich-permission": "person.create"
       },
       "put": {
+        "description": "Bulk update multiple people at once.",
         "operationId": "updatePeople",
         "parameters": [],
         "requestBody": {
@@ -5544,15 +5683,16 @@
             "api_key": []
           }
         ],
+        "summary": "Update people",
         "tags": [
           "People"
         ],
-        "x-immich-permission": "person.update",
-        "description": "This endpoint requires the `person.update` permission."
+        "x-immich-permission": "person.update"
       }
     },
     "/people/{id}": {
       "delete": {
+        "description": "Delete an individual person.",
         "operationId": "deletePerson",
         "parameters": [
           {
@@ -5581,13 +5721,14 @@
             "api_key": []
           }
         ],
+        "summary": "Delete person",
         "tags": [
           "People"
         ],
-        "x-immich-permission": "person.delete",
-        "description": "This endpoint requires the `person.delete` permission."
+        "x-immich-permission": "person.delete"
       },
       "get": {
+        "description": "Retrieve a person by id.",
         "operationId": "getPerson",
         "parameters": [
           {
@@ -5623,13 +5764,14 @@
             "api_key": []
           }
         ],
+        "summary": "Get a person",
         "tags": [
           "People"
         ],
-        "x-immich-permission": "person.read",
-        "description": "This endpoint requires the `person.read` permission."
+        "x-immich-permission": "person.read"
       },
       "put": {
+        "description": "Update an individual person.",
         "operationId": "updatePerson",
         "parameters": [
           {
@@ -5675,15 +5817,16 @@
             "api_key": []
           }
         ],
+        "summary": "Update person",
         "tags": [
           "People"
         ],
-        "x-immich-permission": "person.update",
-        "description": "This endpoint requires the `person.update` permission."
+        "x-immich-permission": "person.update"
       }
     },
     "/people/{id}/merge": {
       "post": {
+        "description": "Merge a list of people into the person specified in the path parameter.",
         "operationId": "mergePerson",
         "parameters": [
           {
@@ -5732,15 +5875,16 @@
             "api_key": []
           }
         ],
+        "summary": "Merge people",
         "tags": [
           "People"
         ],
-        "x-immich-permission": "person.merge",
-        "description": "This endpoint requires the `person.merge` permission."
+        "x-immich-permission": "person.merge"
       }
     },
     "/people/{id}/reassign": {
       "put": {
+        "description": "Bulk reassign a list of faces to a different person.",
         "operationId": "reassignFaces",
         "parameters": [
           {
@@ -5789,15 +5933,16 @@
             "api_key": []
           }
         ],
+        "summary": "Reassign faces",
         "tags": [
           "People"
         ],
-        "x-immich-permission": "person.reassign",
-        "description": "This endpoint requires the `person.reassign` permission."
+        "x-immich-permission": "person.reassign"
       }
     },
     "/people/{id}/statistics": {
       "get": {
+        "description": "Retrieve statistics about a specific person.",
         "operationId": "getPersonStatistics",
         "parameters": [
           {
@@ -5833,15 +5978,16 @@
             "api_key": []
           }
         ],
+        "summary": "Get person statistics",
         "tags": [
           "People"
         ],
-        "x-immich-permission": "person.statistics",
-        "description": "This endpoint requires the `person.statistics` permission."
+        "x-immich-permission": "person.statistics"
       }
     },
     "/people/{id}/thumbnail": {
       "get": {
+        "description": "Retrieve the thumbnail file for a person.",
         "operationId": "getPersonThumbnail",
         "parameters": [
           {
@@ -5878,15 +6024,16 @@
             "api_key": []
           }
         ],
+        "summary": "Get person thumbnail",
         "tags": [
           "People"
         ],
-        "x-immich-permission": "person.read",
-        "description": "This endpoint requires the `person.read` permission."
+        "x-immich-permission": "person.read"
       }
     },
     "/search/cities": {
       "get": {
+        "description": "Retrieve a list of assets with each asset belonging to a different city. This endpoint is used on the places pages to show a single thumbnail for each city the user has assets in.",
         "operationId": "getAssetsByCity",
         "parameters": [],
         "responses": {
@@ -5915,15 +6062,16 @@
             "api_key": []
           }
         ],
+        "summary": "Retrieve assets by city",
         "tags": [
           "Search"
         ],
-        "x-immich-permission": "asset.read",
-        "description": "This endpoint requires the `asset.read` permission."
+        "x-immich-permission": "asset.read"
       }
     },
     "/search/explore": {
       "get": {
+        "description": "Retrieve data for the explore section, such as popular people and places.",
         "operationId": "getExploreData",
         "parameters": [],
         "responses": {
@@ -5952,15 +6100,16 @@
             "api_key": []
           }
         ],
+        "summary": "Retrieve explore data",
         "tags": [
           "Search"
         ],
-        "x-immich-permission": "asset.read",
-        "description": "This endpoint requires the `asset.read` permission."
+        "x-immich-permission": "asset.read"
       }
     },
     "/search/large-assets": {
       "post": {
+        "description": "Search for assets that are considered large based on specified criteria.",
         "operationId": "searchLargeAssets",
         "parameters": [
           {
@@ -6279,15 +6428,16 @@
             "api_key": []
           }
         ],
+        "summary": "Search large assets",
         "tags": [
           "Search"
         ],
-        "x-immich-permission": "asset.read",
-        "description": "This endpoint requires the `asset.read` permission."
+        "x-immich-permission": "asset.read"
       }
     },
     "/search/metadata": {
       "post": {
+        "description": "Search for assets based on various metadata criteria.",
         "operationId": "searchAssets",
         "parameters": [],
         "requestBody": {
@@ -6323,15 +6473,16 @@
             "api_key": []
           }
         ],
+        "summary": "Search assets by metadata",
         "tags": [
           "Search"
         ],
-        "x-immich-permission": "asset.read",
-        "description": "This endpoint requires the `asset.read` permission."
+        "x-immich-permission": "asset.read"
       }
     },
     "/search/person": {
       "get": {
+        "description": "Search for people by name.",
         "operationId": "searchPerson",
         "parameters": [
           {
@@ -6377,15 +6528,16 @@
             "api_key": []
           }
         ],
+        "summary": "Search people",
         "tags": [
           "Search"
         ],
-        "x-immich-permission": "person.read",
-        "description": "This endpoint requires the `person.read` permission."
+        "x-immich-permission": "person.read"
       }
     },
     "/search/places": {
       "get": {
+        "description": "Search for places by name.",
         "operationId": "searchPlaces",
         "parameters": [
           {
@@ -6423,15 +6575,16 @@
             "api_key": []
           }
         ],
+        "summary": "Search places",
         "tags": [
           "Search"
         ],
-        "x-immich-permission": "asset.read",
-        "description": "This endpoint requires the `asset.read` permission."
+        "x-immich-permission": "asset.read"
       }
     },
     "/search/random": {
       "post": {
+        "description": "Retrieve a random selection of assets based on the provided criteria.",
         "operationId": "searchRandom",
         "parameters": [],
         "requestBody": {
@@ -6470,15 +6623,16 @@
             "api_key": []
           }
         ],
+        "summary": "Search random assets",
         "tags": [
           "Search"
         ],
-        "x-immich-permission": "asset.read",
-        "description": "This endpoint requires the `asset.read` permission."
+        "x-immich-permission": "asset.read"
       }
     },
     "/search/smart": {
       "post": {
+        "description": "Perform a smart search for assets by using machine learning vectors to determine relevance.",
         "operationId": "searchSmart",
         "parameters": [],
         "requestBody": {
@@ -6514,15 +6668,16 @@
             "api_key": []
           }
         ],
+        "summary": "Smart asset search",
         "tags": [
           "Search"
         ],
-        "x-immich-permission": "asset.read",
-        "description": "This endpoint requires the `asset.read` permission."
+        "x-immich-permission": "asset.read"
       }
     },
     "/search/statistics": {
       "post": {
+        "description": "Retrieve statistical data about assets based on search criteria, such as the total matching count.",
         "operationId": "searchAssetStatistics",
         "parameters": [],
         "requestBody": {
@@ -6558,15 +6713,16 @@
             "api_key": []
           }
         ],
+        "summary": "Search asset statistics",
         "tags": [
           "Search"
         ],
-        "x-immich-permission": "asset.statistics",
-        "description": "This endpoint requires the `asset.statistics` permission."
+        "x-immich-permission": "asset.statistics"
       }
     },
     "/search/suggestions": {
       "get": {
+        "description": "Retrieve search suggestions based on partial input. This endpoint is used for typeahead search features.",
         "operationId": "getSearchSuggestions",
         "parameters": [
           {
@@ -6653,15 +6809,16 @@
             "api_key": []
           }
         ],
+        "summary": "Retrieve search suggestions",
         "tags": [
           "Search"
         ],
-        "x-immich-permission": "asset.read",
-        "description": "This endpoint requires the `asset.read` permission."
+        "x-immich-permission": "asset.read"
       }
     },
     "/server/about": {
       "get": {
+        "description": "Retrieve a list of information about the server.",
         "operationId": "getAboutInfo",
         "parameters": [],
         "responses": {
@@ -6687,15 +6844,16 @@
             "api_key": []
           }
         ],
+        "summary": "Get server information",
         "tags": [
           "Server"
         ],
-        "x-immich-permission": "server.about",
-        "description": "This endpoint requires the `server.about` permission."
+        "x-immich-permission": "server.about"
       }
     },
     "/server/apk-links": {
       "get": {
+        "description": "Retrieve links to the APKs for the current server version.",
         "operationId": "getApkLinks",
         "parameters": [],
         "responses": {
@@ -6721,15 +6879,16 @@
             "api_key": []
           }
         ],
+        "summary": "Get APK links",
         "tags": [
           "Server"
         ],
-        "x-immich-permission": "server.apkLinks",
-        "description": "This endpoint requires the `server.apkLinks` permission."
+        "x-immich-permission": "server.apkLinks"
       }
     },
     "/server/config": {
       "get": {
+        "description": "Retrieve the current server configuration.",
         "operationId": "getServerConfig",
         "parameters": [],
         "responses": {
@@ -6744,6 +6903,7 @@
             "description": ""
           }
         },
+        "summary": "Get config",
         "tags": [
           "Server"
         ]
@@ -6751,6 +6911,7 @@
     },
     "/server/features": {
       "get": {
+        "description": "Retrieve available features supported by this server.",
         "operationId": "getServerFeatures",
         "parameters": [],
         "responses": {
@@ -6765,6 +6926,7 @@
             "description": ""
           }
         },
+        "summary": "Get features",
         "tags": [
           "Server"
         ]
@@ -6772,6 +6934,7 @@
     },
     "/server/license": {
       "delete": {
+        "description": "Delete the currently set server product key.",
         "operationId": "deleteServerLicense",
         "parameters": [],
         "responses": {
@@ -6790,14 +6953,15 @@
             "api_key": []
           }
         ],
+        "summary": "Delete server product key",
         "tags": [
           "Server"
         ],
         "x-immich-admin-only": true,
-        "x-immich-permission": "serverLicense.delete",
-        "description": "This endpoint is an admin-only route, and requires the `serverLicense.delete` permission."
+        "x-immich-permission": "serverLicense.delete"
       },
       "get": {
+        "description": "Retrieve information about whether the server currently has a product key registered.",
         "operationId": "getServerLicense",
         "parameters": [],
         "responses": {
@@ -6826,14 +6990,15 @@
             "api_key": []
           }
         ],
+        "summary": "Get product key",
         "tags": [
           "Server"
         ],
         "x-immich-admin-only": true,
-        "x-immich-permission": "serverLicense.read",
-        "description": "This endpoint is an admin-only route, and requires the `serverLicense.read` permission."
+        "x-immich-permission": "serverLicense.read"
       },
       "put": {
+        "description": "Validate and set the server product key if successful.",
         "operationId": "setServerLicense",
         "parameters": [],
         "requestBody": {
@@ -6869,16 +7034,17 @@
             "api_key": []
           }
         ],
+        "summary": "Set server product key",
         "tags": [
           "Server"
         ],
         "x-immich-admin-only": true,
-        "x-immich-permission": "serverLicense.update",
-        "description": "This endpoint is an admin-only route, and requires the `serverLicense.update` permission."
+        "x-immich-permission": "serverLicense.update"
       }
     },
     "/server/media-types": {
       "get": {
+        "description": "Retrieve all media types supported by the server.",
         "operationId": "getSupportedMediaTypes",
         "parameters": [],
         "responses": {
@@ -6893,6 +7059,7 @@
             "description": ""
           }
         },
+        "summary": "Get supported media types",
         "tags": [
           "Server"
         ]
@@ -6900,6 +7067,7 @@
     },
     "/server/ping": {
       "get": {
+        "description": "Pong",
         "operationId": "pingServer",
         "parameters": [],
         "responses": {
@@ -6914,6 +7082,7 @@
             "description": ""
           }
         },
+        "summary": "Ping",
         "tags": [
           "Server"
         ]
@@ -6921,6 +7090,7 @@
     },
     "/server/statistics": {
       "get": {
+        "description": "Retrieve statistics about the entire Immich instance such as asset counts.",
         "operationId": "getServerStatistics",
         "parameters": [],
         "responses": {
@@ -6946,16 +7116,17 @@
             "api_key": []
           }
         ],
+        "summary": "Get statistics",
         "tags": [
           "Server"
         ],
         "x-immich-admin-only": true,
-        "x-immich-permission": "server.statistics",
-        "description": "This endpoint is an admin-only route, and requires the `server.statistics` permission."
+        "x-immich-permission": "server.statistics"
       }
     },
     "/server/storage": {
       "get": {
+        "description": "Retrieve the current storage utilization information of the server.",
         "operationId": "getStorage",
         "parameters": [],
         "responses": {
@@ -6981,15 +7152,16 @@
             "api_key": []
           }
         ],
+        "summary": "Get storage",
         "tags": [
           "Server"
         ],
-        "x-immich-permission": "server.storage",
-        "description": "This endpoint requires the `server.storage` permission."
+        "x-immich-permission": "server.storage"
       }
     },
     "/server/theme": {
       "get": {
+        "description": "Retrieve the custom CSS, if existent.",
         "operationId": "getTheme",
         "parameters": [],
         "responses": {
@@ -7004,6 +7176,7 @@
             "description": ""
           }
         },
+        "summary": "Get theme",
         "tags": [
           "Server"
         ]
@@ -7011,6 +7184,7 @@
     },
     "/server/version": {
       "get": {
+        "description": "Retrieve the current server version in semantic versioning (semver) format.",
         "operationId": "getServerVersion",
         "parameters": [],
         "responses": {
@@ -7025,6 +7199,7 @@
             "description": ""
           }
         },
+        "summary": "Get server version",
         "tags": [
           "Server"
         ]
@@ -7032,6 +7207,7 @@
     },
     "/server/version-check": {
       "get": {
+        "description": "Retrieve information about the last time the version check ran.",
         "operationId": "getVersionCheck",
         "parameters": [],
         "responses": {
@@ -7057,15 +7233,16 @@
             "api_key": []
           }
         ],
+        "summary": "Get version check status",
         "tags": [
           "Server"
         ],
-        "x-immich-permission": "server.versionCheck",
-        "description": "This endpoint requires the `server.versionCheck` permission."
+        "x-immich-permission": "server.versionCheck"
       }
     },
     "/server/version-history": {
       "get": {
+        "description": "Retrieve a list of past versions the server has been on.",
         "operationId": "getVersionHistory",
         "parameters": [],
         "responses": {
@@ -7083,6 +7260,7 @@
             "description": ""
           }
         },
+        "summary": "Get version history",
         "tags": [
           "Server"
         ]
@@ -7090,6 +7268,7 @@
     },
     "/sessions": {
       "delete": {
+        "description": "Delete all sessions for the user. This will not delete the current session.",
         "operationId": "deleteAllSessions",
         "parameters": [],
         "responses": {
@@ -7108,13 +7287,14 @@
             "api_key": []
           }
         ],
+        "summary": "Delete all sessions",
         "tags": [
           "Sessions"
         ],
-        "x-immich-permission": "session.delete",
-        "description": "This endpoint requires the `session.delete` permission."
+        "x-immich-permission": "session.delete"
       },
       "get": {
+        "description": "Retrieve a list of sessions for the user.",
         "operationId": "getSessions",
         "parameters": [],
         "responses": {
@@ -7143,13 +7323,14 @@
             "api_key": []
           }
         ],
+        "summary": "Retrieve sessions",
         "tags": [
           "Sessions"
         ],
-        "x-immich-permission": "session.read",
-        "description": "This endpoint requires the `session.read` permission."
+        "x-immich-permission": "session.read"
       },
       "post": {
+        "description": "Create a session as a child to the current session. This endpoint is used for casting.",
         "operationId": "createSession",
         "parameters": [],
         "requestBody": {
@@ -7185,15 +7366,16 @@
             "api_key": []
           }
         ],
+        "summary": "Create a session",
         "tags": [
           "Sessions"
         ],
-        "x-immich-permission": "session.create",
-        "description": "This endpoint requires the `session.create` permission."
+        "x-immich-permission": "session.create"
       }
     },
     "/sessions/{id}": {
       "delete": {
+        "description": "Delete a specific session by id.",
         "operationId": "deleteSession",
         "parameters": [
           {
@@ -7222,13 +7404,14 @@
             "api_key": []
           }
         ],
+        "summary": "Delete a session",
         "tags": [
           "Sessions"
         ],
-        "x-immich-permission": "session.delete",
-        "description": "This endpoint requires the `session.delete` permission."
+        "x-immich-permission": "session.delete"
       },
       "put": {
+        "description": "Update a specific session identified by id.",
         "operationId": "updateSession",
         "parameters": [
           {
@@ -7274,15 +7457,16 @@
             "api_key": []
           }
         ],
+        "summary": "Update a session",
         "tags": [
           "Sessions"
         ],
-        "x-immich-permission": "session.update",
-        "description": "This endpoint requires the `session.update` permission."
+        "x-immich-permission": "session.update"
       }
     },
     "/sessions/{id}/lock": {
       "post": {
+        "description": "Lock a specific session by id.",
         "operationId": "lockSession",
         "parameters": [
           {
@@ -7311,15 +7495,16 @@
             "api_key": []
           }
         ],
+        "summary": "Lock a session",
         "tags": [
           "Sessions"
         ],
-        "x-immich-permission": "session.lock",
-        "description": "This endpoint requires the `session.lock` permission."
+        "x-immich-permission": "session.lock"
       }
     },
     "/shared-links": {
       "get": {
+        "description": "Retrieve a list of all shared links.",
         "operationId": "getAllSharedLinks",
         "parameters": [
           {
@@ -7358,13 +7543,14 @@
             "api_key": []
           }
         ],
+        "summary": "Retrieve all shared links",
         "tags": [
-          "Shared Links"
+          "Shared links"
         ],
-        "x-immich-permission": "sharedLink.read",
-        "description": "This endpoint requires the `sharedLink.read` permission."
+        "x-immich-permission": "sharedLink.read"
       },
       "post": {
+        "description": "Create a new shared link.",
         "operationId": "createSharedLink",
         "parameters": [],
         "requestBody": {
@@ -7400,17 +7586,26 @@
             "api_key": []
           }
         ],
+        "summary": "Create a shared link",
         "tags": [
-          "Shared Links"
+          "Shared links"
         ],
-        "x-immich-permission": "sharedLink.create",
-        "description": "This endpoint requires the `sharedLink.create` permission."
+        "x-immich-permission": "sharedLink.create"
       }
     },
     "/shared-links/me": {
       "get": {
+        "description": "Retrieve the current shared link associated with authentication method.",
         "operationId": "getMySharedLink",
         "parameters": [
+          {
+            "name": "key",
+            "required": false,
+            "in": "query",
+            "schema": {
+              "type": "string"
+            }
+          },
           {
             "name": "password",
             "required": false,
@@ -7420,22 +7615,6 @@
               "type": "string"
             }
           },
-          {
-            "name": "token",
-            "required": false,
-            "in": "query",
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "name": "key",
-            "required": false,
-            "in": "query",
-            "schema": {
-              "type": "string"
-            }
-          },
           {
             "name": "slug",
             "required": false,
@@ -7443,6 +7622,14 @@
             "schema": {
               "type": "string"
             }
+          },
+          {
+            "name": "token",
+            "required": false,
+            "in": "query",
+            "schema": {
+              "type": "string"
+            }
           }
         ],
         "responses": {
@@ -7468,13 +7655,15 @@
             "api_key": []
           }
         ],
+        "summary": "Retrieve current shared link",
         "tags": [
-          "Shared Links"
+          "Shared links"
         ]
       }
     },
     "/shared-links/{id}": {
       "delete": {
+        "description": "Delete a specific shared link by its ID.",
         "operationId": "removeSharedLink",
         "parameters": [
           {
@@ -7503,13 +7692,14 @@
             "api_key": []
           }
         ],
+        "summary": "Delete a shared link",
         "tags": [
-          "Shared Links"
+          "Shared links"
         ],
-        "x-immich-permission": "sharedLink.delete",
-        "description": "This endpoint requires the `sharedLink.delete` permission."
+        "x-immich-permission": "sharedLink.delete"
       },
       "get": {
+        "description": "Retrieve a specific shared link by its ID.",
         "operationId": "getSharedLinkById",
         "parameters": [
           {
@@ -7545,13 +7735,14 @@
             "api_key": []
           }
         ],
+        "summary": "Retrieve a shared link",
         "tags": [
-          "Shared Links"
+          "Shared links"
         ],
-        "x-immich-permission": "sharedLink.read",
-        "description": "This endpoint requires the `sharedLink.read` permission."
+        "x-immich-permission": "sharedLink.read"
       },
       "patch": {
+        "description": "Update an existing shared link by its ID.",
         "operationId": "updateSharedLink",
         "parameters": [
           {
@@ -7597,15 +7788,16 @@
             "api_key": []
           }
         ],
+        "summary": "Update a shared link",
         "tags": [
-          "Shared Links"
+          "Shared links"
         ],
-        "x-immich-permission": "sharedLink.update",
-        "description": "This endpoint requires the `sharedLink.update` permission."
+        "x-immich-permission": "sharedLink.update"
       }
     },
     "/shared-links/{id}/assets": {
       "delete": {
+        "description": "Remove assets from a specific shared link by its ID. This endpoint is only relevant for shared link of type individual.",
         "operationId": "removeSharedLinkAssets",
         "parameters": [
           {
@@ -7670,11 +7862,13 @@
             "api_key": []
           }
         ],
+        "summary": "Remove assets from a shared link",
         "tags": [
-          "Shared Links"
+          "Shared links"
         ]
       },
       "put": {
+        "description": "Add assets to a specific shared link by its ID. This endpoint is only relevant for shared link of type individual.",
         "operationId": "addSharedLinkAssets",
         "parameters": [
           {
@@ -7739,13 +7933,15 @@
             "api_key": []
           }
         ],
+        "summary": "Add assets to a shared link",
         "tags": [
-          "Shared Links"
+          "Shared links"
         ]
       }
     },
     "/stacks": {
       "delete": {
+        "description": "Delete multiple stacks by providing a list of stack IDs.",
         "operationId": "deleteStacks",
         "parameters": [],
         "requestBody": {
@@ -7774,13 +7970,14 @@
             "api_key": []
           }
         ],
+        "summary": "Delete stacks",
         "tags": [
           "Stacks"
         ],
-        "x-immich-permission": "stack.delete",
-        "description": "This endpoint requires the `stack.delete` permission."
+        "x-immich-permission": "stack.delete"
       },
       "get": {
+        "description": "Retrieve a list of stacks.",
         "operationId": "searchStacks",
         "parameters": [
           {
@@ -7819,13 +8016,14 @@
             "api_key": []
           }
         ],
+        "summary": "Retrieve stacks",
         "tags": [
           "Stacks"
         ],
-        "x-immich-permission": "stack.read",
-        "description": "This endpoint requires the `stack.read` permission."
+        "x-immich-permission": "stack.read"
       },
       "post": {
+        "description": "Create a new stack by providing a name and a list of asset IDs to include in the stack. If any of the provided asset IDs are primary assets of an existing stack, the existing stack will be merged into the newly created stack.",
         "operationId": "createStack",
         "parameters": [],
         "requestBody": {
@@ -7861,15 +8059,16 @@
             "api_key": []
           }
         ],
+        "summary": "Create a stack",
         "tags": [
           "Stacks"
         ],
-        "x-immich-permission": "stack.create",
-        "description": "This endpoint requires the `stack.create` permission."
+        "x-immich-permission": "stack.create"
       }
     },
     "/stacks/{id}": {
       "delete": {
+        "description": "Delete a specific stack by its ID.",
         "operationId": "deleteStack",
         "parameters": [
           {
@@ -7898,13 +8097,14 @@
             "api_key": []
           }
         ],
+        "summary": "Delete a stack",
         "tags": [
           "Stacks"
         ],
-        "x-immich-permission": "stack.delete",
-        "description": "This endpoint requires the `stack.delete` permission."
+        "x-immich-permission": "stack.delete"
       },
       "get": {
+        "description": "Retrieve a specific stack by its ID.",
         "operationId": "getStack",
         "parameters": [
           {
@@ -7940,13 +8140,14 @@
             "api_key": []
           }
         ],
+        "summary": "Retrieve a stack",
         "tags": [
           "Stacks"
         ],
-        "x-immich-permission": "stack.read",
-        "description": "This endpoint requires the `stack.read` permission."
+        "x-immich-permission": "stack.read"
       },
       "put": {
+        "description": "Update an existing stack by its ID.",
         "operationId": "updateStack",
         "parameters": [
           {
@@ -7992,15 +8193,16 @@
             "api_key": []
           }
         ],
+        "summary": "Update a stack",
         "tags": [
           "Stacks"
         ],
-        "x-immich-permission": "stack.update",
-        "description": "This endpoint requires the `stack.update` permission."
+        "x-immich-permission": "stack.update"
       }
     },
     "/stacks/{id}/assets/{assetId}": {
       "delete": {
+        "description": "Remove a specific asset from a stack by providing the stack ID and asset ID.",
         "operationId": "removeAssetFromStack",
         "parameters": [
           {
@@ -8038,15 +8240,16 @@
             "api_key": []
           }
         ],
+        "summary": "Remove an asset from a stack",
         "tags": [
           "Stacks"
         ],
-        "x-immich-permission": "stack.update",
-        "description": "This endpoint requires the `stack.update` permission."
+        "x-immich-permission": "stack.update"
       }
     },
     "/sync/ack": {
       "delete": {
+        "description": "Delete specific synchronization acknowledgments.",
         "operationId": "deleteSyncAck",
         "parameters": [],
         "requestBody": {
@@ -8075,13 +8278,14 @@
             "api_key": []
           }
         ],
+        "summary": "Delete acknowledgements",
         "tags": [
           "Sync"
         ],
-        "x-immich-permission": "syncCheckpoint.delete",
-        "description": "This endpoint requires the `syncCheckpoint.delete` permission."
+        "x-immich-permission": "syncCheckpoint.delete"
       },
       "get": {
+        "description": "Retrieve the synchronization acknowledgments for the current session.",
         "operationId": "getSyncAck",
         "parameters": [],
         "responses": {
@@ -8110,13 +8314,14 @@
             "api_key": []
           }
         ],
+        "summary": "Retrieve acknowledgements",
         "tags": [
           "Sync"
         ],
-        "x-immich-permission": "syncCheckpoint.read",
-        "description": "This endpoint requires the `syncCheckpoint.read` permission."
+        "x-immich-permission": "syncCheckpoint.read"
       },
       "post": {
+        "description": "Send a list of synchronization acknowledgements to confirm that the latest changes have been received.",
         "operationId": "sendSyncAck",
         "parameters": [],
         "requestBody": {
@@ -8145,15 +8350,17 @@
             "api_key": []
           }
         ],
+        "summary": "Acknowledge changes",
         "tags": [
           "Sync"
         ],
-        "x-immich-permission": "syncCheckpoint.update",
-        "description": "This endpoint requires the `syncCheckpoint.update` permission."
+        "x-immich-permission": "syncCheckpoint.update"
       }
     },
     "/sync/delta-sync": {
       "post": {
+        "deprecated": true,
+        "description": "This property was deprecated in v2.0.0. Retrieve changed assets since the last sync for the authenticated user.",
         "operationId": "getDeltaSync",
         "parameters": [],
         "requestBody": {
@@ -8189,13 +8396,20 @@
             "api_key": []
           }
         ],
+        "summary": "Get delta sync for user",
         "tags": [
-          "Sync"
-        ]
+          "Sync",
+          "Deprecated"
+        ],
+        "x-immich-lifecycle": {
+          "deprecatedAt": "v2.0.0"
+        }
       }
     },
     "/sync/full-sync": {
       "post": {
+        "deprecated": true,
+        "description": "This property was deprecated in v2.0.0. Retrieve all assets for a full synchronization for the authenticated user.",
         "operationId": "getFullSyncForUser",
         "parameters": [],
         "requestBody": {
@@ -8234,13 +8448,19 @@
             "api_key": []
           }
         ],
+        "summary": "Get full sync for user",
         "tags": [
-          "Sync"
-        ]
+          "Sync",
+          "Deprecated"
+        ],
+        "x-immich-lifecycle": {
+          "deprecatedAt": "v2.0.0"
+        }
       }
     },
     "/sync/stream": {
       "post": {
+        "description": "Retrieve a JSON lines streamed response of changes for synchronization. This endpoint is used by the mobile app to efficiently stay up to date with changes.",
         "operationId": "getSyncStream",
         "parameters": [],
         "requestBody": {
@@ -8269,15 +8489,16 @@
             "api_key": []
           }
         ],
+        "summary": "Stream sync changes",
         "tags": [
           "Sync"
         ],
-        "x-immich-permission": "sync.stream",
-        "description": "This endpoint requires the `sync.stream` permission."
+        "x-immich-permission": "sync.stream"
       }
     },
     "/system-config": {
       "get": {
+        "description": "Retrieve the current system configuration.",
         "operationId": "getConfig",
         "parameters": [],
         "responses": {
@@ -8303,14 +8524,15 @@
             "api_key": []
           }
         ],
+        "summary": "Get system configuration",
         "tags": [
-          "System Config"
+          "System config"
         ],
         "x-immich-admin-only": true,
-        "x-immich-permission": "systemConfig.read",
-        "description": "This endpoint is an admin-only route, and requires the `systemConfig.read` permission."
+        "x-immich-permission": "systemConfig.read"
       },
       "put": {
+        "description": "Update the system configuration with a new system configuration.",
         "operationId": "updateConfig",
         "parameters": [],
         "requestBody": {
@@ -8346,16 +8568,17 @@
             "api_key": []
           }
         ],
+        "summary": "Update system configuration",
         "tags": [
-          "System Config"
+          "System config"
         ],
         "x-immich-admin-only": true,
-        "x-immich-permission": "systemConfig.update",
-        "description": "This endpoint is an admin-only route, and requires the `systemConfig.update` permission."
+        "x-immich-permission": "systemConfig.update"
       }
     },
     "/system-config/defaults": {
       "get": {
+        "description": "Retrieve the default values for the system configuration.",
         "operationId": "getConfigDefaults",
         "parameters": [],
         "responses": {
@@ -8381,16 +8604,17 @@
             "api_key": []
           }
         ],
+        "summary": "Get system configuration defaults",
         "tags": [
-          "System Config"
+          "System config"
         ],
         "x-immich-admin-only": true,
-        "x-immich-permission": "systemConfig.read",
-        "description": "This endpoint is an admin-only route, and requires the `systemConfig.read` permission."
+        "x-immich-permission": "systemConfig.read"
       }
     },
     "/system-config/storage-template-options": {
       "get": {
+        "description": "Retrieve exemplary storage template options.",
         "operationId": "getStorageTemplateOptions",
         "parameters": [],
         "responses": {
@@ -8416,16 +8640,17 @@
             "api_key": []
           }
         ],
+        "summary": "Get storage template options",
         "tags": [
-          "System Config"
+          "System config"
         ],
         "x-immich-admin-only": true,
-        "x-immich-permission": "systemConfig.read",
-        "description": "This endpoint is an admin-only route, and requires the `systemConfig.read` permission."
+        "x-immich-permission": "systemConfig.read"
       }
     },
     "/system-metadata/admin-onboarding": {
       "get": {
+        "description": "Retrieve the current admin onboarding status.",
         "operationId": "getAdminOnboarding",
         "parameters": [],
         "responses": {
@@ -8451,14 +8676,15 @@
             "api_key": []
           }
         ],
+        "summary": "Retrieve admin onboarding",
         "tags": [
-          "System Metadata"
+          "System metadata"
         ],
         "x-immich-admin-only": true,
-        "x-immich-permission": "systemMetadata.read",
-        "description": "This endpoint is an admin-only route, and requires the `systemMetadata.read` permission."
+        "x-immich-permission": "systemMetadata.read"
       },
       "post": {
+        "description": "Update the admin onboarding status.",
         "operationId": "updateAdminOnboarding",
         "parameters": [],
         "requestBody": {
@@ -8487,16 +8713,17 @@
             "api_key": []
           }
         ],
+        "summary": "Update admin onboarding",
         "tags": [
-          "System Metadata"
+          "System metadata"
         ],
         "x-immich-admin-only": true,
-        "x-immich-permission": "systemMetadata.update",
-        "description": "This endpoint is an admin-only route, and requires the `systemMetadata.update` permission."
+        "x-immich-permission": "systemMetadata.update"
       }
     },
     "/system-metadata/reverse-geocoding-state": {
       "get": {
+        "description": "Retrieve the current state of the reverse geocoding import.",
         "operationId": "getReverseGeocodingState",
         "parameters": [],
         "responses": {
@@ -8522,16 +8749,17 @@
             "api_key": []
           }
         ],
+        "summary": "Retrieve reverse geocoding state",
         "tags": [
-          "System Metadata"
+          "System metadata"
         ],
         "x-immich-admin-only": true,
-        "x-immich-permission": "systemMetadata.read",
-        "description": "This endpoint is an admin-only route, and requires the `systemMetadata.read` permission."
+        "x-immich-permission": "systemMetadata.read"
       }
     },
     "/system-metadata/version-check-state": {
       "get": {
+        "description": "Retrieve the current state of the version check process.",
         "operationId": "getVersionCheckState",
         "parameters": [],
         "responses": {
@@ -8557,16 +8785,17 @@
             "api_key": []
           }
         ],
+        "summary": "Retrieve version check state",
         "tags": [
-          "System Metadata"
+          "System metadata"
         ],
         "x-immich-admin-only": true,
-        "x-immich-permission": "systemMetadata.read",
-        "description": "This endpoint is an admin-only route, and requires the `systemMetadata.read` permission."
+        "x-immich-permission": "systemMetadata.read"
       }
     },
     "/tags": {
       "get": {
+        "description": "Retrieve a list of all tags.",
         "operationId": "getAllTags",
         "parameters": [],
         "responses": {
@@ -8595,13 +8824,14 @@
             "api_key": []
           }
         ],
+        "summary": "Retrieve tags",
         "tags": [
           "Tags"
         ],
-        "x-immich-permission": "tag.read",
-        "description": "This endpoint requires the `tag.read` permission."
+        "x-immich-permission": "tag.read"
       },
       "post": {
+        "description": "Create a new tag by providing a name and optional color.",
         "operationId": "createTag",
         "parameters": [],
         "requestBody": {
@@ -8637,13 +8867,14 @@
             "api_key": []
           }
         ],
+        "summary": "Create a tag",
         "tags": [
           "Tags"
         ],
-        "x-immich-permission": "tag.create",
-        "description": "This endpoint requires the `tag.create` permission."
+        "x-immich-permission": "tag.create"
       },
       "put": {
+        "description": "Create or update multiple tags in a single request.",
         "operationId": "upsertTags",
         "parameters": [],
         "requestBody": {
@@ -8682,15 +8913,16 @@
             "api_key": []
           }
         ],
+        "summary": "Upsert tags",
         "tags": [
           "Tags"
         ],
-        "x-immich-permission": "tag.create",
-        "description": "This endpoint requires the `tag.create` permission."
+        "x-immich-permission": "tag.create"
       }
     },
     "/tags/assets": {
       "put": {
+        "description": "Add multiple tags to multiple assets in a single request.",
         "operationId": "bulkTagAssets",
         "parameters": [],
         "requestBody": {
@@ -8726,15 +8958,16 @@
             "api_key": []
           }
         ],
+        "summary": "Tag assets",
         "tags": [
           "Tags"
         ],
-        "x-immich-permission": "tag.asset",
-        "description": "This endpoint requires the `tag.asset` permission."
+        "x-immich-permission": "tag.asset"
       }
     },
     "/tags/{id}": {
       "delete": {
+        "description": "Delete a specific tag by its ID.",
         "operationId": "deleteTag",
         "parameters": [
           {
@@ -8763,13 +8996,14 @@
             "api_key": []
           }
         ],
+        "summary": "Delete a tag",
         "tags": [
           "Tags"
         ],
-        "x-immich-permission": "tag.delete",
-        "description": "This endpoint requires the `tag.delete` permission."
+        "x-immich-permission": "tag.delete"
       },
       "get": {
+        "description": "Retrieve a specific tag by its ID.",
         "operationId": "getTagById",
         "parameters": [
           {
@@ -8805,13 +9039,14 @@
             "api_key": []
           }
         ],
+        "summary": "Retrieve a tag",
         "tags": [
           "Tags"
         ],
-        "x-immich-permission": "tag.read",
-        "description": "This endpoint requires the `tag.read` permission."
+        "x-immich-permission": "tag.read"
       },
       "put": {
+        "description": "Update an existing tag identified by its ID.",
         "operationId": "updateTag",
         "parameters": [
           {
@@ -8857,15 +9092,16 @@
             "api_key": []
           }
         ],
+        "summary": "Update a tag",
         "tags": [
           "Tags"
         ],
-        "x-immich-permission": "tag.update",
-        "description": "This endpoint requires the `tag.update` permission."
+        "x-immich-permission": "tag.update"
       }
     },
     "/tags/{id}/assets": {
       "delete": {
+        "description": "Remove a tag from all the specified assets.",
         "operationId": "untagAssets",
         "parameters": [
           {
@@ -8914,13 +9150,14 @@
             "api_key": []
           }
         ],
+        "summary": "Untag assets",
         "tags": [
           "Tags"
         ],
-        "x-immich-permission": "tag.asset",
-        "description": "This endpoint requires the `tag.asset` permission."
+        "x-immich-permission": "tag.asset"
       },
       "put": {
+        "description": "Add a tag to all the specified assets.",
         "operationId": "tagAssets",
         "parameters": [
           {
@@ -8969,15 +9206,16 @@
             "api_key": []
           }
         ],
+        "summary": "Tag assets",
         "tags": [
           "Tags"
         ],
-        "x-immich-permission": "tag.asset",
-        "description": "This endpoint requires the `tag.asset` permission."
+        "x-immich-permission": "tag.asset"
       }
     },
     "/timeline/bucket": {
       "get": {
+        "description": "Retrieve a string of all asset ids in a given time bucket.",
         "operationId": "getTimeBucket",
         "parameters": [
           {
@@ -9133,15 +9371,16 @@
             "api_key": []
           }
         ],
+        "summary": "Get time bucket",
         "tags": [
           "Timeline"
         ],
-        "x-immich-permission": "asset.read",
-        "description": "This endpoint requires the `asset.read` permission."
+        "x-immich-permission": "asset.read"
       }
     },
     "/timeline/buckets": {
       "get": {
+        "description": "Retrieve a list of all minimal time buckets.",
         "operationId": "getTimeBuckets",
         "parameters": [
           {
@@ -9290,15 +9529,16 @@
             "api_key": []
           }
         ],
+        "summary": "Get time buckets",
         "tags": [
           "Timeline"
         ],
-        "x-immich-permission": "asset.read",
-        "description": "This endpoint requires the `asset.read` permission."
+        "x-immich-permission": "asset.read"
       }
     },
     "/trash/empty": {
       "post": {
+        "description": "Permanently delete all items in the trash.",
         "operationId": "emptyTrash",
         "parameters": [],
         "responses": {
@@ -9324,15 +9564,16 @@
             "api_key": []
           }
         ],
+        "summary": "Empty trash",
         "tags": [
           "Trash"
         ],
-        "x-immich-permission": "asset.delete",
-        "description": "This endpoint requires the `asset.delete` permission."
+        "x-immich-permission": "asset.delete"
       }
     },
     "/trash/restore": {
       "post": {
+        "description": "Restore all items in the trash.",
         "operationId": "restoreTrash",
         "parameters": [],
         "responses": {
@@ -9358,15 +9599,16 @@
             "api_key": []
           }
         ],
+        "summary": "Restore trash",
         "tags": [
           "Trash"
         ],
-        "x-immich-permission": "asset.delete",
-        "description": "This endpoint requires the `asset.delete` permission."
+        "x-immich-permission": "asset.delete"
       }
     },
     "/trash/restore/assets": {
       "post": {
+        "description": "Restore specific assets from the trash.",
         "operationId": "restoreAssets",
         "parameters": [],
         "requestBody": {
@@ -9402,15 +9644,16 @@
             "api_key": []
           }
         ],
+        "summary": "Restore assets",
         "tags": [
           "Trash"
         ],
-        "x-immich-permission": "asset.delete",
-        "description": "This endpoint requires the `asset.delete` permission."
+        "x-immich-permission": "asset.delete"
       }
     },
     "/users": {
       "get": {
+        "description": "Retrieve a list of all users on the server.",
         "operationId": "searchUsers",
         "parameters": [],
         "responses": {
@@ -9439,15 +9682,16 @@
             "api_key": []
           }
         ],
+        "summary": "Get all users",
         "tags": [
           "Users"
         ],
-        "x-immich-permission": "user.read",
-        "description": "This endpoint requires the `user.read` permission."
+        "x-immich-permission": "user.read"
       }
     },
     "/users/me": {
       "get": {
+        "description": "Retrieve information about the user making the API request.",
         "operationId": "getMyUser",
         "parameters": [],
         "responses": {
@@ -9473,13 +9717,14 @@
             "api_key": []
           }
         ],
+        "summary": "Get current user",
         "tags": [
           "Users"
         ],
-        "x-immich-permission": "user.read",
-        "description": "This endpoint requires the `user.read` permission."
+        "x-immich-permission": "user.read"
       },
       "put": {
+        "description": "Update the current user making teh API request.",
         "operationId": "updateMyUser",
         "parameters": [],
         "requestBody": {
@@ -9515,15 +9760,16 @@
             "api_key": []
           }
         ],
+        "summary": "Update current user",
         "tags": [
           "Users"
         ],
-        "x-immich-permission": "user.update",
-        "description": "This endpoint requires the `user.update` permission."
+        "x-immich-permission": "user.update"
       }
     },
     "/users/me/license": {
       "delete": {
+        "description": "Delete the registered product key for the current user.",
         "operationId": "deleteUserLicense",
         "parameters": [],
         "responses": {
@@ -9542,13 +9788,14 @@
             "api_key": []
           }
         ],
+        "summary": "Delete user product key",
         "tags": [
           "Users"
         ],
-        "x-immich-permission": "userLicense.delete",
-        "description": "This endpoint requires the `userLicense.delete` permission."
+        "x-immich-permission": "userLicense.delete"
       },
       "get": {
+        "description": "Retrieve information about whether the current user has a registered product key.",
         "operationId": "getUserLicense",
         "parameters": [],
         "responses": {
@@ -9574,13 +9821,14 @@
             "api_key": []
           }
         ],
+        "summary": "Retrieve user product key",
         "tags": [
           "Users"
         ],
-        "x-immich-permission": "userLicense.read",
-        "description": "This endpoint requires the `userLicense.read` permission."
+        "x-immich-permission": "userLicense.read"
       },
       "put": {
+        "description": "Register a product key for the current user.",
         "operationId": "setUserLicense",
         "parameters": [],
         "requestBody": {
@@ -9616,15 +9864,16 @@
             "api_key": []
           }
         ],
+        "summary": "Set user product key",
         "tags": [
           "Users"
         ],
-        "x-immich-permission": "userLicense.update",
-        "description": "This endpoint requires the `userLicense.update` permission."
+        "x-immich-permission": "userLicense.update"
       }
     },
     "/users/me/onboarding": {
       "delete": {
+        "description": "Delete the onboarding status of the current user.",
         "operationId": "deleteUserOnboarding",
         "parameters": [],
         "responses": {
@@ -9643,13 +9892,14 @@
             "api_key": []
           }
         ],
+        "summary": "Delete user onboarding",
         "tags": [
           "Users"
         ],
-        "x-immich-permission": "userOnboarding.delete",
-        "description": "This endpoint requires the `userOnboarding.delete` permission."
+        "x-immich-permission": "userOnboarding.delete"
       },
       "get": {
+        "description": "Retrieve the onboarding status of the current user.",
         "operationId": "getUserOnboarding",
         "parameters": [],
         "responses": {
@@ -9675,13 +9925,14 @@
             "api_key": []
           }
         ],
+        "summary": "Retrieve user onboarding",
         "tags": [
           "Users"
         ],
-        "x-immich-permission": "userOnboarding.read",
-        "description": "This endpoint requires the `userOnboarding.read` permission."
+        "x-immich-permission": "userOnboarding.read"
       },
       "put": {
+        "description": "Update the onboarding status of the current user.",
         "operationId": "setUserOnboarding",
         "parameters": [],
         "requestBody": {
@@ -9717,15 +9968,16 @@
             "api_key": []
           }
         ],
+        "summary": "Update user onboarding",
         "tags": [
           "Users"
         ],
-        "x-immich-permission": "userOnboarding.update",
-        "description": "This endpoint requires the `userOnboarding.update` permission."
+        "x-immich-permission": "userOnboarding.update"
       }
     },
     "/users/me/preferences": {
       "get": {
+        "description": "Retrieve the preferences for the current user.",
         "operationId": "getMyPreferences",
         "parameters": [],
         "responses": {
@@ -9751,13 +10003,14 @@
             "api_key": []
           }
         ],
+        "summary": "Get my preferences",
         "tags": [
           "Users"
         ],
-        "x-immich-permission": "userPreference.read",
-        "description": "This endpoint requires the `userPreference.read` permission."
+        "x-immich-permission": "userPreference.read"
       },
       "put": {
+        "description": "Update the preferences of the current user.",
         "operationId": "updateMyPreferences",
         "parameters": [],
         "requestBody": {
@@ -9793,15 +10046,16 @@
             "api_key": []
           }
         ],
+        "summary": "Update my preferences",
         "tags": [
           "Users"
         ],
-        "x-immich-permission": "userPreference.update",
-        "description": "This endpoint requires the `userPreference.update` permission."
+        "x-immich-permission": "userPreference.update"
       }
     },
     "/users/profile-image": {
       "delete": {
+        "description": "Delete the profile image of the current user.",
         "operationId": "deleteProfileImage",
         "parameters": [],
         "responses": {
@@ -9820,13 +10074,14 @@
             "api_key": []
           }
         ],
+        "summary": "Delete user profile image",
         "tags": [
           "Users"
         ],
-        "x-immich-permission": "userProfileImage.delete",
-        "description": "This endpoint requires the `userProfileImage.delete` permission."
+        "x-immich-permission": "userProfileImage.delete"
       },
       "post": {
+        "description": "Upload and set a new profile image for the current user.",
         "operationId": "createProfileImage",
         "parameters": [],
         "requestBody": {
@@ -9863,15 +10118,16 @@
             "api_key": []
           }
         ],
+        "summary": "Create user profile image",
         "tags": [
           "Users"
         ],
-        "x-immich-permission": "userProfileImage.update",
-        "description": "This endpoint requires the `userProfileImage.update` permission."
+        "x-immich-permission": "userProfileImage.update"
       }
     },
     "/users/{id}": {
       "get": {
+        "description": "Retrieve a specific user by their ID.",
         "operationId": "getUser",
         "parameters": [
           {
@@ -9907,15 +10163,16 @@
             "api_key": []
           }
         ],
+        "summary": "Retrieve a user",
         "tags": [
           "Users"
         ],
-        "x-immich-permission": "user.read",
-        "description": "This endpoint requires the `user.read` permission."
+        "x-immich-permission": "user.read"
       }
     },
     "/users/{id}/profile-image": {
       "get": {
+        "description": "Retrieve the profile image file for a user.",
         "operationId": "getProfileImage",
         "parameters": [
           {
@@ -9952,15 +10209,16 @@
             "api_key": []
           }
         ],
+        "summary": "Retrieve user profile image",
         "tags": [
           "Users"
         ],
-        "x-immich-permission": "userProfileImage.read",
-        "description": "This endpoint requires the `userProfileImage.read` permission."
+        "x-immich-permission": "userProfileImage.read"
       }
     },
     "/view/folder": {
       "get": {
+        "description": "Retrieve assets that are children of a specific folder.",
         "operationId": "getAssetsByOriginalPath",
         "parameters": [
           {
@@ -9998,13 +10256,15 @@
             "api_key": []
           }
         ],
+        "summary": "Retrieve assets by original path",
         "tags": [
-          "View"
+          "Views"
         ]
       }
     },
     "/view/folder/unique-paths": {
       "get": {
+        "description": "Retrieve a list of unique folder paths from asset original paths.",
         "operationId": "getUniqueOriginalPaths",
         "parameters": [],
         "responses": {
@@ -10033,8 +10293,9 @@
             "api_key": []
           }
         ],
+        "summary": "Retrieve unique paths",
         "tags": [
-          "View"
+          "Views"
         ]
       }
     }
@@ -10045,7 +10306,136 @@
     "version": "2.2.3",
     "contact": {}
   },
-  "tags": [],
+  "tags": [
+    {
+      "name": "Activities",
+      "description": "An activity is a like or a comment made by a user on an asset or album."
+    },
+    {
+      "name": "Albums",
+      "description": "An album is a collection of assets that can be shared with other users or via shared links."
+    },
+    {
+      "name": "API keys",
+      "description": "An api key can be used to programmatically access the Immich API."
+    },
+    {
+      "name": "Assets",
+      "description": "An asset is an image or video that has been uploaded to Immich."
+    },
+    {
+      "name": "Authentication",
+      "description": "Endpoints related to user authentication, including OAuth."
+    },
+    {
+      "name": "Authentication (admin)",
+      "description": "Administrative endpoints related to authentication."
+    },
+    {
+      "name": "Deprecated",
+      "description": "Deprecated endpoints that are planned for removal in the next major release."
+    },
+    {
+      "name": "Download",
+      "description": "Endpoints for downloading assets or collections of assets."
+    },
+    {
+      "name": "Duplicates",
+      "description": "Endpoints for managing and identifying duplicate assets."
+    },
+    {
+      "name": "Faces",
+      "description": "A face is a detected human face within an asset, which can be associated with a person. Faces are normally detected via machine learning, but can also be created via manually."
+    },
+    {
+      "name": "Jobs",
+      "description": "Queues and background jobs are used for processing tasks asynchronously. Queues can be paused and resumed as needed."
+    },
+    {
+      "name": "Libraries",
+      "description": "An external library is made up of input file paths or expressions that are scanned for asset files. Discovered files are automatically imported. Assets much be unique within a library, but can be duplicated across libraries. Each user has a default upload library, and can have one or more external libraries."
+    },
+    {
+      "name": "Map",
+      "description": "Map endpoints include supplemental functionality related to geolocation, such as reverse geocoding and retrieving map markers for assets with geolocation data."
+    },
+    {
+      "name": "Memories",
+      "description": "A memory is a specialized collection of assets with dedicated viewing implementations in the web and mobile clients. A memory includes fields related to visibility and are automatically generated per user via a background job."
+    },
+    {
+      "name": "Notifications",
+      "description": "A notification is a specialized message sent to users to inform them of important events. Currently, these notifications are only shown in the Immich web application."
+    },
+    {
+      "name": "Notifications (admin)",
+      "description": "Notification administrative endpoints."
+    },
+    {
+      "name": "Partners",
+      "description": "A partner is a link with another user that allows sharing of assets between two users."
+    },
+    {
+      "name": "People",
+      "description": "A person is a collection of faces, which can be favorited and named. A person can also be merged into another person. People are automatically created via the face recognition job."
+    },
+    {
+      "name": "Search",
+      "description": "Endpoints related to searching assets via text, smart search, optical character recognition (OCR), and other filters like person, album, and other metadata. Search endpoints usually support pagination and sorting."
+    },
+    {
+      "name": "Server",
+      "description": "Information about the current server deployment, including version and build information, available features, supported media types, and more."
+    },
+    {
+      "name": "Sessions",
+      "description": "A session represents an authenticated login session for a user. Sessions also appear in the web application as \"Authorized devices\"."
+    },
+    {
+      "name": "Shared links",
+      "description": "A shared link is a public url that provides access to a specific album, asset, or collection of assets. A shared link can be protected with a password, include a specific slug, allow or disallow downloads, and optionally include an expiration date."
+    },
+    {
+      "name": "Stacks",
+      "description": "A stack is a group of related assets. One asset is the \"primary\" asset, and the rest are \"child\" assets. On the main timeline, stack parents are included by default, while child assets are hidden."
+    },
+    {
+      "name": "Sync",
+      "description": "A collection of endpoints for the new mobile synchronization implementation."
+    },
+    {
+      "name": "System config",
+      "description": "Endpoints to view, modify, and validate the system configuration settings."
+    },
+    {
+      "name": "System metadata",
+      "description": "Endpoints to view, modify, and validate the system metadata, which includes information about things like admin onboarding status."
+    },
+    {
+      "name": "Tags",
+      "description": "A tag is a user-defined label that can be applied to assets for organizational purposes. Tags can also be hierarchical, allowing for parent-child relationships between tags."
+    },
+    {
+      "name": "Timeline",
+      "description": "Specialized endpoints related to the timeline implementation used in the web application. External applications or tools should not use or rely on these endpoints, as they are subject to change without notice."
+    },
+    {
+      "name": "Trash",
+      "description": "Endpoints for managing the trash can, which includes assets that have been discarded. Items in the trash are automatically deleted after a configured amount of time."
+    },
+    {
+      "name": "Users (admin)",
+      "description": "Administrative endpoints for managing users, including creating, updating, deleting, and restoring users. Also includes endpoints for resetting passwords and PIN codes."
+    },
+    {
+      "name": "Users",
+      "description": "Endpoints for viewing and updating the current users, including product key information, profile picture data, onboarding progress, and more."
+    },
+    {
+      "name": "Views",
+      "description": "Endpoints for specialized views, such as the folder view."
+    }
+  ],
   "servers": [
     {
       "url": "/api"
diff --git a/open-api/typescript-sdk/src/fetch-client.ts b/open-api/typescript-sdk/src/fetch-client.ts
index a0f43c620b..eed7b27088 100644
--- a/open-api/typescript-sdk/src/fetch-client.ts
+++ b/open-api/typescript-sdk/src/fetch-client.ts
@@ -1677,7 +1677,7 @@ export type CreateProfileImageResponseDto = {
     userId: string;
 };
 /**
- * This endpoint requires the `activity.read` permission.
+ * List all activities
  */
 export function getActivities({ albumId, assetId, level, $type, userId }: {
     albumId: string;
@@ -1700,7 +1700,7 @@ export function getActivities({ albumId, assetId, level, $type, userId }: {
     }));
 }
 /**
- * This endpoint requires the `activity.create` permission.
+ * Create an activity
  */
 export function createActivity({ activityCreateDto }: {
     activityCreateDto: ActivityCreateDto;
@@ -1715,7 +1715,7 @@ export function createActivity({ activityCreateDto }: {
     })));
 }
 /**
- * This endpoint requires the `activity.statistics` permission.
+ * Retrieve activity statistics
  */
 export function getActivityStatistics({ albumId, assetId }: {
     albumId: string;
@@ -1732,7 +1732,7 @@ export function getActivityStatistics({ albumId, assetId }: {
     }));
 }
 /**
- * This endpoint requires the `activity.delete` permission.
+ * Delete an activity
  */
 export function deleteActivity({ id }: {
     id: string;
@@ -1743,7 +1743,7 @@ export function deleteActivity({ id }: {
     }));
 }
 /**
- * This endpoint is an admin-only route, and requires the `adminAuth.unlinkAll` permission.
+ * Unlink all OAuth accounts
  */
 export function unlinkAllOAuthAccountsAdmin(opts?: Oazapfts.RequestOpts) {
     return oazapfts.ok(oazapfts.fetchText("/admin/auth/unlink-all", {
@@ -1751,6 +1751,9 @@ export function unlinkAllOAuthAccountsAdmin(opts?: Oazapfts.RequestOpts) {
         method: "POST"
     }));
 }
+/**
+ * Create a notification
+ */
 export function createNotification({ notificationCreateDto }: {
     notificationCreateDto: NotificationCreateDto;
 }, opts?: Oazapfts.RequestOpts) {
@@ -1763,6 +1766,9 @@ export function createNotification({ notificationCreateDto }: {
         body: notificationCreateDto
     })));
 }
+/**
+ * Render email template
+ */
 export function getNotificationTemplateAdmin({ name, templateDto }: {
     name: string;
     templateDto: TemplateDto;
@@ -1776,6 +1782,9 @@ export function getNotificationTemplateAdmin({ name, templateDto }: {
         body: templateDto
     })));
 }
+/**
+ * Send test email
+ */
 export function sendTestEmailAdmin({ systemConfigSmtpDto }: {
     systemConfigSmtpDto: SystemConfigSmtpDto;
 }, opts?: Oazapfts.RequestOpts) {
@@ -1789,7 +1798,7 @@ export function sendTestEmailAdmin({ systemConfigSmtpDto }: {
     })));
 }
 /**
- * This endpoint is an admin-only route, and requires the `adminUser.read` permission.
+ * Search users
  */
 export function searchUsersAdmin({ id, withDeleted }: {
     id?: string;
@@ -1806,7 +1815,7 @@ export function searchUsersAdmin({ id, withDeleted }: {
     }));
 }
 /**
- * This endpoint is an admin-only route, and requires the `adminUser.create` permission.
+ * Create a user
  */
 export function createUserAdmin({ userAdminCreateDto }: {
     userAdminCreateDto: UserAdminCreateDto;
@@ -1821,7 +1830,7 @@ export function createUserAdmin({ userAdminCreateDto }: {
     })));
 }
 /**
- * This endpoint is an admin-only route, and requires the `adminUser.delete` permission.
+ * Delete a user
  */
 export function deleteUserAdmin({ id, userAdminDeleteDto }: {
     id: string;
@@ -1837,7 +1846,7 @@ export function deleteUserAdmin({ id, userAdminDeleteDto }: {
     })));
 }
 /**
- * This endpoint is an admin-only route, and requires the `adminUser.read` permission.
+ * Retrieve a user
  */
 export function getUserAdmin({ id }: {
     id: string;
@@ -1850,7 +1859,7 @@ export function getUserAdmin({ id }: {
     }));
 }
 /**
- * This endpoint is an admin-only route, and requires the `adminUser.update` permission.
+ * Update a user
  */
 export function updateUserAdmin({ id, userAdminUpdateDto }: {
     id: string;
@@ -1866,7 +1875,7 @@ export function updateUserAdmin({ id, userAdminUpdateDto }: {
     })));
 }
 /**
- * This endpoint is an admin-only route, and requires the `adminUser.read` permission.
+ * Retrieve user preferences
  */
 export function getUserPreferencesAdmin({ id }: {
     id: string;
@@ -1879,7 +1888,7 @@ export function getUserPreferencesAdmin({ id }: {
     }));
 }
 /**
- * This endpoint is an admin-only route, and requires the `adminUser.update` permission.
+ * Update user preferences
  */
 export function updateUserPreferencesAdmin({ id, userPreferencesUpdateDto }: {
     id: string;
@@ -1895,7 +1904,7 @@ export function updateUserPreferencesAdmin({ id, userPreferencesUpdateDto }: {
     })));
 }
 /**
- * This endpoint is an admin-only route, and requires the `adminUser.delete` permission.
+ * Restore a deleted user
  */
 export function restoreUserAdmin({ id }: {
     id: string;
@@ -1909,7 +1918,7 @@ export function restoreUserAdmin({ id }: {
     }));
 }
 /**
- * This endpoint is an admin-only route, and requires the `adminSession.read` permission.
+ * Retrieve user sessions
  */
 export function getUserSessionsAdmin({ id }: {
     id: string;
@@ -1922,7 +1931,7 @@ export function getUserSessionsAdmin({ id }: {
     }));
 }
 /**
- * This endpoint is an admin-only route, and requires the `adminUser.read` permission.
+ * Retrieve user statistics
  */
 export function getUserStatisticsAdmin({ id, isFavorite, isTrashed, visibility }: {
     id: string;
@@ -1942,7 +1951,7 @@ export function getUserStatisticsAdmin({ id, isFavorite, isTrashed, visibility }
     }));
 }
 /**
- * This endpoint requires the `album.read` permission.
+ * List all albums
  */
 export function getAllAlbums({ assetId, shared }: {
     assetId?: string;
@@ -1959,7 +1968,7 @@ export function getAllAlbums({ assetId, shared }: {
     }));
 }
 /**
- * This endpoint requires the `album.create` permission.
+ * Create an album
  */
 export function createAlbum({ createAlbumDto }: {
     createAlbumDto: CreateAlbumDto;
@@ -1974,7 +1983,7 @@ export function createAlbum({ createAlbumDto }: {
     })));
 }
 /**
- * This endpoint requires the `albumAsset.create` permission.
+ * Add assets to albums
  */
 export function addAssetsToAlbums({ key, slug, albumsAddAssetsDto }: {
     key?: string;
@@ -1994,7 +2003,7 @@ export function addAssetsToAlbums({ key, slug, albumsAddAssetsDto }: {
     })));
 }
 /**
- * This endpoint requires the `album.statistics` permission.
+ * Retrieve album statistics
  */
 export function getAlbumStatistics(opts?: Oazapfts.RequestOpts) {
     return oazapfts.ok(oazapfts.fetchJson<{
@@ -2005,7 +2014,7 @@ export function getAlbumStatistics(opts?: Oazapfts.RequestOpts) {
     }));
 }
 /**
- * This endpoint requires the `album.delete` permission.
+ * Delete an album
  */
 export function deleteAlbum({ id }: {
     id: string;
@@ -2016,7 +2025,7 @@ export function deleteAlbum({ id }: {
     }));
 }
 /**
- * This endpoint requires the `album.read` permission.
+ * Retrieve an album
  */
 export function getAlbumInfo({ id, key, slug, withoutAssets }: {
     id: string;
@@ -2036,7 +2045,7 @@ export function getAlbumInfo({ id, key, slug, withoutAssets }: {
     }));
 }
 /**
- * This endpoint requires the `album.update` permission.
+ * Update an album
  */
 export function updateAlbumInfo({ id, updateAlbumDto }: {
     id: string;
@@ -2052,7 +2061,7 @@ export function updateAlbumInfo({ id, updateAlbumDto }: {
     })));
 }
 /**
- * This endpoint requires the `albumAsset.delete` permission.
+ * Remove assets from an album
  */
 export function removeAssetFromAlbum({ id, bulkIdsDto }: {
     id: string;
@@ -2068,7 +2077,7 @@ export function removeAssetFromAlbum({ id, bulkIdsDto }: {
     })));
 }
 /**
- * This endpoint requires the `albumAsset.create` permission.
+ * Add assets to an album
  */
 export function addAssetsToAlbum({ id, key, slug, bulkIdsDto }: {
     id: string;
@@ -2089,7 +2098,7 @@ export function addAssetsToAlbum({ id, key, slug, bulkIdsDto }: {
     })));
 }
 /**
- * This endpoint requires the `albumUser.delete` permission.
+ * Remove user from album
  */
 export function removeUserFromAlbum({ id, userId }: {
     id: string;
@@ -2101,7 +2110,7 @@ export function removeUserFromAlbum({ id, userId }: {
     }));
 }
 /**
- * This endpoint requires the `albumUser.update` permission.
+ * Update user role
  */
 export function updateAlbumUser({ id, userId, updateAlbumUserDto }: {
     id: string;
@@ -2115,7 +2124,7 @@ export function updateAlbumUser({ id, userId, updateAlbumUserDto }: {
     })));
 }
 /**
- * This endpoint requires the `albumUser.create` permission.
+ * Share album with users
  */
 export function addUsersToAlbum({ id, addUsersDto }: {
     id: string;
@@ -2131,7 +2140,7 @@ export function addUsersToAlbum({ id, addUsersDto }: {
     })));
 }
 /**
- * This endpoint requires the `apiKey.read` permission.
+ * List all API keys
  */
 export function getApiKeys(opts?: Oazapfts.RequestOpts) {
     return oazapfts.ok(oazapfts.fetchJson<{
@@ -2142,7 +2151,7 @@ export function getApiKeys(opts?: Oazapfts.RequestOpts) {
     }));
 }
 /**
- * This endpoint requires the `apiKey.create` permission.
+ * Create an API key
  */
 export function createApiKey({ apiKeyCreateDto }: {
     apiKeyCreateDto: ApiKeyCreateDto;
@@ -2156,6 +2165,9 @@ export function createApiKey({ apiKeyCreateDto }: {
         body: apiKeyCreateDto
     })));
 }
+/**
+ * Retrieve the current API key
+ */
 export function getMyApiKey(opts?: Oazapfts.RequestOpts) {
     return oazapfts.ok(oazapfts.fetchJson<{
         status: 200;
@@ -2165,7 +2177,7 @@ export function getMyApiKey(opts?: Oazapfts.RequestOpts) {
     }));
 }
 /**
- * This endpoint requires the `apiKey.delete` permission.
+ * Delete an API key
  */
 export function deleteApiKey({ id }: {
     id: string;
@@ -2176,7 +2188,7 @@ export function deleteApiKey({ id }: {
     }));
 }
 /**
- * This endpoint requires the `apiKey.read` permission.
+ * Retrieve an API key
  */
 export function getApiKey({ id }: {
     id: string;
@@ -2189,7 +2201,7 @@ export function getApiKey({ id }: {
     }));
 }
 /**
- * This endpoint requires the `apiKey.update` permission.
+ * Update an API key
  */
 export function updateApiKey({ id, apiKeyUpdateDto }: {
     id: string;
@@ -2205,7 +2217,7 @@ export function updateApiKey({ id, apiKeyUpdateDto }: {
     })));
 }
 /**
- * This endpoint requires the `asset.delete` permission.
+ * Delete assets
  */
 export function deleteAssets({ assetBulkDeleteDto }: {
     assetBulkDeleteDto: AssetBulkDeleteDto;
@@ -2217,7 +2229,7 @@ export function deleteAssets({ assetBulkDeleteDto }: {
     })));
 }
 /**
- * This endpoint requires the `asset.upload` permission.
+ * Upload asset
  */
 export function uploadAsset({ key, slug, xImmichChecksum, assetMediaCreateDto }: {
     key?: string;
@@ -2241,7 +2253,7 @@ export function uploadAsset({ key, slug, xImmichChecksum, assetMediaCreateDto }:
     })));
 }
 /**
- * This endpoint requires the `asset.update` permission.
+ * Update assets
  */
 export function updateAssets({ assetBulkUpdateDto }: {
     assetBulkUpdateDto: AssetBulkUpdateDto;
@@ -2253,7 +2265,7 @@ export function updateAssets({ assetBulkUpdateDto }: {
     })));
 }
 /**
- * checkBulkUpload
+ * Check bulk upload
  */
 export function checkBulkUpload({ assetBulkUploadCheckDto }: {
     assetBulkUploadCheckDto: AssetBulkUploadCheckDto;
@@ -2268,7 +2280,7 @@ export function checkBulkUpload({ assetBulkUploadCheckDto }: {
     })));
 }
 /**
- * This endpoint requires the `asset.copy` permission.
+ * Copy asset
  */
 export function copyAsset({ assetCopyDto }: {
     assetCopyDto: AssetCopyDto;
@@ -2280,7 +2292,7 @@ export function copyAsset({ assetCopyDto }: {
     })));
 }
 /**
- * getAllUserAssetsByDeviceId
+ * Retrieve assets by device ID
  */
 export function getAllUserAssetsByDeviceId({ deviceId }: {
     deviceId: string;
@@ -2293,7 +2305,7 @@ export function getAllUserAssetsByDeviceId({ deviceId }: {
     }));
 }
 /**
- * checkExistingAssets
+ * Check existing assets
  */
 export function checkExistingAssets({ checkExistingAssetsDto }: {
     checkExistingAssetsDto: CheckExistingAssetsDto;
@@ -2307,6 +2319,9 @@ export function checkExistingAssets({ checkExistingAssetsDto }: {
         body: checkExistingAssetsDto
     })));
 }
+/**
+ * Run an asset job
+ */
 export function runAssetJobs({ assetJobsDto }: {
     assetJobsDto: AssetJobsDto;
 }, opts?: Oazapfts.RequestOpts) {
@@ -2317,7 +2332,7 @@ export function runAssetJobs({ assetJobsDto }: {
     })));
 }
 /**
- * This property was deprecated in v1.116.0. This endpoint requires the `asset.read` permission.
+ * Get random assets
  */
 export function getRandom({ count }: {
     count?: number;
@@ -2332,7 +2347,7 @@ export function getRandom({ count }: {
     }));
 }
 /**
- * This endpoint requires the `asset.statistics` permission.
+ * Get asset statistics
  */
 export function getAssetStatistics({ isFavorite, isTrashed, visibility }: {
     isFavorite?: boolean;
@@ -2351,7 +2366,7 @@ export function getAssetStatistics({ isFavorite, isTrashed, visibility }: {
     }));
 }
 /**
- * This endpoint requires the `asset.read` permission.
+ * Retrieve an asset
  */
 export function getAssetInfo({ id, key, slug }: {
     id: string;
@@ -2369,7 +2384,7 @@ export function getAssetInfo({ id, key, slug }: {
     }));
 }
 /**
- * This endpoint requires the `asset.update` permission.
+ * Update an asset
  */
 export function updateAsset({ id, updateAssetDto }: {
     id: string;
@@ -2385,7 +2400,7 @@ export function updateAsset({ id, updateAssetDto }: {
     })));
 }
 /**
- * This endpoint requires the `asset.read` permission.
+ * Get asset metadata
  */
 export function getAssetMetadata({ id }: {
     id: string;
@@ -2398,7 +2413,7 @@ export function getAssetMetadata({ id }: {
     }));
 }
 /**
- * This endpoint requires the `asset.update` permission.
+ * Update asset metadata
  */
 export function updateAssetMetadata({ id, assetMetadataUpsertDto }: {
     id: string;
@@ -2414,7 +2429,7 @@ export function updateAssetMetadata({ id, assetMetadataUpsertDto }: {
     })));
 }
 /**
- * This endpoint requires the `asset.update` permission.
+ * Delete asset metadata by key
  */
 export function deleteAssetMetadata({ id, key }: {
     id: string;
@@ -2426,7 +2441,7 @@ export function deleteAssetMetadata({ id, key }: {
     }));
 }
 /**
- * This endpoint requires the `asset.read` permission.
+ * Retrieve asset metadata by key
  */
 export function getAssetMetadataByKey({ id, key }: {
     id: string;
@@ -2440,7 +2455,7 @@ export function getAssetMetadataByKey({ id, key }: {
     }));
 }
 /**
- * This endpoint requires the `asset.read` permission.
+ * Retrieve asset OCR data
  */
 export function getAssetOcr({ id }: {
     id: string;
@@ -2453,7 +2468,7 @@ export function getAssetOcr({ id }: {
     }));
 }
 /**
- * This endpoint requires the `asset.download` permission.
+ * Download original asset
  */
 export function downloadAsset({ id, key, slug }: {
     id: string;
@@ -2471,7 +2486,7 @@ export function downloadAsset({ id, key, slug }: {
     }));
 }
 /**
- * Replace the asset with new file, without changing its id
+ * Replace asset
  */
 export function replaceAsset({ id, key, slug, assetMediaReplaceDto }: {
     id: string;
@@ -2492,7 +2507,7 @@ export function replaceAsset({ id, key, slug, assetMediaReplaceDto }: {
     })));
 }
 /**
- * This endpoint requires the `asset.view` permission.
+ * View asset thumbnail
  */
 export function viewAsset({ id, key, size, slug }: {
     id: string;
@@ -2512,7 +2527,7 @@ export function viewAsset({ id, key, size, slug }: {
     }));
 }
 /**
- * This endpoint requires the `asset.view` permission.
+ * Play asset video
  */
 export function playAssetVideo({ id, key, slug }: {
     id: string;
@@ -2529,6 +2544,9 @@ export function playAssetVideo({ id, key, slug }: {
         ...opts
     }));
 }
+/**
+ * Register admin
+ */
 export function signUpAdmin({ signUpDto }: {
     signUpDto: SignUpDto;
 }, opts?: Oazapfts.RequestOpts) {
@@ -2542,7 +2560,7 @@ export function signUpAdmin({ signUpDto }: {
     })));
 }
 /**
- * This endpoint requires the `auth.changePassword` permission.
+ * Change password
  */
 export function changePassword({ changePasswordDto }: {
     changePasswordDto: ChangePasswordDto;
@@ -2556,6 +2574,9 @@ export function changePassword({ changePasswordDto }: {
         body: changePasswordDto
     })));
 }
+/**
+ * Login
+ */
 export function login({ loginCredentialDto }: {
     loginCredentialDto: LoginCredentialDto;
 }, opts?: Oazapfts.RequestOpts) {
@@ -2568,6 +2589,9 @@ export function login({ loginCredentialDto }: {
         body: loginCredentialDto
     })));
 }
+/**
+ * Logout
+ */
 export function logout(opts?: Oazapfts.RequestOpts) {
     return oazapfts.ok(oazapfts.fetchJson<{
         status: 200;
@@ -2578,7 +2602,7 @@ export function logout(opts?: Oazapfts.RequestOpts) {
     }));
 }
 /**
- * This endpoint requires the `pinCode.delete` permission.
+ * Reset pin code
  */
 export function resetPinCode({ pinCodeResetDto }: {
     pinCodeResetDto: PinCodeResetDto;
@@ -2590,7 +2614,7 @@ export function resetPinCode({ pinCodeResetDto }: {
     })));
 }
 /**
- * This endpoint requires the `pinCode.create` permission.
+ * Setup pin code
  */
 export function setupPinCode({ pinCodeSetupDto }: {
     pinCodeSetupDto: PinCodeSetupDto;
@@ -2602,7 +2626,7 @@ export function setupPinCode({ pinCodeSetupDto }: {
     })));
 }
 /**
- * This endpoint requires the `pinCode.update` permission.
+ * Change pin code
  */
 export function changePinCode({ pinCodeChangeDto }: {
     pinCodeChangeDto: PinCodeChangeDto;
@@ -2613,12 +2637,18 @@ export function changePinCode({ pinCodeChangeDto }: {
         body: pinCodeChangeDto
     })));
 }
+/**
+ * Lock auth session
+ */
 export function lockAuthSession(opts?: Oazapfts.RequestOpts) {
     return oazapfts.ok(oazapfts.fetchText("/auth/session/lock", {
         ...opts,
         method: "POST"
     }));
 }
+/**
+ * Unlock auth session
+ */
 export function unlockAuthSession({ sessionUnlockDto }: {
     sessionUnlockDto: SessionUnlockDto;
 }, opts?: Oazapfts.RequestOpts) {
@@ -2628,6 +2658,9 @@ export function unlockAuthSession({ sessionUnlockDto }: {
         body: sessionUnlockDto
     })));
 }
+/**
+ * Retrieve auth status
+ */
 export function getAuthStatus(opts?: Oazapfts.RequestOpts) {
     return oazapfts.ok(oazapfts.fetchJson<{
         status: 200;
@@ -2636,6 +2669,9 @@ export function getAuthStatus(opts?: Oazapfts.RequestOpts) {
         ...opts
     }));
 }
+/**
+ * Validate access token
+ */
 export function validateAccessToken(opts?: Oazapfts.RequestOpts) {
     return oazapfts.ok(oazapfts.fetchJson<{
         status: 200;
@@ -2646,7 +2682,7 @@ export function validateAccessToken(opts?: Oazapfts.RequestOpts) {
     }));
 }
 /**
- * This endpoint requires the `asset.download` permission.
+ * Download asset archive
  */
 export function downloadArchive({ key, slug, assetIdsDto }: {
     key?: string;
@@ -2666,7 +2702,7 @@ export function downloadArchive({ key, slug, assetIdsDto }: {
     })));
 }
 /**
- * This endpoint requires the `asset.download` permission.
+ * Retrieve download information
  */
 export function getDownloadInfo({ key, slug, downloadInfoDto }: {
     key?: string;
@@ -2686,7 +2722,7 @@ export function getDownloadInfo({ key, slug, downloadInfoDto }: {
     })));
 }
 /**
- * This endpoint requires the `duplicate.delete` permission.
+ * Delete duplicates
  */
 export function deleteDuplicates({ bulkIdsDto }: {
     bulkIdsDto: BulkIdsDto;
@@ -2698,7 +2734,7 @@ export function deleteDuplicates({ bulkIdsDto }: {
     })));
 }
 /**
- * This endpoint requires the `duplicate.read` permission.
+ * Retrieve duplicates
  */
 export function getAssetDuplicates(opts?: Oazapfts.RequestOpts) {
     return oazapfts.ok(oazapfts.fetchJson<{
@@ -2709,7 +2745,7 @@ export function getAssetDuplicates(opts?: Oazapfts.RequestOpts) {
     }));
 }
 /**
- * This endpoint requires the `duplicate.delete` permission.
+ * Delete a duplicate
  */
 export function deleteDuplicate({ id }: {
     id: string;
@@ -2720,7 +2756,7 @@ export function deleteDuplicate({ id }: {
     }));
 }
 /**
- * This endpoint requires the `face.read` permission.
+ * Retrieve faces for asset
  */
 export function getFaces({ id }: {
     id: string;
@@ -2735,7 +2771,7 @@ export function getFaces({ id }: {
     }));
 }
 /**
- * This endpoint requires the `face.create` permission.
+ * Create a face
  */
 export function createFace({ assetFaceCreateDto }: {
     assetFaceCreateDto: AssetFaceCreateDto;
@@ -2747,7 +2783,7 @@ export function createFace({ assetFaceCreateDto }: {
     })));
 }
 /**
- * This endpoint requires the `face.delete` permission.
+ * Delete a face
  */
 export function deleteFace({ id, assetFaceDeleteDto }: {
     id: string;
@@ -2760,7 +2796,7 @@ export function deleteFace({ id, assetFaceDeleteDto }: {
     })));
 }
 /**
- * This endpoint requires the `face.update` permission.
+ * Re-assign a face to another person
  */
 export function reassignFacesById({ id, faceDto }: {
     id: string;
@@ -2776,7 +2812,7 @@ export function reassignFacesById({ id, faceDto }: {
     })));
 }
 /**
- * This endpoint is an admin-only route, and requires the `job.read` permission.
+ * Retrieve queue counts and status
  */
 export function getAllJobsStatus(opts?: Oazapfts.RequestOpts) {
     return oazapfts.ok(oazapfts.fetchJson<{
@@ -2787,7 +2823,7 @@ export function getAllJobsStatus(opts?: Oazapfts.RequestOpts) {
     }));
 }
 /**
- * This endpoint is an admin-only route, and requires the `job.create` permission.
+ * Create a manual job
  */
 export function createJob({ jobCreateDto }: {
     jobCreateDto: JobCreateDto;
@@ -2799,7 +2835,7 @@ export function createJob({ jobCreateDto }: {
     })));
 }
 /**
- * This endpoint is an admin-only route, and requires the `job.create` permission.
+ * Run jobs
  */
 export function sendJobCommand({ id, jobCommandDto }: {
     id: JobName;
@@ -2815,7 +2851,7 @@ export function sendJobCommand({ id, jobCommandDto }: {
     })));
 }
 /**
- * This endpoint is an admin-only route, and requires the `library.read` permission.
+ * Retrieve libraries
  */
 export function getAllLibraries(opts?: Oazapfts.RequestOpts) {
     return oazapfts.ok(oazapfts.fetchJson<{
@@ -2826,7 +2862,7 @@ export function getAllLibraries(opts?: Oazapfts.RequestOpts) {
     }));
 }
 /**
- * This endpoint is an admin-only route, and requires the `library.create` permission.
+ * Create a library
  */
 export function createLibrary({ createLibraryDto }: {
     createLibraryDto: CreateLibraryDto;
@@ -2841,7 +2877,7 @@ export function createLibrary({ createLibraryDto }: {
     })));
 }
 /**
- * This endpoint is an admin-only route, and requires the `library.delete` permission.
+ * Delete a library
  */
 export function deleteLibrary({ id }: {
     id: string;
@@ -2852,7 +2888,7 @@ export function deleteLibrary({ id }: {
     }));
 }
 /**
- * This endpoint is an admin-only route, and requires the `library.read` permission.
+ * Retrieve a library
  */
 export function getLibrary({ id }: {
     id: string;
@@ -2865,7 +2901,7 @@ export function getLibrary({ id }: {
     }));
 }
 /**
- * This endpoint is an admin-only route, and requires the `library.update` permission.
+ * Update a library
  */
 export function updateLibrary({ id, updateLibraryDto }: {
     id: string;
@@ -2881,7 +2917,7 @@ export function updateLibrary({ id, updateLibraryDto }: {
     })));
 }
 /**
- * This endpoint is an admin-only route, and requires the `library.update` permission.
+ * Scan a library
  */
 export function scanLibrary({ id }: {
     id: string;
@@ -2892,7 +2928,7 @@ export function scanLibrary({ id }: {
     }));
 }
 /**
- * This endpoint is an admin-only route, and requires the `library.statistics` permission.
+ * Retrieve library statistics
  */
 export function getLibraryStatistics({ id }: {
     id: string;
@@ -2904,6 +2940,9 @@ export function getLibraryStatistics({ id }: {
         ...opts
     }));
 }
+/**
+ * Validate library settings
+ */
 export function validate({ id, validateLibraryDto }: {
     id: string;
     validateLibraryDto: ValidateLibraryDto;
@@ -2917,11 +2956,14 @@ export function validate({ id, validateLibraryDto }: {
         body: validateLibraryDto
     })));
 }
-export function getMapMarkers({ isArchived, isFavorite, fileCreatedAfter, fileCreatedBefore, withPartners, withSharedAlbums }: {
-    isArchived?: boolean;
-    isFavorite?: boolean;
+/**
+ * Retrieve map markers
+ */
+export function getMapMarkers({ fileCreatedAfter, fileCreatedBefore, isArchived, isFavorite, withPartners, withSharedAlbums }: {
     fileCreatedAfter?: string;
     fileCreatedBefore?: string;
+    isArchived?: boolean;
+    isFavorite?: boolean;
     withPartners?: boolean;
     withSharedAlbums?: boolean;
 }, opts?: Oazapfts.RequestOpts) {
@@ -2929,16 +2971,19 @@ export function getMapMarkers({ isArchived, isFavorite, fileCreatedAfter, fileCr
         status: 200;
         data: MapMarkerResponseDto[];
     }>(`/map/markers${QS.query(QS.explode({
-        isArchived,
-        isFavorite,
         fileCreatedAfter,
         fileCreatedBefore,
+        isArchived,
+        isFavorite,
         withPartners,
         withSharedAlbums
     }))}`, {
         ...opts
     }));
 }
+/**
+ * Reverse geocode coordinates
+ */
 export function reverseGeocode({ lat, lon }: {
     lat: number;
     lon: number;
@@ -2954,7 +2999,7 @@ export function reverseGeocode({ lat, lon }: {
     }));
 }
 /**
- * This endpoint requires the `memory.read` permission.
+ * Retrieve memories
  */
 export function searchMemories({ $for, isSaved, isTrashed, order, size, $type }: {
     $for?: string;
@@ -2979,7 +3024,7 @@ export function searchMemories({ $for, isSaved, isTrashed, order, size, $type }:
     }));
 }
 /**
- * This endpoint requires the `memory.create` permission.
+ * Create a memory
  */
 export function createMemory({ memoryCreateDto }: {
     memoryCreateDto: MemoryCreateDto;
@@ -2994,7 +3039,7 @@ export function createMemory({ memoryCreateDto }: {
     })));
 }
 /**
- * This endpoint requires the `memory.statistics` permission.
+ * Retrieve memories statistics
  */
 export function memoriesStatistics({ $for, isSaved, isTrashed, order, size, $type }: {
     $for?: string;
@@ -3019,7 +3064,7 @@ export function memoriesStatistics({ $for, isSaved, isTrashed, order, size, $typ
     }));
 }
 /**
- * This endpoint requires the `memory.delete` permission.
+ * Delete a memory
  */
 export function deleteMemory({ id }: {
     id: string;
@@ -3030,7 +3075,7 @@ export function deleteMemory({ id }: {
     }));
 }
 /**
- * This endpoint requires the `memory.read` permission.
+ * Retrieve a memory
  */
 export function getMemory({ id }: {
     id: string;
@@ -3043,7 +3088,7 @@ export function getMemory({ id }: {
     }));
 }
 /**
- * This endpoint requires the `memory.update` permission.
+ * Update a memory
  */
 export function updateMemory({ id, memoryUpdateDto }: {
     id: string;
@@ -3059,7 +3104,7 @@ export function updateMemory({ id, memoryUpdateDto }: {
     })));
 }
 /**
- * This endpoint requires the `memoryAsset.delete` permission.
+ * Remove assets from a memory
  */
 export function removeMemoryAssets({ id, bulkIdsDto }: {
     id: string;
@@ -3075,7 +3120,7 @@ export function removeMemoryAssets({ id, bulkIdsDto }: {
     })));
 }
 /**
- * This endpoint requires the `memoryAsset.create` permission.
+ * Add assets to a memory
  */
 export function addMemoryAssets({ id, bulkIdsDto }: {
     id: string;
@@ -3091,7 +3136,7 @@ export function addMemoryAssets({ id, bulkIdsDto }: {
     })));
 }
 /**
- * This endpoint requires the `notification.delete` permission.
+ * Delete notifications
  */
 export function deleteNotifications({ notificationDeleteAllDto }: {
     notificationDeleteAllDto: NotificationDeleteAllDto;
@@ -3103,7 +3148,7 @@ export function deleteNotifications({ notificationDeleteAllDto }: {
     })));
 }
 /**
- * This endpoint requires the `notification.read` permission.
+ * Retrieve notifications
  */
 export function getNotifications({ id, level, $type, unread }: {
     id?: string;
@@ -3124,7 +3169,7 @@ export function getNotifications({ id, level, $type, unread }: {
     }));
 }
 /**
- * This endpoint requires the `notification.update` permission.
+ * Update notifications
  */
 export function updateNotifications({ notificationUpdateAllDto }: {
     notificationUpdateAllDto: NotificationUpdateAllDto;
@@ -3136,7 +3181,7 @@ export function updateNotifications({ notificationUpdateAllDto }: {
     })));
 }
 /**
- * This endpoint requires the `notification.delete` permission.
+ * Delete a notification
  */
 export function deleteNotification({ id }: {
     id: string;
@@ -3147,7 +3192,7 @@ export function deleteNotification({ id }: {
     }));
 }
 /**
- * This endpoint requires the `notification.read` permission.
+ * Get a notification
  */
 export function getNotification({ id }: {
     id: string;
@@ -3160,7 +3205,7 @@ export function getNotification({ id }: {
     }));
 }
 /**
- * This endpoint requires the `notification.update` permission.
+ * Update a notification
  */
 export function updateNotification({ id, notificationUpdateDto }: {
     id: string;
@@ -3175,6 +3220,9 @@ export function updateNotification({ id, notificationUpdateDto }: {
         body: notificationUpdateDto
     })));
 }
+/**
+ * Start OAuth
+ */
 export function startOAuth({ oAuthConfigDto }: {
     oAuthConfigDto: OAuthConfigDto;
 }, opts?: Oazapfts.RequestOpts) {
@@ -3187,6 +3235,9 @@ export function startOAuth({ oAuthConfigDto }: {
         body: oAuthConfigDto
     })));
 }
+/**
+ * Finish OAuth
+ */
 export function finishOAuth({ oAuthCallbackDto }: {
     oAuthCallbackDto: OAuthCallbackDto;
 }, opts?: Oazapfts.RequestOpts) {
@@ -3199,6 +3250,9 @@ export function finishOAuth({ oAuthCallbackDto }: {
         body: oAuthCallbackDto
     })));
 }
+/**
+ * Link OAuth account
+ */
 export function linkOAuthAccount({ oAuthCallbackDto }: {
     oAuthCallbackDto: OAuthCallbackDto;
 }, opts?: Oazapfts.RequestOpts) {
@@ -3211,11 +3265,17 @@ export function linkOAuthAccount({ oAuthCallbackDto }: {
         body: oAuthCallbackDto
     })));
 }
+/**
+ * Redirect OAuth to mobile
+ */
 export function redirectOAuthToMobile(opts?: Oazapfts.RequestOpts) {
     return oazapfts.ok(oazapfts.fetchText("/oauth/mobile-redirect", {
         ...opts
     }));
 }
+/**
+ * Unlink OAuth account
+ */
 export function unlinkOAuthAccount(opts?: Oazapfts.RequestOpts) {
     return oazapfts.ok(oazapfts.fetchJson<{
         status: 200;
@@ -3226,7 +3286,7 @@ export function unlinkOAuthAccount(opts?: Oazapfts.RequestOpts) {
     }));
 }
 /**
- * This endpoint requires the `partner.read` permission.
+ * Retrieve partners
  */
 export function getPartners({ direction }: {
     direction: PartnerDirection;
@@ -3241,7 +3301,7 @@ export function getPartners({ direction }: {
     }));
 }
 /**
- * This endpoint requires the `partner.create` permission.
+ * Create a partner
  */
 export function createPartner({ partnerCreateDto }: {
     partnerCreateDto: PartnerCreateDto;
@@ -3256,7 +3316,7 @@ export function createPartner({ partnerCreateDto }: {
     })));
 }
 /**
- * This endpoint requires the `partner.delete` permission.
+ * Remove a partner
  */
 export function removePartner({ id }: {
     id: string;
@@ -3267,7 +3327,7 @@ export function removePartner({ id }: {
     }));
 }
 /**
- * This property was deprecated in v1.141.0. This endpoint requires the `partner.create` permission.
+ * Create a partner
  */
 export function createPartnerDeprecated({ id }: {
     id: string;
@@ -3281,7 +3341,7 @@ export function createPartnerDeprecated({ id }: {
     }));
 }
 /**
- * This endpoint requires the `partner.update` permission.
+ * Update a partner
  */
 export function updatePartner({ id, partnerUpdateDto }: {
     id: string;
@@ -3297,7 +3357,7 @@ export function updatePartner({ id, partnerUpdateDto }: {
     })));
 }
 /**
- * This endpoint requires the `person.delete` permission.
+ * Delete people
  */
 export function deletePeople({ bulkIdsDto }: {
     bulkIdsDto: BulkIdsDto;
@@ -3309,7 +3369,7 @@ export function deletePeople({ bulkIdsDto }: {
     })));
 }
 /**
- * This endpoint requires the `person.read` permission.
+ * Get all people
  */
 export function getAllPeople({ closestAssetId, closestPersonId, page, size, withHidden }: {
     closestAssetId?: string;
@@ -3332,7 +3392,7 @@ export function getAllPeople({ closestAssetId, closestPersonId, page, size, with
     }));
 }
 /**
- * This endpoint requires the `person.create` permission.
+ * Create a person
  */
 export function createPerson({ personCreateDto }: {
     personCreateDto: PersonCreateDto;
@@ -3347,7 +3407,7 @@ export function createPerson({ personCreateDto }: {
     })));
 }
 /**
- * This endpoint requires the `person.update` permission.
+ * Update people
  */
 export function updatePeople({ peopleUpdateDto }: {
     peopleUpdateDto: PeopleUpdateDto;
@@ -3362,7 +3422,7 @@ export function updatePeople({ peopleUpdateDto }: {
     })));
 }
 /**
- * This endpoint requires the `person.delete` permission.
+ * Delete person
  */
 export function deletePerson({ id }: {
     id: string;
@@ -3373,7 +3433,7 @@ export function deletePerson({ id }: {
     }));
 }
 /**
- * This endpoint requires the `person.read` permission.
+ * Get a person
  */
 export function getPerson({ id }: {
     id: string;
@@ -3386,7 +3446,7 @@ export function getPerson({ id }: {
     }));
 }
 /**
- * This endpoint requires the `person.update` permission.
+ * Update person
  */
 export function updatePerson({ id, personUpdateDto }: {
     id: string;
@@ -3402,7 +3462,7 @@ export function updatePerson({ id, personUpdateDto }: {
     })));
 }
 /**
- * This endpoint requires the `person.merge` permission.
+ * Merge people
  */
 export function mergePerson({ id, mergePersonDto }: {
     id: string;
@@ -3418,7 +3478,7 @@ export function mergePerson({ id, mergePersonDto }: {
     })));
 }
 /**
- * This endpoint requires the `person.reassign` permission.
+ * Reassign faces
  */
 export function reassignFaces({ id, assetFaceUpdateDto }: {
     id: string;
@@ -3434,7 +3494,7 @@ export function reassignFaces({ id, assetFaceUpdateDto }: {
     })));
 }
 /**
- * This endpoint requires the `person.statistics` permission.
+ * Get person statistics
  */
 export function getPersonStatistics({ id }: {
     id: string;
@@ -3447,7 +3507,7 @@ export function getPersonStatistics({ id }: {
     }));
 }
 /**
- * This endpoint requires the `person.read` permission.
+ * Get person thumbnail
  */
 export function getPersonThumbnail({ id }: {
     id: string;
@@ -3460,7 +3520,7 @@ export function getPersonThumbnail({ id }: {
     }));
 }
 /**
- * This endpoint requires the `asset.read` permission.
+ * Retrieve assets by city
  */
 export function getAssetsByCity(opts?: Oazapfts.RequestOpts) {
     return oazapfts.ok(oazapfts.fetchJson<{
@@ -3471,7 +3531,7 @@ export function getAssetsByCity(opts?: Oazapfts.RequestOpts) {
     }));
 }
 /**
- * This endpoint requires the `asset.read` permission.
+ * Retrieve explore data
  */
 export function getExploreData(opts?: Oazapfts.RequestOpts) {
     return oazapfts.ok(oazapfts.fetchJson<{
@@ -3482,7 +3542,7 @@ export function getExploreData(opts?: Oazapfts.RequestOpts) {
     }));
 }
 /**
- * This endpoint requires the `asset.read` permission.
+ * Search large assets
  */
 export function searchLargeAssets({ albumIds, city, country, createdAfter, createdBefore, deviceId, isEncoded, isFavorite, isMotion, isNotInAlbum, isOffline, lensModel, libraryId, make, minFileSize, model, ocr, personIds, rating, size, state, tagIds, takenAfter, takenBefore, trashedAfter, trashedBefore, $type, updatedAfter, updatedBefore, visibility, withDeleted, withExif }: {
     albumIds?: string[];
@@ -3560,7 +3620,7 @@ export function searchLargeAssets({ albumIds, city, country, createdAfter, creat
     }));
 }
 /**
- * This endpoint requires the `asset.read` permission.
+ * Search assets by metadata
  */
 export function searchAssets({ metadataSearchDto }: {
     metadataSearchDto: MetadataSearchDto;
@@ -3575,7 +3635,7 @@ export function searchAssets({ metadataSearchDto }: {
     })));
 }
 /**
- * This endpoint requires the `person.read` permission.
+ * Search people
  */
 export function searchPerson({ name, withHidden }: {
     name: string;
@@ -3592,7 +3652,7 @@ export function searchPerson({ name, withHidden }: {
     }));
 }
 /**
- * This endpoint requires the `asset.read` permission.
+ * Search places
  */
 export function searchPlaces({ name }: {
     name: string;
@@ -3607,7 +3667,7 @@ export function searchPlaces({ name }: {
     }));
 }
 /**
- * This endpoint requires the `asset.read` permission.
+ * Search random assets
  */
 export function searchRandom({ randomSearchDto }: {
     randomSearchDto: RandomSearchDto;
@@ -3622,7 +3682,7 @@ export function searchRandom({ randomSearchDto }: {
     })));
 }
 /**
- * This endpoint requires the `asset.read` permission.
+ * Smart asset search
  */
 export function searchSmart({ smartSearchDto }: {
     smartSearchDto: SmartSearchDto;
@@ -3637,7 +3697,7 @@ export function searchSmart({ smartSearchDto }: {
     })));
 }
 /**
- * This endpoint requires the `asset.statistics` permission.
+ * Search asset statistics
  */
 export function searchAssetStatistics({ statisticsSearchDto }: {
     statisticsSearchDto: StatisticsSearchDto;
@@ -3652,7 +3712,7 @@ export function searchAssetStatistics({ statisticsSearchDto }: {
     })));
 }
 /**
- * This endpoint requires the `asset.read` permission.
+ * Retrieve search suggestions
  */
 export function getSearchSuggestions({ country, includeNull, lensModel, make, model, state, $type }: {
     country?: string;
@@ -3679,7 +3739,7 @@ export function getSearchSuggestions({ country, includeNull, lensModel, make, mo
     }));
 }
 /**
- * This endpoint requires the `server.about` permission.
+ * Get server information
  */
 export function getAboutInfo(opts?: Oazapfts.RequestOpts) {
     return oazapfts.ok(oazapfts.fetchJson<{
@@ -3690,7 +3750,7 @@ export function getAboutInfo(opts?: Oazapfts.RequestOpts) {
     }));
 }
 /**
- * This endpoint requires the `server.apkLinks` permission.
+ * Get APK links
  */
 export function getApkLinks(opts?: Oazapfts.RequestOpts) {
     return oazapfts.ok(oazapfts.fetchJson<{
@@ -3700,6 +3760,9 @@ export function getApkLinks(opts?: Oazapfts.RequestOpts) {
         ...opts
     }));
 }
+/**
+ * Get config
+ */
 export function getServerConfig(opts?: Oazapfts.RequestOpts) {
     return oazapfts.ok(oazapfts.fetchJson<{
         status: 200;
@@ -3708,6 +3771,9 @@ export function getServerConfig(opts?: Oazapfts.RequestOpts) {
         ...opts
     }));
 }
+/**
+ * Get features
+ */
 export function getServerFeatures(opts?: Oazapfts.RequestOpts) {
     return oazapfts.ok(oazapfts.fetchJson<{
         status: 200;
@@ -3717,7 +3783,7 @@ export function getServerFeatures(opts?: Oazapfts.RequestOpts) {
     }));
 }
 /**
- * This endpoint is an admin-only route, and requires the `serverLicense.delete` permission.
+ * Delete server product key
  */
 export function deleteServerLicense(opts?: Oazapfts.RequestOpts) {
     return oazapfts.ok(oazapfts.fetchText("/server/license", {
@@ -3726,7 +3792,7 @@ export function deleteServerLicense(opts?: Oazapfts.RequestOpts) {
     }));
 }
 /**
- * This endpoint is an admin-only route, and requires the `serverLicense.read` permission.
+ * Get product key
  */
 export function getServerLicense(opts?: Oazapfts.RequestOpts) {
     return oazapfts.ok(oazapfts.fetchJson<{
@@ -3739,7 +3805,7 @@ export function getServerLicense(opts?: Oazapfts.RequestOpts) {
     }));
 }
 /**
- * This endpoint is an admin-only route, and requires the `serverLicense.update` permission.
+ * Set server product key
  */
 export function setServerLicense({ licenseKeyDto }: {
     licenseKeyDto: LicenseKeyDto;
@@ -3753,6 +3819,9 @@ export function setServerLicense({ licenseKeyDto }: {
         body: licenseKeyDto
     })));
 }
+/**
+ * Get supported media types
+ */
 export function getSupportedMediaTypes(opts?: Oazapfts.RequestOpts) {
     return oazapfts.ok(oazapfts.fetchJson<{
         status: 200;
@@ -3761,6 +3830,9 @@ export function getSupportedMediaTypes(opts?: Oazapfts.RequestOpts) {
         ...opts
     }));
 }
+/**
+ * Ping
+ */
 export function pingServer(opts?: Oazapfts.RequestOpts) {
     return oazapfts.ok(oazapfts.fetchJson<{
         status: 200;
@@ -3770,7 +3842,7 @@ export function pingServer(opts?: Oazapfts.RequestOpts) {
     }));
 }
 /**
- * This endpoint is an admin-only route, and requires the `server.statistics` permission.
+ * Get statistics
  */
 export function getServerStatistics(opts?: Oazapfts.RequestOpts) {
     return oazapfts.ok(oazapfts.fetchJson<{
@@ -3781,7 +3853,7 @@ export function getServerStatistics(opts?: Oazapfts.RequestOpts) {
     }));
 }
 /**
- * This endpoint requires the `server.storage` permission.
+ * Get storage
  */
 export function getStorage(opts?: Oazapfts.RequestOpts) {
     return oazapfts.ok(oazapfts.fetchJson<{
@@ -3791,6 +3863,9 @@ export function getStorage(opts?: Oazapfts.RequestOpts) {
         ...opts
     }));
 }
+/**
+ * Get theme
+ */
 export function getTheme(opts?: Oazapfts.RequestOpts) {
     return oazapfts.ok(oazapfts.fetchJson<{
         status: 200;
@@ -3799,6 +3874,9 @@ export function getTheme(opts?: Oazapfts.RequestOpts) {
         ...opts
     }));
 }
+/**
+ * Get server version
+ */
 export function getServerVersion(opts?: Oazapfts.RequestOpts) {
     return oazapfts.ok(oazapfts.fetchJson<{
         status: 200;
@@ -3808,7 +3886,7 @@ export function getServerVersion(opts?: Oazapfts.RequestOpts) {
     }));
 }
 /**
- * This endpoint requires the `server.versionCheck` permission.
+ * Get version check status
  */
 export function getVersionCheck(opts?: Oazapfts.RequestOpts) {
     return oazapfts.ok(oazapfts.fetchJson<{
@@ -3818,6 +3896,9 @@ export function getVersionCheck(opts?: Oazapfts.RequestOpts) {
         ...opts
     }));
 }
+/**
+ * Get version history
+ */
 export function getVersionHistory(opts?: Oazapfts.RequestOpts) {
     return oazapfts.ok(oazapfts.fetchJson<{
         status: 200;
@@ -3827,7 +3908,7 @@ export function getVersionHistory(opts?: Oazapfts.RequestOpts) {
     }));
 }
 /**
- * This endpoint requires the `session.delete` permission.
+ * Delete all sessions
  */
 export function deleteAllSessions(opts?: Oazapfts.RequestOpts) {
     return oazapfts.ok(oazapfts.fetchText("/sessions", {
@@ -3836,7 +3917,7 @@ export function deleteAllSessions(opts?: Oazapfts.RequestOpts) {
     }));
 }
 /**
- * This endpoint requires the `session.read` permission.
+ * Retrieve sessions
  */
 export function getSessions(opts?: Oazapfts.RequestOpts) {
     return oazapfts.ok(oazapfts.fetchJson<{
@@ -3847,7 +3928,7 @@ export function getSessions(opts?: Oazapfts.RequestOpts) {
     }));
 }
 /**
- * This endpoint requires the `session.create` permission.
+ * Create a session
  */
 export function createSession({ sessionCreateDto }: {
     sessionCreateDto: SessionCreateDto;
@@ -3862,7 +3943,7 @@ export function createSession({ sessionCreateDto }: {
     })));
 }
 /**
- * This endpoint requires the `session.delete` permission.
+ * Delete a session
  */
 export function deleteSession({ id }: {
     id: string;
@@ -3873,7 +3954,7 @@ export function deleteSession({ id }: {
     }));
 }
 /**
- * This endpoint requires the `session.update` permission.
+ * Update a session
  */
 export function updateSession({ id, sessionUpdateDto }: {
     id: string;
@@ -3889,7 +3970,7 @@ export function updateSession({ id, sessionUpdateDto }: {
     })));
 }
 /**
- * This endpoint requires the `session.lock` permission.
+ * Lock a session
  */
 export function lockSession({ id }: {
     id: string;
@@ -3900,7 +3981,7 @@ export function lockSession({ id }: {
     }));
 }
 /**
- * This endpoint requires the `sharedLink.read` permission.
+ * Retrieve all shared links
  */
 export function getAllSharedLinks({ albumId }: {
     albumId?: string;
@@ -3915,7 +3996,7 @@ export function getAllSharedLinks({ albumId }: {
     }));
 }
 /**
- * This endpoint requires the `sharedLink.create` permission.
+ * Create a shared link
  */
 export function createSharedLink({ sharedLinkCreateDto }: {
     sharedLinkCreateDto: SharedLinkCreateDto;
@@ -3929,26 +4010,29 @@ export function createSharedLink({ sharedLinkCreateDto }: {
         body: sharedLinkCreateDto
     })));
 }
-export function getMySharedLink({ password, token, key, slug }: {
-    password?: string;
-    token?: string;
+/**
+ * Retrieve current shared link
+ */
+export function getMySharedLink({ key, password, slug, token }: {
     key?: string;
+    password?: string;
     slug?: string;
+    token?: string;
 }, opts?: Oazapfts.RequestOpts) {
     return oazapfts.ok(oazapfts.fetchJson<{
         status: 200;
         data: SharedLinkResponseDto;
     }>(`/shared-links/me${QS.query(QS.explode({
-        password,
-        token,
         key,
-        slug
+        password,
+        slug,
+        token
     }))}`, {
         ...opts
     }));
 }
 /**
- * This endpoint requires the `sharedLink.delete` permission.
+ * Delete a shared link
  */
 export function removeSharedLink({ id }: {
     id: string;
@@ -3959,7 +4043,7 @@ export function removeSharedLink({ id }: {
     }));
 }
 /**
- * This endpoint requires the `sharedLink.read` permission.
+ * Retrieve a shared link
  */
 export function getSharedLinkById({ id }: {
     id: string;
@@ -3972,7 +4056,7 @@ export function getSharedLinkById({ id }: {
     }));
 }
 /**
- * This endpoint requires the `sharedLink.update` permission.
+ * Update a shared link
  */
 export function updateSharedLink({ id, sharedLinkEditDto }: {
     id: string;
@@ -3987,6 +4071,9 @@ export function updateSharedLink({ id, sharedLinkEditDto }: {
         body: sharedLinkEditDto
     })));
 }
+/**
+ * Remove assets from a shared link
+ */
 export function removeSharedLinkAssets({ id, key, slug, assetIdsDto }: {
     id: string;
     key?: string;
@@ -4005,6 +4092,9 @@ export function removeSharedLinkAssets({ id, key, slug, assetIdsDto }: {
         body: assetIdsDto
     })));
 }
+/**
+ * Add assets to a shared link
+ */
 export function addSharedLinkAssets({ id, key, slug, assetIdsDto }: {
     id: string;
     key?: string;
@@ -4024,7 +4114,7 @@ export function addSharedLinkAssets({ id, key, slug, assetIdsDto }: {
     })));
 }
 /**
- * This endpoint requires the `stack.delete` permission.
+ * Delete stacks
  */
 export function deleteStacks({ bulkIdsDto }: {
     bulkIdsDto: BulkIdsDto;
@@ -4036,7 +4126,7 @@ export function deleteStacks({ bulkIdsDto }: {
     })));
 }
 /**
- * This endpoint requires the `stack.read` permission.
+ * Retrieve stacks
  */
 export function searchStacks({ primaryAssetId }: {
     primaryAssetId?: string;
@@ -4051,7 +4141,7 @@ export function searchStacks({ primaryAssetId }: {
     }));
 }
 /**
- * This endpoint requires the `stack.create` permission.
+ * Create a stack
  */
 export function createStack({ stackCreateDto }: {
     stackCreateDto: StackCreateDto;
@@ -4066,7 +4156,7 @@ export function createStack({ stackCreateDto }: {
     })));
 }
 /**
- * This endpoint requires the `stack.delete` permission.
+ * Delete a stack
  */
 export function deleteStack({ id }: {
     id: string;
@@ -4077,7 +4167,7 @@ export function deleteStack({ id }: {
     }));
 }
 /**
- * This endpoint requires the `stack.read` permission.
+ * Retrieve a stack
  */
 export function getStack({ id }: {
     id: string;
@@ -4090,7 +4180,7 @@ export function getStack({ id }: {
     }));
 }
 /**
- * This endpoint requires the `stack.update` permission.
+ * Update a stack
  */
 export function updateStack({ id, stackUpdateDto }: {
     id: string;
@@ -4106,7 +4196,7 @@ export function updateStack({ id, stackUpdateDto }: {
     })));
 }
 /**
- * This endpoint requires the `stack.update` permission.
+ * Remove an asset from a stack
  */
 export function removeAssetFromStack({ assetId, id }: {
     assetId: string;
@@ -4118,7 +4208,7 @@ export function removeAssetFromStack({ assetId, id }: {
     }));
 }
 /**
- * This endpoint requires the `syncCheckpoint.delete` permission.
+ * Delete acknowledgements
  */
 export function deleteSyncAck({ syncAckDeleteDto }: {
     syncAckDeleteDto: SyncAckDeleteDto;
@@ -4130,7 +4220,7 @@ export function deleteSyncAck({ syncAckDeleteDto }: {
     })));
 }
 /**
- * This endpoint requires the `syncCheckpoint.read` permission.
+ * Retrieve acknowledgements
  */
 export function getSyncAck(opts?: Oazapfts.RequestOpts) {
     return oazapfts.ok(oazapfts.fetchJson<{
@@ -4141,7 +4231,7 @@ export function getSyncAck(opts?: Oazapfts.RequestOpts) {
     }));
 }
 /**
- * This endpoint requires the `syncCheckpoint.update` permission.
+ * Acknowledge changes
  */
 export function sendSyncAck({ syncAckSetDto }: {
     syncAckSetDto: SyncAckSetDto;
@@ -4152,6 +4242,9 @@ export function sendSyncAck({ syncAckSetDto }: {
         body: syncAckSetDto
     })));
 }
+/**
+ * Get delta sync for user
+ */
 export function getDeltaSync({ assetDeltaSyncDto }: {
     assetDeltaSyncDto: AssetDeltaSyncDto;
 }, opts?: Oazapfts.RequestOpts) {
@@ -4164,6 +4257,9 @@ export function getDeltaSync({ assetDeltaSyncDto }: {
         body: assetDeltaSyncDto
     })));
 }
+/**
+ * Get full sync for user
+ */
 export function getFullSyncForUser({ assetFullSyncDto }: {
     assetFullSyncDto: AssetFullSyncDto;
 }, opts?: Oazapfts.RequestOpts) {
@@ -4177,7 +4273,7 @@ export function getFullSyncForUser({ assetFullSyncDto }: {
     })));
 }
 /**
- * This endpoint requires the `sync.stream` permission.
+ * Stream sync changes
  */
 export function getSyncStream({ syncStreamDto }: {
     syncStreamDto: SyncStreamDto;
@@ -4189,7 +4285,7 @@ export function getSyncStream({ syncStreamDto }: {
     })));
 }
 /**
- * This endpoint is an admin-only route, and requires the `systemConfig.read` permission.
+ * Get system configuration
  */
 export function getConfig(opts?: Oazapfts.RequestOpts) {
     return oazapfts.ok(oazapfts.fetchJson<{
@@ -4200,7 +4296,7 @@ export function getConfig(opts?: Oazapfts.RequestOpts) {
     }));
 }
 /**
- * This endpoint is an admin-only route, and requires the `systemConfig.update` permission.
+ * Update system configuration
  */
 export function updateConfig({ systemConfigDto }: {
     systemConfigDto: SystemConfigDto;
@@ -4215,7 +4311,7 @@ export function updateConfig({ systemConfigDto }: {
     })));
 }
 /**
- * This endpoint is an admin-only route, and requires the `systemConfig.read` permission.
+ * Get system configuration defaults
  */
 export function getConfigDefaults(opts?: Oazapfts.RequestOpts) {
     return oazapfts.ok(oazapfts.fetchJson<{
@@ -4226,7 +4322,7 @@ export function getConfigDefaults(opts?: Oazapfts.RequestOpts) {
     }));
 }
 /**
- * This endpoint is an admin-only route, and requires the `systemConfig.read` permission.
+ * Get storage template options
  */
 export function getStorageTemplateOptions(opts?: Oazapfts.RequestOpts) {
     return oazapfts.ok(oazapfts.fetchJson<{
@@ -4237,7 +4333,7 @@ export function getStorageTemplateOptions(opts?: Oazapfts.RequestOpts) {
     }));
 }
 /**
- * This endpoint is an admin-only route, and requires the `systemMetadata.read` permission.
+ * Retrieve admin onboarding
  */
 export function getAdminOnboarding(opts?: Oazapfts.RequestOpts) {
     return oazapfts.ok(oazapfts.fetchJson<{
@@ -4248,7 +4344,7 @@ export function getAdminOnboarding(opts?: Oazapfts.RequestOpts) {
     }));
 }
 /**
- * This endpoint is an admin-only route, and requires the `systemMetadata.update` permission.
+ * Update admin onboarding
  */
 export function updateAdminOnboarding({ adminOnboardingUpdateDto }: {
     adminOnboardingUpdateDto: AdminOnboardingUpdateDto;
@@ -4260,7 +4356,7 @@ export function updateAdminOnboarding({ adminOnboardingUpdateDto }: {
     })));
 }
 /**
- * This endpoint is an admin-only route, and requires the `systemMetadata.read` permission.
+ * Retrieve reverse geocoding state
  */
 export function getReverseGeocodingState(opts?: Oazapfts.RequestOpts) {
     return oazapfts.ok(oazapfts.fetchJson<{
@@ -4271,7 +4367,7 @@ export function getReverseGeocodingState(opts?: Oazapfts.RequestOpts) {
     }));
 }
 /**
- * This endpoint is an admin-only route, and requires the `systemMetadata.read` permission.
+ * Retrieve version check state
  */
 export function getVersionCheckState(opts?: Oazapfts.RequestOpts) {
     return oazapfts.ok(oazapfts.fetchJson<{
@@ -4282,7 +4378,7 @@ export function getVersionCheckState(opts?: Oazapfts.RequestOpts) {
     }));
 }
 /**
- * This endpoint requires the `tag.read` permission.
+ * Retrieve tags
  */
 export function getAllTags(opts?: Oazapfts.RequestOpts) {
     return oazapfts.ok(oazapfts.fetchJson<{
@@ -4293,7 +4389,7 @@ export function getAllTags(opts?: Oazapfts.RequestOpts) {
     }));
 }
 /**
- * This endpoint requires the `tag.create` permission.
+ * Create a tag
  */
 export function createTag({ tagCreateDto }: {
     tagCreateDto: TagCreateDto;
@@ -4308,7 +4404,7 @@ export function createTag({ tagCreateDto }: {
     })));
 }
 /**
- * This endpoint requires the `tag.create` permission.
+ * Upsert tags
  */
 export function upsertTags({ tagUpsertDto }: {
     tagUpsertDto: TagUpsertDto;
@@ -4323,7 +4419,7 @@ export function upsertTags({ tagUpsertDto }: {
     })));
 }
 /**
- * This endpoint requires the `tag.asset` permission.
+ * Tag assets
  */
 export function bulkTagAssets({ tagBulkAssetsDto }: {
     tagBulkAssetsDto: TagBulkAssetsDto;
@@ -4338,7 +4434,7 @@ export function bulkTagAssets({ tagBulkAssetsDto }: {
     })));
 }
 /**
- * This endpoint requires the `tag.delete` permission.
+ * Delete a tag
  */
 export function deleteTag({ id }: {
     id: string;
@@ -4349,7 +4445,7 @@ export function deleteTag({ id }: {
     }));
 }
 /**
- * This endpoint requires the `tag.read` permission.
+ * Retrieve a tag
  */
 export function getTagById({ id }: {
     id: string;
@@ -4362,7 +4458,7 @@ export function getTagById({ id }: {
     }));
 }
 /**
- * This endpoint requires the `tag.update` permission.
+ * Update a tag
  */
 export function updateTag({ id, tagUpdateDto }: {
     id: string;
@@ -4378,7 +4474,7 @@ export function updateTag({ id, tagUpdateDto }: {
     })));
 }
 /**
- * This endpoint requires the `tag.asset` permission.
+ * Untag assets
  */
 export function untagAssets({ id, bulkIdsDto }: {
     id: string;
@@ -4394,7 +4490,7 @@ export function untagAssets({ id, bulkIdsDto }: {
     })));
 }
 /**
- * This endpoint requires the `tag.asset` permission.
+ * Tag assets
  */
 export function tagAssets({ id, bulkIdsDto }: {
     id: string;
@@ -4410,7 +4506,7 @@ export function tagAssets({ id, bulkIdsDto }: {
     })));
 }
 /**
- * This endpoint requires the `asset.read` permission.
+ * Get time bucket
  */
 export function getTimeBucket({ albumId, isFavorite, isTrashed, key, order, personId, slug, tagId, timeBucket, userId, visibility, withCoordinates, withPartners, withStacked }: {
     albumId?: string;
@@ -4451,7 +4547,7 @@ export function getTimeBucket({ albumId, isFavorite, isTrashed, key, order, pers
     }));
 }
 /**
- * This endpoint requires the `asset.read` permission.
+ * Get time buckets
  */
 export function getTimeBuckets({ albumId, isFavorite, isTrashed, key, order, personId, slug, tagId, userId, visibility, withCoordinates, withPartners, withStacked }: {
     albumId?: string;
@@ -4490,7 +4586,7 @@ export function getTimeBuckets({ albumId, isFavorite, isTrashed, key, order, per
     }));
 }
 /**
- * This endpoint requires the `asset.delete` permission.
+ * Empty trash
  */
 export function emptyTrash(opts?: Oazapfts.RequestOpts) {
     return oazapfts.ok(oazapfts.fetchJson<{
@@ -4502,7 +4598,7 @@ export function emptyTrash(opts?: Oazapfts.RequestOpts) {
     }));
 }
 /**
- * This endpoint requires the `asset.delete` permission.
+ * Restore trash
  */
 export function restoreTrash(opts?: Oazapfts.RequestOpts) {
     return oazapfts.ok(oazapfts.fetchJson<{
@@ -4514,7 +4610,7 @@ export function restoreTrash(opts?: Oazapfts.RequestOpts) {
     }));
 }
 /**
- * This endpoint requires the `asset.delete` permission.
+ * Restore assets
  */
 export function restoreAssets({ bulkIdsDto }: {
     bulkIdsDto: BulkIdsDto;
@@ -4529,7 +4625,7 @@ export function restoreAssets({ bulkIdsDto }: {
     })));
 }
 /**
- * This endpoint requires the `user.read` permission.
+ * Get all users
  */
 export function searchUsers(opts?: Oazapfts.RequestOpts) {
     return oazapfts.ok(oazapfts.fetchJson<{
@@ -4540,7 +4636,7 @@ export function searchUsers(opts?: Oazapfts.RequestOpts) {
     }));
 }
 /**
- * This endpoint requires the `user.read` permission.
+ * Get current user
  */
 export function getMyUser(opts?: Oazapfts.RequestOpts) {
     return oazapfts.ok(oazapfts.fetchJson<{
@@ -4551,7 +4647,7 @@ export function getMyUser(opts?: Oazapfts.RequestOpts) {
     }));
 }
 /**
- * This endpoint requires the `user.update` permission.
+ * Update current user
  */
 export function updateMyUser({ userUpdateMeDto }: {
     userUpdateMeDto: UserUpdateMeDto;
@@ -4566,7 +4662,7 @@ export function updateMyUser({ userUpdateMeDto }: {
     })));
 }
 /**
- * This endpoint requires the `userLicense.delete` permission.
+ * Delete user product key
  */
 export function deleteUserLicense(opts?: Oazapfts.RequestOpts) {
     return oazapfts.ok(oazapfts.fetchText("/users/me/license", {
@@ -4575,7 +4671,7 @@ export function deleteUserLicense(opts?: Oazapfts.RequestOpts) {
     }));
 }
 /**
- * This endpoint requires the `userLicense.read` permission.
+ * Retrieve user product key
  */
 export function getUserLicense(opts?: Oazapfts.RequestOpts) {
     return oazapfts.ok(oazapfts.fetchJson<{
@@ -4586,7 +4682,7 @@ export function getUserLicense(opts?: Oazapfts.RequestOpts) {
     }));
 }
 /**
- * This endpoint requires the `userLicense.update` permission.
+ * Set user product key
  */
 export function setUserLicense({ licenseKeyDto }: {
     licenseKeyDto: LicenseKeyDto;
@@ -4601,7 +4697,7 @@ export function setUserLicense({ licenseKeyDto }: {
     })));
 }
 /**
- * This endpoint requires the `userOnboarding.delete` permission.
+ * Delete user onboarding
  */
 export function deleteUserOnboarding(opts?: Oazapfts.RequestOpts) {
     return oazapfts.ok(oazapfts.fetchText("/users/me/onboarding", {
@@ -4610,7 +4706,7 @@ export function deleteUserOnboarding(opts?: Oazapfts.RequestOpts) {
     }));
 }
 /**
- * This endpoint requires the `userOnboarding.read` permission.
+ * Retrieve user onboarding
  */
 export function getUserOnboarding(opts?: Oazapfts.RequestOpts) {
     return oazapfts.ok(oazapfts.fetchJson<{
@@ -4621,7 +4717,7 @@ export function getUserOnboarding(opts?: Oazapfts.RequestOpts) {
     }));
 }
 /**
- * This endpoint requires the `userOnboarding.update` permission.
+ * Update user onboarding
  */
 export function setUserOnboarding({ onboardingDto }: {
     onboardingDto: OnboardingDto;
@@ -4636,7 +4732,7 @@ export function setUserOnboarding({ onboardingDto }: {
     })));
 }
 /**
- * This endpoint requires the `userPreference.read` permission.
+ * Get my preferences
  */
 export function getMyPreferences(opts?: Oazapfts.RequestOpts) {
     return oazapfts.ok(oazapfts.fetchJson<{
@@ -4647,7 +4743,7 @@ export function getMyPreferences(opts?: Oazapfts.RequestOpts) {
     }));
 }
 /**
- * This endpoint requires the `userPreference.update` permission.
+ * Update my preferences
  */
 export function updateMyPreferences({ userPreferencesUpdateDto }: {
     userPreferencesUpdateDto: UserPreferencesUpdateDto;
@@ -4662,7 +4758,7 @@ export function updateMyPreferences({ userPreferencesUpdateDto }: {
     })));
 }
 /**
- * This endpoint requires the `userProfileImage.delete` permission.
+ * Delete user profile image
  */
 export function deleteProfileImage(opts?: Oazapfts.RequestOpts) {
     return oazapfts.ok(oazapfts.fetchText("/users/profile-image", {
@@ -4671,7 +4767,7 @@ export function deleteProfileImage(opts?: Oazapfts.RequestOpts) {
     }));
 }
 /**
- * This endpoint requires the `userProfileImage.update` permission.
+ * Create user profile image
  */
 export function createProfileImage({ createProfileImageDto }: {
     createProfileImageDto: CreateProfileImageDto;
@@ -4686,7 +4782,7 @@ export function createProfileImage({ createProfileImageDto }: {
     })));
 }
 /**
- * This endpoint requires the `user.read` permission.
+ * Retrieve a user
  */
 export function getUser({ id }: {
     id: string;
@@ -4699,7 +4795,7 @@ export function getUser({ id }: {
     }));
 }
 /**
- * This endpoint requires the `userProfileImage.read` permission.
+ * Retrieve user profile image
  */
 export function getProfileImage({ id }: {
     id: string;
@@ -4711,6 +4807,9 @@ export function getProfileImage({ id }: {
         ...opts
     }));
 }
+/**
+ * Retrieve assets by original path
+ */
 export function getAssetsByOriginalPath({ path }: {
     path: string;
 }, opts?: Oazapfts.RequestOpts) {
@@ -4723,6 +4822,9 @@ export function getAssetsByOriginalPath({ path }: {
         ...opts
     }));
 }
+/**
+ * Retrieve unique paths
+ */
 export function getUniqueOriginalPaths(opts?: Oazapfts.RequestOpts) {
     return oazapfts.ok(oazapfts.fetchJson<{
         status: 200;
diff --git a/server/src/constants.ts b/server/src/constants.ts
index 3b75ca9f7e..1a14bdbcc3 100644
--- a/server/src/constants.ts
+++ b/server/src/constants.ts
@@ -2,7 +2,7 @@ import { Duration } from 'luxon';
 import { readFileSync } from 'node:fs';
 import { dirname, join } from 'node:path';
 import { SemVer } from 'semver';
-import { DatabaseExtension, ExifOrientation, VectorIndex } from 'src/enum';
+import { ApiTag, DatabaseExtension, ExifOrientation, VectorIndex } from 'src/enum';
 
 export const POSTGRES_VERSION_RANGE = '>=14.0.0';
 export const VECTORCHORD_VERSION_RANGE = '>=0.3 <0.6';
@@ -138,3 +138,56 @@ export const ORIENTATION_TO_SHARP_ROTATION: Record<ExifOrientation, SharpRotatio
   [ExifOrientation.MirrorHorizontalRotate90CW]: { angle: 90, flip: true },
   [ExifOrientation.Rotate270CW]: { angle: 270 },
 } as const;
+
+export const endpointTags: Record<ApiTag, string> = {
+  [ApiTag.Activities]: 'An activity is a like or a comment made by a user on an asset or album.',
+  [ApiTag.Albums]: 'An album is a collection of assets that can be shared with other users or via shared links.',
+  [ApiTag.ApiKeys]: 'An api key can be used to programmatically access the Immich API.',
+  [ApiTag.Assets]: 'An asset is an image or video that has been uploaded to Immich.',
+  [ApiTag.Authentication]: 'Endpoints related to user authentication, including OAuth.',
+  [ApiTag.AuthenticationAdmin]: 'Administrative endpoints related to authentication.',
+  [ApiTag.Deprecated]: 'Deprecated endpoints that are planned for removal in the next major release.',
+  [ApiTag.Download]: 'Endpoints for downloading assets or collections of assets.',
+  [ApiTag.Duplicates]: 'Endpoints for managing and identifying duplicate assets.',
+  [ApiTag.Faces]:
+    'A face is a detected human face within an asset, which can be associated with a person. Faces are normally detected via machine learning, but can also be created via manually.',
+  [ApiTag.Jobs]:
+    'Queues and background jobs are used for processing tasks asynchronously. Queues can be paused and resumed as needed.',
+  [ApiTag.Libraries]:
+    'An external library is made up of input file paths or expressions that are scanned for asset files. Discovered files are automatically imported. Assets much be unique within a library, but can be duplicated across libraries. Each user has a default upload library, and can have one or more external libraries.',
+  [ApiTag.Map]:
+    'Map endpoints include supplemental functionality related to geolocation, such as reverse geocoding and retrieving map markers for assets with geolocation data.',
+  [ApiTag.Memories]:
+    'A memory is a specialized collection of assets with dedicated viewing implementations in the web and mobile clients. A memory includes fields related to visibility and are automatically generated per user via a background job.',
+  [ApiTag.Notifications]:
+    'A notification is a specialized message sent to users to inform them of important events. Currently, these notifications are only shown in the Immich web application.',
+  [ApiTag.NotificationsAdmin]: 'Notification administrative endpoints.',
+  [ApiTag.Partners]: 'A partner is a link with another user that allows sharing of assets between two users.',
+  [ApiTag.People]:
+    'A person is a collection of faces, which can be favorited and named. A person can also be merged into another person. People are automatically created via the face recognition job.',
+  [ApiTag.Search]:
+    'Endpoints related to searching assets via text, smart search, optical character recognition (OCR), and other filters like person, album, and other metadata. Search endpoints usually support pagination and sorting.',
+  [ApiTag.Server]:
+    'Information about the current server deployment, including version and build information, available features, supported media types, and more.',
+  [ApiTag.Sessions]:
+    'A session represents an authenticated login session for a user. Sessions also appear in the web application as "Authorized devices".',
+  [ApiTag.SharedLinks]:
+    'A shared link is a public url that provides access to a specific album, asset, or collection of assets. A shared link can be protected with a password, include a specific slug, allow or disallow downloads, and optionally include an expiration date.',
+  [ApiTag.Stacks]:
+    'A stack is a group of related assets. One asset is the "primary" asset, and the rest are "child" assets. On the main timeline, stack parents are included by default, while child assets are hidden.',
+  [ApiTag.Sync]: 'A collection of endpoints for the new mobile synchronization implementation.',
+  [ApiTag.SystemConfig]: 'Endpoints to view, modify, and validate the system configuration settings.',
+  [ApiTag.SystemMetadata]:
+    'Endpoints to view, modify, and validate the system metadata, which includes information about things like admin onboarding status.',
+  [ApiTag.Tags]:
+    'A tag is a user-defined label that can be applied to assets for organizational purposes. Tags can also be hierarchical, allowing for parent-child relationships between tags.',
+  [ApiTag.Timeline]:
+    'Specialized endpoints related to the timeline implementation used in the web application. External applications or tools should not use or rely on these endpoints, as they are subject to change without notice.',
+  [ApiTag.Trash]:
+    'Endpoints for managing the trash can, which includes assets that have been discarded. Items in the trash are automatically deleted after a configured amount of time.',
+  [ApiTag.UsersAdmin]:
+    'Administrative endpoints for managing users, including creating, updating, deleting, and restoring users. Also includes endpoints for resetting passwords and PIN codes.',
+  [ApiTag.Users]:
+    'Endpoints for viewing and updating the current users, including product key information, profile picture data, onboarding progress, and more.',
+  [ApiTag.Views]: 'Endpoints for specialized views, such as the folder view.',
+};
diff --git a/server/src/controllers/activity.controller.ts b/server/src/controllers/activity.controller.ts
index 75b2e2f8a3..e0c71a00e6 100644
--- a/server/src/controllers/activity.controller.ts
+++ b/server/src/controllers/activity.controller.ts
@@ -1,5 +1,5 @@
 import { Body, Controller, Delete, Get, HttpCode, HttpStatus, Param, Post, Query, Res } from '@nestjs/common';
-import { ApiTags } from '@nestjs/swagger';
+import { ApiOperation, ApiTags } from '@nestjs/swagger';
 import { Response } from 'express';
 import {
   ActivityCreateDto,
@@ -9,24 +9,33 @@ import {
   ActivityStatisticsResponseDto,
 } from 'src/dtos/activity.dto';
 import { AuthDto } from 'src/dtos/auth.dto';
-import { Permission } from 'src/enum';
+import { ApiTag, Permission } from 'src/enum';
 import { Auth, Authenticated } from 'src/middleware/auth.guard';
 import { ActivityService } from 'src/services/activity.service';
 import { UUIDParamDto } from 'src/validation';
 
-@ApiTags('Activities')
+@ApiTags(ApiTag.Activities)
 @Controller('activities')
 export class ActivityController {
   constructor(private service: ActivityService) {}
 
   @Get()
   @Authenticated({ permission: Permission.ActivityRead })
+  @ApiOperation({
+    summary: 'List all activities',
+    description:
+      'Returns a list of activities for the selected asset or album. The activities are returned in sorted order, with the oldest activities appearing first.',
+  })
   getActivities(@Auth() auth: AuthDto, @Query() dto: ActivitySearchDto): Promise<ActivityResponseDto[]> {
     return this.service.getAll(auth, dto);
   }
 
   @Post()
   @Authenticated({ permission: Permission.ActivityCreate })
+  @ApiOperation({
+    summary: 'Create an activity',
+    description: 'Create a like or a comment for an album, or an asset in an album.',
+  })
   async createActivity(
     @Auth() auth: AuthDto,
     @Body() dto: ActivityCreateDto,
@@ -41,6 +50,10 @@ export class ActivityController {
 
   @Get('statistics')
   @Authenticated({ permission: Permission.ActivityStatistics })
+  @ApiOperation({
+    summary: 'Retrieve activity statistics',
+    description: 'Returns the number of likes and comments for a given album or asset in an album.',
+  })
   getActivityStatistics(@Auth() auth: AuthDto, @Query() dto: ActivityDto): Promise<ActivityStatisticsResponseDto> {
     return this.service.getStatistics(auth, dto);
   }
@@ -48,6 +61,10 @@ export class ActivityController {
   @Delete(':id')
   @Authenticated({ permission: Permission.ActivityDelete })
   @HttpCode(HttpStatus.NO_CONTENT)
+  @ApiOperation({
+    summary: 'Delete an activity',
+    description: 'Removes a like or comment from a given album or asset in an album.',
+  })
   deleteActivity(@Auth() auth: AuthDto, @Param() { id }: UUIDParamDto): Promise<void> {
     return this.service.delete(auth, id);
   }
diff --git a/server/src/controllers/album.controller.ts b/server/src/controllers/album.controller.ts
index 47f8b5603a..671aa55004 100644
--- a/server/src/controllers/album.controller.ts
+++ b/server/src/controllers/album.controller.ts
@@ -1,5 +1,5 @@
 import { Body, Controller, Delete, Get, HttpCode, HttpStatus, Param, Patch, Post, Put, Query } from '@nestjs/common';
-import { ApiTags } from '@nestjs/swagger';
+import { ApiOperation, ApiTags } from '@nestjs/swagger';
 import {
   AddUsersDto,
   AlbumInfoDto,
@@ -14,36 +14,52 @@ import {
 } from 'src/dtos/album.dto';
 import { BulkIdResponseDto, BulkIdsDto } from 'src/dtos/asset-ids.response.dto';
 import { AuthDto } from 'src/dtos/auth.dto';
-import { Permission } from 'src/enum';
+import { ApiTag, Permission } from 'src/enum';
 import { Auth, Authenticated } from 'src/middleware/auth.guard';
 import { AlbumService } from 'src/services/album.service';
 import { ParseMeUUIDPipe, UUIDParamDto } from 'src/validation';
 
-@ApiTags('Albums')
+@ApiTags(ApiTag.Albums)
 @Controller('albums')
 export class AlbumController {
   constructor(private service: AlbumService) {}
 
   @Get()
   @Authenticated({ permission: Permission.AlbumRead })
+  @ApiOperation({
+    summary: 'List all albums',
+    description: 'Retrieve a list of albums available to the authenticated user.',
+  })
   getAllAlbums(@Auth() auth: AuthDto, @Query() query: GetAlbumsDto): Promise<AlbumResponseDto[]> {
     return this.service.getAll(auth, query);
   }
 
   @Post()
   @Authenticated({ permission: Permission.AlbumCreate })
+  @ApiOperation({
+    summary: 'Create an album',
+    description: 'Create a new album. The album can also be created with initial users and assets.',
+  })
   createAlbum(@Auth() auth: AuthDto, @Body() dto: CreateAlbumDto): Promise<AlbumResponseDto> {
     return this.service.create(auth, dto);
   }
 
   @Get('statistics')
   @Authenticated({ permission: Permission.AlbumStatistics })
+  @ApiOperation({
+    summary: 'Retrieve album statistics',
+    description: 'Returns statistics about the albums available to the authenticated user.',
+  })
   getAlbumStatistics(@Auth() auth: AuthDto): Promise<AlbumStatisticsResponseDto> {
     return this.service.getStatistics(auth);
   }
 
   @Authenticated({ permission: Permission.AlbumRead, sharedLink: true })
   @Get(':id')
+  @ApiOperation({
+    summary: 'Retrieve an album',
+    description: 'Retrieve information about a specific album by its ID.',
+  })
   getAlbumInfo(
     @Auth() auth: AuthDto,
     @Param() { id }: UUIDParamDto,
@@ -54,6 +70,11 @@ export class AlbumController {
 
   @Patch(':id')
   @Authenticated({ permission: Permission.AlbumUpdate })
+  @ApiOperation({
+    summary: 'Update an album',
+    description:
+      'Update the information of a specific album by its ID. This endpoint can be used to update the album name, description, sort order, etc. However, it is not used to add or remove assets or users from the album.',
+  })
   updateAlbumInfo(
     @Auth() auth: AuthDto,
     @Param() { id }: UUIDParamDto,
@@ -65,12 +86,21 @@ export class AlbumController {
   @Delete(':id')
   @Authenticated({ permission: Permission.AlbumDelete })
   @HttpCode(HttpStatus.NO_CONTENT)
+  @ApiOperation({
+    summary: 'Delete an album',
+    description:
+      'Delete a specific album by its ID. Note the album is initially trashed and then immediately scheduled for deletion, but relies on a background job to complete the process.',
+  })
   deleteAlbum(@Auth() auth: AuthDto, @Param() { id }: UUIDParamDto) {
     return this.service.delete(auth, id);
   }
 
   @Put(':id/assets')
   @Authenticated({ permission: Permission.AlbumAssetCreate, sharedLink: true })
+  @ApiOperation({
+    summary: 'Add assets to an album',
+    description: 'Add multiple assets to a specific album by its ID.',
+  })
   addAssetsToAlbum(
     @Auth() auth: AuthDto,
     @Param() { id }: UUIDParamDto,
@@ -81,12 +111,20 @@ export class AlbumController {
 
   @Put('assets')
   @Authenticated({ permission: Permission.AlbumAssetCreate, sharedLink: true })
+  @ApiOperation({
+    summary: 'Add assets to albums',
+    description: 'Send a list of asset IDs and album IDs to add each asset to each album.',
+  })
   addAssetsToAlbums(@Auth() auth: AuthDto, @Body() dto: AlbumsAddAssetsDto): Promise<AlbumsAddAssetsResponseDto> {
     return this.service.addAssetsToAlbums(auth, dto);
   }
 
   @Delete(':id/assets')
   @Authenticated({ permission: Permission.AlbumAssetDelete })
+  @ApiOperation({
+    summary: 'Remove assets from an album',
+    description: 'Remove multiple assets from a specific album by its ID.',
+  })
   removeAssetFromAlbum(
     @Auth() auth: AuthDto,
     @Body() dto: BulkIdsDto,
@@ -97,6 +135,10 @@ export class AlbumController {
 
   @Put(':id/users')
   @Authenticated({ permission: Permission.AlbumUserCreate })
+  @ApiOperation({
+    summary: 'Share album with users',
+    description: 'Share an album with multiple users. Each user can be given a specific role in the album.',
+  })
   addUsersToAlbum(
     @Auth() auth: AuthDto,
     @Param() { id }: UUIDParamDto,
@@ -108,6 +150,10 @@ export class AlbumController {
   @Put(':id/user/:userId')
   @Authenticated({ permission: Permission.AlbumUserUpdate })
   @HttpCode(HttpStatus.NO_CONTENT)
+  @ApiOperation({
+    summary: 'Update user role',
+    description: 'Change the role for a specific user in a specific album.',
+  })
   updateAlbumUser(
     @Auth() auth: AuthDto,
     @Param() { id }: UUIDParamDto,
@@ -120,6 +166,10 @@ export class AlbumController {
   @Delete(':id/user/:userId')
   @Authenticated({ permission: Permission.AlbumUserDelete })
   @HttpCode(HttpStatus.NO_CONTENT)
+  @ApiOperation({
+    summary: 'Remove user from album',
+    description: 'Remove a user from an album. Use an ID of "me" to leave a shared album.',
+  })
   removeUserFromAlbum(
     @Auth() auth: AuthDto,
     @Param() { id }: UUIDParamDto,
diff --git a/server/src/controllers/api-key.controller.ts b/server/src/controllers/api-key.controller.ts
index 59b6908128..8a4e01e36a 100644
--- a/server/src/controllers/api-key.controller.ts
+++ b/server/src/controllers/api-key.controller.ts
@@ -1,43 +1,60 @@
 import { Body, Controller, Delete, Get, HttpCode, HttpStatus, Param, Post, Put } from '@nestjs/common';
-import { ApiTags } from '@nestjs/swagger';
+import { ApiOperation, ApiTags } from '@nestjs/swagger';
 import { APIKeyCreateDto, APIKeyCreateResponseDto, APIKeyResponseDto, APIKeyUpdateDto } from 'src/dtos/api-key.dto';
 import { AuthDto } from 'src/dtos/auth.dto';
-import { Permission } from 'src/enum';
+import { ApiTag, Permission } from 'src/enum';
 import { Auth, Authenticated } from 'src/middleware/auth.guard';
 import { ApiKeyService } from 'src/services/api-key.service';
 import { UUIDParamDto } from 'src/validation';
 
-@ApiTags('API Keys')
+@ApiTags(ApiTag.ApiKeys)
 @Controller('api-keys')
 export class ApiKeyController {
   constructor(private service: ApiKeyService) {}
 
   @Post()
   @Authenticated({ permission: Permission.ApiKeyCreate })
+  @ApiOperation({
+    summary: 'Create an API key',
+    description: 'Creates a new API key. It will be limited to the permissions specified.',
+  })
   createApiKey(@Auth() auth: AuthDto, @Body() dto: APIKeyCreateDto): Promise<APIKeyCreateResponseDto> {
     return this.service.create(auth, dto);
   }
 
   @Get()
   @Authenticated({ permission: Permission.ApiKeyRead })
+  @ApiOperation({ summary: 'List all API keys', description: 'Retrieve all API keys of the current user.' })
   getApiKeys(@Auth() auth: AuthDto): Promise<APIKeyResponseDto[]> {
     return this.service.getAll(auth);
   }
 
   @Get('me')
   @Authenticated({ permission: false })
+  @ApiOperation({
+    summary: 'Retrieve the current API key',
+    description: 'Retrieve the API key that is used to access this endpoint.',
+  })
   async getMyApiKey(@Auth() auth: AuthDto): Promise<APIKeyResponseDto> {
     return this.service.getMine(auth);
   }
 
   @Get(':id')
   @Authenticated({ permission: Permission.ApiKeyRead })
+  @ApiOperation({
+    summary: 'Retrieve an API key',
+    description: 'Retrieve an API key by its ID. The current user must own this API key.',
+  })
   getApiKey(@Auth() auth: AuthDto, @Param() { id }: UUIDParamDto): Promise<APIKeyResponseDto> {
     return this.service.getById(auth, id);
   }
 
   @Put(':id')
   @Authenticated({ permission: Permission.ApiKeyUpdate })
+  @ApiOperation({
+    summary: 'Update an API key',
+    description: 'Updates the name and permissions of an API key by its ID. The current user must own this API key.',
+  })
   updateApiKey(
     @Auth() auth: AuthDto,
     @Param() { id }: UUIDParamDto,
@@ -49,6 +66,10 @@ export class ApiKeyController {
   @Delete(':id')
   @Authenticated({ permission: Permission.ApiKeyDelete })
   @HttpCode(HttpStatus.NO_CONTENT)
+  @ApiOperation({
+    summary: 'Delete an API key',
+    description: 'Deletes an API key identified by its ID. The current user must own this API key.',
+  })
   deleteApiKey(@Auth() auth: AuthDto, @Param() { id }: UUIDParamDto): Promise<void> {
     return this.service.delete(auth, id);
   }
diff --git a/server/src/controllers/asset-media.controller.ts b/server/src/controllers/asset-media.controller.ts
index 688e513b64..6f110b33ba 100644
--- a/server/src/controllers/asset-media.controller.ts
+++ b/server/src/controllers/asset-media.controller.ts
@@ -34,7 +34,7 @@ import {
   UploadFieldName,
 } from 'src/dtos/asset-media.dto';
 import { AuthDto } from 'src/dtos/auth.dto';
-import { ImmichHeader, Permission, RouteKey } from 'src/enum';
+import { ApiTag, ImmichHeader, Permission, RouteKey } from 'src/enum';
 import { AssetUploadInterceptor } from 'src/middleware/asset-upload.interceptor';
 import { Auth, Authenticated, FileResponse } from 'src/middleware/auth.guard';
 import { FileUploadInterceptor, getFiles } from 'src/middleware/file-upload.interceptor';
@@ -44,7 +44,7 @@ import { UploadFiles } from 'src/types';
 import { ImmichFileResponse, sendFile } from 'src/utils/file';
 import { FileNotEmptyValidator, UUIDParamDto } from 'src/validation';
 
-@ApiTags('Assets')
+@ApiTags(ApiTag.Assets)
 @Controller(RouteKey.Asset)
 export class AssetMediaController {
   constructor(
@@ -53,6 +53,7 @@ export class AssetMediaController {
   ) {}
 
   @Post()
+  @Authenticated({ permission: Permission.AssetUpload, sharedLink: true })
   @UseInterceptors(AssetUploadInterceptor, FileUploadInterceptor)
   @ApiConsumes('multipart/form-data')
   @ApiHeader({
@@ -61,7 +62,10 @@ export class AssetMediaController {
     required: false,
   })
   @ApiBody({ description: 'Asset Upload Information', type: AssetMediaCreateDto })
-  @Authenticated({ permission: Permission.AssetUpload, sharedLink: true })
+  @ApiOperation({
+    summary: 'Upload asset',
+    description: 'Uploads a new asset to the server.',
+  })
   async uploadAsset(
     @Auth() auth: AuthDto,
     @UploadedFiles(new ParseFilePipe({ validators: [new FileNotEmptyValidator(['assetData'])] })) files: UploadFiles,
@@ -81,6 +85,10 @@ export class AssetMediaController {
   @Get(':id/original')
   @FileResponse()
   @Authenticated({ permission: Permission.AssetDownload, sharedLink: true })
+  @ApiOperation({
+    summary: 'Download original asset',
+    description: 'Downloads the original file of the specified asset.',
+  })
   async downloadAsset(
     @Auth() auth: AuthDto,
     @Param() { id }: UUIDParamDto,
@@ -90,17 +98,14 @@ export class AssetMediaController {
     await sendFile(res, next, () => this.service.downloadOriginal(auth, id), this.logger);
   }
 
-  /**
-   *  Replace the asset with new file, without changing its id
-   */
   @Put(':id/original')
   @UseInterceptors(FileUploadInterceptor)
   @ApiConsumes('multipart/form-data')
   @EndpointLifecycle({
     addedAt: 'v1.106.0',
     deprecatedAt: 'v1.142.0',
-    summary: 'replaceAsset',
-    description: 'Replace the asset with new file, without changing its id',
+    summary: 'Replace asset',
+    description: 'Replace the asset with new file, without changing its id.',
   })
   @Authenticated({ permission: Permission.AssetReplace, sharedLink: true })
   async replaceAsset(
@@ -122,6 +127,10 @@ export class AssetMediaController {
   @Get(':id/thumbnail')
   @FileResponse()
   @Authenticated({ permission: Permission.AssetView, sharedLink: true })
+  @ApiOperation({
+    summary: 'View asset thumbnail',
+    description: 'Retrieve the thumbnail image for the specified asset.',
+  })
   async viewAsset(
     @Auth() auth: AuthDto,
     @Param() { id }: UUIDParamDto,
@@ -159,6 +168,10 @@ export class AssetMediaController {
   @Get(':id/video/playback')
   @FileResponse()
   @Authenticated({ permission: Permission.AssetView, sharedLink: true })
+  @ApiOperation({
+    summary: 'Play asset video',
+    description: 'Streams the video file for the specified asset. This endpoint also supports byte range requests.',
+  })
   async playAssetVideo(
     @Auth() auth: AuthDto,
     @Param() { id }: UUIDParamDto,
@@ -174,7 +187,7 @@ export class AssetMediaController {
   @Post('exist')
   @Authenticated()
   @ApiOperation({
-    summary: 'checkExistingAssets',
+    summary: 'Check existing assets',
     description: 'Checks if multiple assets exist on the server and returns all existing - used by background backup',
   })
   @HttpCode(HttpStatus.OK)
@@ -191,8 +204,8 @@ export class AssetMediaController {
   @Post('bulk-upload-check')
   @Authenticated({ permission: Permission.AssetUpload })
   @ApiOperation({
-    summary: 'checkBulkUpload',
-    description: 'Checks if assets exist by checksums',
+    summary: 'Check bulk upload',
+    description: 'Determine which assets have already been uploaded to the server based on their SHA1 checksums.',
   })
   @HttpCode(HttpStatus.OK)
   checkBulkUpload(
diff --git a/server/src/controllers/asset.controller.ts b/server/src/controllers/asset.controller.ts
index a6f8c7921d..6a7309b6d6 100644
--- a/server/src/controllers/asset.controller.ts
+++ b/server/src/controllers/asset.controller.ts
@@ -18,29 +18,31 @@ import {
 } from 'src/dtos/asset.dto';
 import { AuthDto } from 'src/dtos/auth.dto';
 import { AssetOcrResponseDto } from 'src/dtos/ocr.dto';
-import { Permission, RouteKey } from 'src/enum';
+import { ApiTag, Permission, RouteKey } from 'src/enum';
 import { Auth, Authenticated } from 'src/middleware/auth.guard';
 import { AssetService } from 'src/services/asset.service';
 import { UUIDParamDto } from 'src/validation';
 
-@ApiTags('Assets')
+@ApiTags(ApiTag.Assets)
 @Controller(RouteKey.Asset)
 export class AssetController {
   constructor(private service: AssetService) {}
 
   @Get('random')
   @Authenticated({ permission: Permission.AssetRead })
-  @EndpointLifecycle({ deprecatedAt: 'v1.116.0' })
+  @EndpointLifecycle({
+    deprecatedAt: 'v1.116.0',
+    summary: 'Get random assets',
+    description: 'Retrieve a specified number of random assets for the authenticated user.',
+  })
   getRandom(@Auth() auth: AuthDto, @Query() dto: RandomAssetsDto): Promise<AssetResponseDto[]> {
     return this.service.getRandom(auth, dto.count ?? 1);
   }
 
-  /**
-   * Get all asset of a device that are in the database, ID only.
-   */
   @Get('/device/:deviceId')
-  @ApiOperation({
-    summary: 'getAllUserAssetsByDeviceId',
+  @EndpointLifecycle({
+    deprecatedAt: 'v2.0.0',
+    summary: 'Retrieve assets by device ID',
     description: 'Get all asset of a device that are in the database, ID only.',
   })
   @Authenticated()
@@ -50,6 +52,10 @@ export class AssetController {
 
   @Get('statistics')
   @Authenticated({ permission: Permission.AssetStatistics })
+  @ApiOperation({
+    summary: 'Get asset statistics',
+    description: 'Retrieve various statistics about the assets owned by the authenticated user.',
+  })
   getAssetStatistics(@Auth() auth: AuthDto, @Query() dto: AssetStatsDto): Promise<AssetStatsResponseDto> {
     return this.service.getStatistics(auth, dto);
   }
@@ -57,6 +63,10 @@ export class AssetController {
   @Post('jobs')
   @Authenticated()
   @HttpCode(HttpStatus.NO_CONTENT)
+  @ApiOperation({
+    summary: 'Run an asset job',
+    description: 'Run a specific job on a set of assets.',
+  })
   runAssetJobs(@Auth() auth: AuthDto, @Body() dto: AssetJobsDto): Promise<void> {
     return this.service.run(auth, dto);
   }
@@ -64,6 +74,10 @@ export class AssetController {
   @Put()
   @Authenticated({ permission: Permission.AssetUpdate })
   @HttpCode(HttpStatus.NO_CONTENT)
+  @ApiOperation({
+    summary: 'Update assets',
+    description: 'Updates multiple assets at the same time.',
+  })
   updateAssets(@Auth() auth: AuthDto, @Body() dto: AssetBulkUpdateDto): Promise<void> {
     return this.service.updateAll(auth, dto);
   }
@@ -71,12 +85,20 @@ export class AssetController {
   @Delete()
   @Authenticated({ permission: Permission.AssetDelete })
   @HttpCode(HttpStatus.NO_CONTENT)
+  @ApiOperation({
+    summary: 'Delete assets',
+    description: 'Deletes multiple assets at the same time.',
+  })
   deleteAssets(@Auth() auth: AuthDto, @Body() dto: AssetBulkDeleteDto): Promise<void> {
     return this.service.deleteAll(auth, dto);
   }
 
   @Get(':id')
   @Authenticated({ permission: Permission.AssetRead, sharedLink: true })
+  @ApiOperation({
+    summary: 'Retrieve an asset',
+    description: 'Retrieve detailed information about a specific asset.',
+  })
   getAssetInfo(@Auth() auth: AuthDto, @Param() { id }: UUIDParamDto): Promise<AssetResponseDto> {
     return this.service.get(auth, id) as Promise<AssetResponseDto>;
   }
@@ -84,12 +106,20 @@ export class AssetController {
   @Put('copy')
   @Authenticated({ permission: Permission.AssetCopy })
   @HttpCode(HttpStatus.NO_CONTENT)
+  @ApiOperation({
+    summary: 'Copy asset',
+    description: 'Copy asset information like albums, tags, etc. from one asset to another.',
+  })
   copyAsset(@Auth() auth: AuthDto, @Body() dto: AssetCopyDto): Promise<void> {
     return this.service.copy(auth, dto);
   }
 
   @Put(':id')
   @Authenticated({ permission: Permission.AssetUpdate })
+  @ApiOperation({
+    summary: 'Update an asset',
+    description: 'Update information of a specific asset.',
+  })
   updateAsset(
     @Auth() auth: AuthDto,
     @Param() { id }: UUIDParamDto,
@@ -100,18 +130,30 @@ export class AssetController {
 
   @Get(':id/metadata')
   @Authenticated({ permission: Permission.AssetRead })
+  @ApiOperation({
+    summary: 'Get asset metadata',
+    description: 'Retrieve all metadata key-value pairs associated with the specified asset.',
+  })
   getAssetMetadata(@Auth() auth: AuthDto, @Param() { id }: UUIDParamDto): Promise<AssetMetadataResponseDto[]> {
     return this.service.getMetadata(auth, id);
   }
 
   @Get(':id/ocr')
   @Authenticated({ permission: Permission.AssetRead })
+  @ApiOperation({
+    summary: 'Retrieve asset OCR data',
+    description: 'Retrieve all OCR (Optical Character Recognition) data associated with the specified asset.',
+  })
   getAssetOcr(@Auth() auth: AuthDto, @Param() { id }: UUIDParamDto): Promise<AssetOcrResponseDto[]> {
     return this.service.getOcr(auth, id);
   }
 
   @Put(':id/metadata')
   @Authenticated({ permission: Permission.AssetUpdate })
+  @ApiOperation({
+    summary: 'Update asset metadata',
+    description: 'Update or add metadata key-value pairs for the specified asset.',
+  })
   updateAssetMetadata(
     @Auth() auth: AuthDto,
     @Param() { id }: UUIDParamDto,
@@ -122,6 +164,10 @@ export class AssetController {
 
   @Get(':id/metadata/:key')
   @Authenticated({ permission: Permission.AssetRead })
+  @ApiOperation({
+    summary: 'Retrieve asset metadata by key',
+    description: 'Retrieve the value of a specific metadata key associated with the specified asset.',
+  })
   getAssetMetadataByKey(
     @Auth() auth: AuthDto,
     @Param() { id, key }: AssetMetadataRouteParams,
@@ -132,6 +178,10 @@ export class AssetController {
   @Delete(':id/metadata/:key')
   @Authenticated({ permission: Permission.AssetUpdate })
   @HttpCode(HttpStatus.NO_CONTENT)
+  @ApiOperation({
+    summary: 'Delete asset metadata by key',
+    description: 'Delete a specific metadata key-value pair associated with the specified asset.',
+  })
   deleteAssetMetadata(@Auth() auth: AuthDto, @Param() { id, key }: AssetMetadataRouteParams): Promise<void> {
     return this.service.deleteMetadataByKey(auth, id, key);
   }
diff --git a/server/src/controllers/auth-admin.controller.ts b/server/src/controllers/auth-admin.controller.ts
index dba352783e..8cbdf5d6da 100644
--- a/server/src/controllers/auth-admin.controller.ts
+++ b/server/src/controllers/auth-admin.controller.ts
@@ -1,17 +1,21 @@
 import { Controller, HttpCode, HttpStatus, Post } from '@nestjs/common';
-import { ApiTags } from '@nestjs/swagger';
+import { ApiOperation, ApiTags } from '@nestjs/swagger';
 import { AuthDto } from 'src/dtos/auth.dto';
-import { Permission } from 'src/enum';
+import { ApiTag, Permission } from 'src/enum';
 import { Auth, Authenticated } from 'src/middleware/auth.guard';
 import { AuthAdminService } from 'src/services/auth-admin.service';
 
-@ApiTags('Auth (admin)')
+@ApiTags(ApiTag.AuthenticationAdmin)
 @Controller('admin/auth')
 export class AuthAdminController {
   constructor(private service: AuthAdminService) {}
   @Post('unlink-all')
   @Authenticated({ permission: Permission.AdminAuthUnlinkAll, admin: true })
   @HttpCode(HttpStatus.NO_CONTENT)
+  @ApiOperation({
+    summary: 'Unlink all OAuth accounts',
+    description: 'Unlinks all OAuth accounts associated with user accounts in the system.',
+  })
   unlinkAllOAuthAccountsAdmin(@Auth() auth: AuthDto): Promise<void> {
     return this.service.unlinkAll(auth);
   }
diff --git a/server/src/controllers/auth.controller.ts b/server/src/controllers/auth.controller.ts
index 636e3a3047..7f76ff1952 100644
--- a/server/src/controllers/auth.controller.ts
+++ b/server/src/controllers/auth.controller.ts
@@ -1,5 +1,5 @@
 import { Body, Controller, Delete, Get, HttpCode, HttpStatus, Post, Put, Req, Res } from '@nestjs/common';
-import { ApiTags } from '@nestjs/swagger';
+import { ApiOperation, ApiTags } from '@nestjs/swagger';
 import { Request, Response } from 'express';
 import {
   AuthDto,
@@ -16,17 +16,21 @@ import {
   ValidateAccessTokenResponseDto,
 } from 'src/dtos/auth.dto';
 import { UserAdminResponseDto } from 'src/dtos/user.dto';
-import { AuthType, ImmichCookie, Permission } from 'src/enum';
+import { ApiTag, AuthType, ImmichCookie, Permission } from 'src/enum';
 import { Auth, Authenticated, GetLoginDetails } from 'src/middleware/auth.guard';
 import { AuthService, LoginDetails } from 'src/services/auth.service';
 import { respondWithCookie, respondWithoutCookie } from 'src/utils/response';
 
-@ApiTags('Authentication')
+@ApiTags(ApiTag.Authentication)
 @Controller('auth')
 export class AuthController {
   constructor(private service: AuthService) {}
 
   @Post('login')
+  @ApiOperation({
+    summary: 'Login',
+    description: 'Login with username and password and receive a session token.',
+  })
   async login(
     @Res({ passthrough: true }) res: Response,
     @Body() loginCredential: LoginCredentialDto,
@@ -44,11 +48,19 @@ export class AuthController {
   }
 
   @Post('admin-sign-up')
+  @ApiOperation({
+    summary: 'Register admin',
+    description: 'Create the first admin user in the system.',
+  })
   signUpAdmin(@Body() dto: SignUpDto): Promise<UserAdminResponseDto> {
     return this.service.adminSignUp(dto);
   }
 
   @Post('validateToken')
+  @ApiOperation({
+    summary: 'Validate access token',
+    description: 'Validate the current authorization method is still valid.',
+  })
   @Authenticated({ permission: false })
   @HttpCode(HttpStatus.OK)
   validateAccessToken(): ValidateAccessTokenResponseDto {
@@ -58,6 +70,10 @@ export class AuthController {
   @Post('change-password')
   @Authenticated({ permission: Permission.AuthChangePassword })
   @HttpCode(HttpStatus.OK)
+  @ApiOperation({
+    summary: 'Change password',
+    description: 'Change the password of the current user.',
+  })
   changePassword(@Auth() auth: AuthDto, @Body() dto: ChangePasswordDto): Promise<UserAdminResponseDto> {
     return this.service.changePassword(auth, dto);
   }
@@ -65,6 +81,10 @@ export class AuthController {
   @Post('logout')
   @Authenticated()
   @HttpCode(HttpStatus.OK)
+  @ApiOperation({
+    summary: 'Logout',
+    description: 'Logout the current user and invalidate the session token.',
+  })
   async logout(
     @Req() request: Request,
     @Res({ passthrough: true }) res: Response,
@@ -82,6 +102,11 @@ export class AuthController {
 
   @Get('status')
   @Authenticated()
+  @ApiOperation({
+    summary: 'Retrieve auth status',
+    description:
+      'Get information about the current session, including whether the user has a password, and if the session can access locked assets.',
+  })
   getAuthStatus(@Auth() auth: AuthDto): Promise<AuthStatusResponseDto> {
     return this.service.getAuthStatus(auth);
   }
@@ -89,6 +114,10 @@ export class AuthController {
   @Post('pin-code')
   @Authenticated({ permission: Permission.PinCodeCreate })
   @HttpCode(HttpStatus.NO_CONTENT)
+  @ApiOperation({
+    summary: 'Setup pin code',
+    description: 'Setup a new pin code for the current user.',
+  })
   setupPinCode(@Auth() auth: AuthDto, @Body() dto: PinCodeSetupDto): Promise<void> {
     return this.service.setupPinCode(auth, dto);
   }
@@ -96,6 +125,10 @@ export class AuthController {
   @Put('pin-code')
   @Authenticated({ permission: Permission.PinCodeUpdate })
   @HttpCode(HttpStatus.NO_CONTENT)
+  @ApiOperation({
+    summary: 'Change pin code',
+    description: 'Change the pin code for the current user.',
+  })
   async changePinCode(@Auth() auth: AuthDto, @Body() dto: PinCodeChangeDto): Promise<void> {
     return this.service.changePinCode(auth, dto);
   }
@@ -103,6 +136,10 @@ export class AuthController {
   @Delete('pin-code')
   @Authenticated({ permission: Permission.PinCodeDelete })
   @HttpCode(HttpStatus.NO_CONTENT)
+  @ApiOperation({
+    summary: 'Reset pin code',
+    description: 'Reset the pin code for the current user by providing the account password',
+  })
   async resetPinCode(@Auth() auth: AuthDto, @Body() dto: PinCodeResetDto): Promise<void> {
     return this.service.resetPinCode(auth, dto);
   }
@@ -110,12 +147,20 @@ export class AuthController {
   @Post('session/unlock')
   @Authenticated()
   @HttpCode(HttpStatus.NO_CONTENT)
+  @ApiOperation({
+    summary: 'Unlock auth session',
+    description: 'Temporarily grant the session elevated access to locked assets by providing the correct PIN code.',
+  })
   async unlockAuthSession(@Auth() auth: AuthDto, @Body() dto: SessionUnlockDto): Promise<void> {
     return this.service.unlockSession(auth, dto);
   }
 
   @Post('session/lock')
   @Authenticated()
+  @ApiOperation({
+    summary: 'Lock auth session',
+    description: 'Remove elevated access to locked assets from the current session.',
+  })
   @HttpCode(HttpStatus.NO_CONTENT)
   async lockAuthSession(@Auth() auth: AuthDto): Promise<void> {
     return this.service.lockSession(auth);
diff --git a/server/src/controllers/download.controller.ts b/server/src/controllers/download.controller.ts
index a7c2af78ed..26288412d7 100644
--- a/server/src/controllers/download.controller.ts
+++ b/server/src/controllers/download.controller.ts
@@ -1,20 +1,25 @@
 import { Body, Controller, HttpCode, HttpStatus, Post, StreamableFile } from '@nestjs/common';
-import { ApiTags } from '@nestjs/swagger';
+import { ApiOperation, ApiTags } from '@nestjs/swagger';
 import { AssetIdsDto } from 'src/dtos/asset.dto';
 import { AuthDto } from 'src/dtos/auth.dto';
 import { DownloadInfoDto, DownloadResponseDto } from 'src/dtos/download.dto';
-import { Permission } from 'src/enum';
+import { ApiTag, Permission } from 'src/enum';
 import { Auth, Authenticated, FileResponse } from 'src/middleware/auth.guard';
 import { DownloadService } from 'src/services/download.service';
 import { asStreamableFile } from 'src/utils/file';
 
-@ApiTags('Download')
+@ApiTags(ApiTag.Download)
 @Controller('download')
 export class DownloadController {
   constructor(private service: DownloadService) {}
 
   @Post('info')
   @Authenticated({ permission: Permission.AssetDownload, sharedLink: true })
+  @ApiOperation({
+    summary: 'Retrieve download information',
+    description:
+      'Retrieve information about how to request a download for the specified assets or album. The response includes groups of assets that can be downloaded together.',
+  })
   getDownloadInfo(@Auth() auth: AuthDto, @Body() dto: DownloadInfoDto): Promise<DownloadResponseDto> {
     return this.service.getDownloadInfo(auth, dto);
   }
@@ -23,6 +28,11 @@ export class DownloadController {
   @Authenticated({ permission: Permission.AssetDownload, sharedLink: true })
   @FileResponse()
   @HttpCode(HttpStatus.OK)
+  @ApiOperation({
+    summary: 'Download asset archive',
+    description:
+      'Download a ZIP archive containing the specified assets. The assets must have been previously requested via the "getDownloadInfo" endpoint.',
+  })
   downloadArchive(@Auth() auth: AuthDto, @Body() dto: AssetIdsDto): Promise<StreamableFile> {
     return this.service.downloadArchive(auth, dto).then(asStreamableFile);
   }
diff --git a/server/src/controllers/duplicate.controller.ts b/server/src/controllers/duplicate.controller.ts
index 9cf5ae97a6..5fddef9dd0 100644
--- a/server/src/controllers/duplicate.controller.ts
+++ b/server/src/controllers/duplicate.controller.ts
@@ -1,20 +1,24 @@
 import { Body, Controller, Delete, Get, HttpCode, HttpStatus, Param } from '@nestjs/common';
-import { ApiTags } from '@nestjs/swagger';
+import { ApiOperation, ApiTags } from '@nestjs/swagger';
 import { BulkIdsDto } from 'src/dtos/asset-ids.response.dto';
 import { AuthDto } from 'src/dtos/auth.dto';
 import { DuplicateResponseDto } from 'src/dtos/duplicate.dto';
-import { Permission } from 'src/enum';
+import { ApiTag, Permission } from 'src/enum';
 import { Auth, Authenticated } from 'src/middleware/auth.guard';
 import { DuplicateService } from 'src/services/duplicate.service';
 import { UUIDParamDto } from 'src/validation';
 
-@ApiTags('Duplicates')
+@ApiTags(ApiTag.Duplicates)
 @Controller('duplicates')
 export class DuplicateController {
   constructor(private service: DuplicateService) {}
 
   @Get()
   @Authenticated({ permission: Permission.DuplicateRead })
+  @ApiOperation({
+    summary: 'Retrieve duplicates',
+    description: 'Retrieve a list of duplicate assets available to the authenticated user.',
+  })
   getAssetDuplicates(@Auth() auth: AuthDto): Promise<DuplicateResponseDto[]> {
     return this.service.getDuplicates(auth);
   }
@@ -22,6 +26,10 @@ export class DuplicateController {
   @Delete()
   @Authenticated({ permission: Permission.DuplicateDelete })
   @HttpCode(HttpStatus.NO_CONTENT)
+  @ApiOperation({
+    summary: 'Delete duplicates',
+    description: 'Delete multiple duplicate assets specified by their IDs.',
+  })
   deleteDuplicates(@Auth() auth: AuthDto, @Body() dto: BulkIdsDto): Promise<void> {
     return this.service.deleteAll(auth, dto);
   }
@@ -29,6 +37,10 @@ export class DuplicateController {
   @Delete(':id')
   @Authenticated({ permission: Permission.DuplicateDelete })
   @HttpCode(HttpStatus.NO_CONTENT)
+  @ApiOperation({
+    summary: 'Delete a duplicate',
+    description: 'Delete a single duplicate asset specified by its ID.',
+  })
   deleteDuplicate(@Auth() auth: AuthDto, @Param() { id }: UUIDParamDto): Promise<void> {
     return this.service.delete(auth, id);
   }
diff --git a/server/src/controllers/face.controller.ts b/server/src/controllers/face.controller.ts
index 564b217c16..cc7f23929a 100644
--- a/server/src/controllers/face.controller.ts
+++ b/server/src/controllers/face.controller.ts
@@ -1,5 +1,5 @@
 import { Body, Controller, Delete, Get, HttpCode, HttpStatus, Param, Post, Put, Query } from '@nestjs/common';
-import { ApiTags } from '@nestjs/swagger';
+import { ApiOperation, ApiTags } from '@nestjs/swagger';
 import { AuthDto } from 'src/dtos/auth.dto';
 import {
   AssetFaceCreateDto,
@@ -8,30 +8,43 @@ import {
   FaceDto,
   PersonResponseDto,
 } from 'src/dtos/person.dto';
-import { Permission } from 'src/enum';
+import { ApiTag, Permission } from 'src/enum';
 import { Auth, Authenticated } from 'src/middleware/auth.guard';
 import { PersonService } from 'src/services/person.service';
 import { UUIDParamDto } from 'src/validation';
 
-@ApiTags('Faces')
+@ApiTags(ApiTag.Faces)
 @Controller('faces')
 export class FaceController {
   constructor(private service: PersonService) {}
 
   @Post()
   @Authenticated({ permission: Permission.FaceCreate })
+  @ApiOperation({
+    summary: 'Create a face',
+    description:
+      'Create a new face that has not been discovered by facial recognition. The content of the bounding box is considered a face.',
+  })
   createFace(@Auth() auth: AuthDto, @Body() dto: AssetFaceCreateDto) {
     return this.service.createFace(auth, dto);
   }
 
   @Get()
   @Authenticated({ permission: Permission.FaceRead })
+  @ApiOperation({
+    summary: 'Retrieve faces for asset',
+    description: 'Retrieve all faces belonging to an asset.',
+  })
   getFaces(@Auth() auth: AuthDto, @Query() dto: FaceDto): Promise<AssetFaceResponseDto[]> {
     return this.service.getFacesById(auth, dto);
   }
 
   @Put(':id')
   @Authenticated({ permission: Permission.FaceUpdate })
+  @ApiOperation({
+    summary: 'Re-assign a face to another person',
+    description: 'Re-assign the face provided in the body to the person identified by the id in the path parameter.',
+  })
   reassignFacesById(
     @Auth() auth: AuthDto,
     @Param() { id }: UUIDParamDto,
@@ -43,6 +56,10 @@ export class FaceController {
   @Delete(':id')
   @Authenticated({ permission: Permission.FaceDelete })
   @HttpCode(HttpStatus.NO_CONTENT)
+  @ApiOperation({
+    summary: 'Delete a face',
+    description: 'Delete a face identified by the id. Optionally can be force deleted.',
+  })
   deleteFace(@Auth() auth: AuthDto, @Param() { id }: UUIDParamDto, @Body() dto: AssetFaceDeleteDto): Promise<void> {
     return this.service.deleteFace(auth, id, dto);
   }
diff --git a/server/src/controllers/job.controller.ts b/server/src/controllers/job.controller.ts
index 9c4e819649..b34f5ffecf 100644
--- a/server/src/controllers/job.controller.ts
+++ b/server/src/controllers/job.controller.ts
@@ -1,17 +1,21 @@
 import { Body, Controller, Get, HttpCode, HttpStatus, Param, Post, Put } from '@nestjs/common';
-import { ApiTags } from '@nestjs/swagger';
+import { ApiOperation, ApiTags } from '@nestjs/swagger';
 import { AllJobStatusResponseDto, JobCommandDto, JobCreateDto, JobIdParamDto, JobStatusDto } from 'src/dtos/job.dto';
-import { Permission } from 'src/enum';
+import { ApiTag, Permission } from 'src/enum';
 import { Authenticated } from 'src/middleware/auth.guard';
 import { JobService } from 'src/services/job.service';
 
-@ApiTags('Jobs')
+@ApiTags(ApiTag.Jobs)
 @Controller('jobs')
 export class JobController {
   constructor(private service: JobService) {}
 
   @Get()
   @Authenticated({ permission: Permission.JobRead, admin: true })
+  @ApiOperation({
+    summary: 'Retrieve queue counts and status',
+    description: 'Retrieve the counts of the current queue, as well as the current status.',
+  })
   getAllJobsStatus(): Promise<AllJobStatusResponseDto> {
     return this.service.getAllJobsStatus();
   }
@@ -19,12 +23,22 @@ export class JobController {
   @Post()
   @Authenticated({ permission: Permission.JobCreate, admin: true })
   @HttpCode(HttpStatus.NO_CONTENT)
+  @ApiOperation({
+    summary: 'Create a manual job',
+    description:
+      'Run a specific job. Most jobs are queued automatically, but this endpoint allows for manual creation of a handful of jobs, including various cleanup tasks, as well as creating a new database backup.',
+  })
   createJob(@Body() dto: JobCreateDto): Promise<void> {
     return this.service.create(dto);
   }
 
   @Put(':id')
   @Authenticated({ permission: Permission.JobCreate, admin: true })
+  @ApiOperation({
+    summary: 'Run jobs',
+    description:
+      'Queue all assets for a specific job type. Defaults to only queueing assets that have not yet been processed, but the force command can be used to re-process all assets.',
+  })
   sendJobCommand(@Param() { id }: JobIdParamDto, @Body() dto: JobCommandDto): Promise<JobStatusDto> {
     return this.service.handleCommand(id, dto);
   }
diff --git a/server/src/controllers/library.controller.ts b/server/src/controllers/library.controller.ts
index b37bc40ce7..8b527eb4bb 100644
--- a/server/src/controllers/library.controller.ts
+++ b/server/src/controllers/library.controller.ts
@@ -1,5 +1,5 @@
 import { Body, Controller, Delete, Get, HttpCode, HttpStatus, Param, Post, Put } from '@nestjs/common';
-import { ApiTags } from '@nestjs/swagger';
+import { ApiOperation, ApiTags } from '@nestjs/swagger';
 import {
   CreateLibraryDto,
   LibraryResponseDto,
@@ -8,36 +8,52 @@ import {
   ValidateLibraryDto,
   ValidateLibraryResponseDto,
 } from 'src/dtos/library.dto';
-import { Permission } from 'src/enum';
+import { ApiTag, Permission } from 'src/enum';
 import { Authenticated } from 'src/middleware/auth.guard';
 import { LibraryService } from 'src/services/library.service';
 import { UUIDParamDto } from 'src/validation';
 
-@ApiTags('Libraries')
+@ApiTags(ApiTag.Libraries)
 @Controller('libraries')
 export class LibraryController {
   constructor(private service: LibraryService) {}
 
   @Get()
   @Authenticated({ permission: Permission.LibraryRead, admin: true })
+  @ApiOperation({
+    summary: 'Retrieve libraries',
+    description: 'Retrieve a list of external libraries.',
+  })
   getAllLibraries(): Promise<LibraryResponseDto[]> {
     return this.service.getAll();
   }
 
   @Post()
   @Authenticated({ permission: Permission.LibraryCreate, admin: true })
+  @ApiOperation({
+    summary: 'Create a library',
+    description: 'Create a new external library.',
+  })
   createLibrary(@Body() dto: CreateLibraryDto): Promise<LibraryResponseDto> {
     return this.service.create(dto);
   }
 
   @Get(':id')
   @Authenticated({ permission: Permission.LibraryRead, admin: true })
+  @ApiOperation({
+    summary: 'Retrieve a library',
+    description: 'Retrieve an external library by its ID.',
+  })
   getLibrary(@Param() { id }: UUIDParamDto): Promise<LibraryResponseDto> {
     return this.service.get(id);
   }
 
   @Put(':id')
   @Authenticated({ permission: Permission.LibraryUpdate, admin: true })
+  @ApiOperation({
+    summary: 'Update a library',
+    description: 'Update an existing external library.',
+  })
   updateLibrary(@Param() { id }: UUIDParamDto, @Body() dto: UpdateLibraryDto): Promise<LibraryResponseDto> {
     return this.service.update(id, dto);
   }
@@ -45,6 +61,10 @@ export class LibraryController {
   @Delete(':id')
   @Authenticated({ permission: Permission.LibraryDelete, admin: true })
   @HttpCode(HttpStatus.NO_CONTENT)
+  @ApiOperation({
+    summary: 'Delete a library',
+    description: 'Delete an external library by its ID.',
+  })
   deleteLibrary(@Param() { id }: UUIDParamDto): Promise<void> {
     return this.service.delete(id);
   }
@@ -52,6 +72,10 @@ export class LibraryController {
   @Post(':id/validate')
   @Authenticated({ admin: true })
   @HttpCode(HttpStatus.OK)
+  @ApiOperation({
+    summary: 'Validate library settings',
+    description: 'Validate the settings of an external library.',
+  })
   // TODO: change endpoint to validate current settings instead
   validate(@Param() { id }: UUIDParamDto, @Body() dto: ValidateLibraryDto): Promise<ValidateLibraryResponseDto> {
     return this.service.validate(id, dto);
@@ -59,6 +83,11 @@ export class LibraryController {
 
   @Get(':id/statistics')
   @Authenticated({ permission: Permission.LibraryStatistics, admin: true })
+  @ApiOperation({
+    summary: 'Retrieve library statistics',
+    description:
+      'Retrieve statistics for a specific external library, including number of videos, images, and storage usage.',
+  })
   getLibraryStatistics(@Param() { id }: UUIDParamDto): Promise<LibraryStatsResponseDto> {
     return this.service.getStatistics(id);
   }
@@ -66,6 +95,10 @@ export class LibraryController {
   @Post(':id/scan')
   @Authenticated({ permission: Permission.LibraryUpdate, admin: true })
   @HttpCode(HttpStatus.NO_CONTENT)
+  @ApiOperation({
+    summary: 'Scan a library',
+    description: 'Queue a scan for the external library to find and import new assets.',
+  })
   scanLibrary(@Param() { id }: UUIDParamDto): Promise<void> {
     return this.service.queueScan(id);
   }
diff --git a/server/src/controllers/map.controller.ts b/server/src/controllers/map.controller.ts
index 88104e6b58..41acfbd5b4 100644
--- a/server/src/controllers/map.controller.ts
+++ b/server/src/controllers/map.controller.ts
@@ -1,5 +1,5 @@
 import { Controller, Get, HttpCode, HttpStatus, Query } from '@nestjs/common';
-import { ApiTags } from '@nestjs/swagger';
+import { ApiOperation, ApiTags } from '@nestjs/swagger';
 import { AuthDto } from 'src/dtos/auth.dto';
 import {
   MapMarkerDto,
@@ -7,16 +7,21 @@ import {
   MapReverseGeocodeDto,
   MapReverseGeocodeResponseDto,
 } from 'src/dtos/map.dto';
+import { ApiTag } from 'src/enum';
 import { Auth, Authenticated } from 'src/middleware/auth.guard';
 import { MapService } from 'src/services/map.service';
 
-@ApiTags('Map')
+@ApiTags(ApiTag.Map)
 @Controller('map')
 export class MapController {
   constructor(private service: MapService) {}
 
   @Get('markers')
   @Authenticated()
+  @ApiOperation({
+    summary: 'Retrieve map markers',
+    description: 'Retrieve a list of latitude and longitude coordinates for every asset with location data.',
+  })
   getMapMarkers(@Auth() auth: AuthDto, @Query() options: MapMarkerDto): Promise<MapMarkerResponseDto[]> {
     return this.service.getMapMarkers(auth, options);
   }
@@ -24,6 +29,10 @@ export class MapController {
   @Authenticated()
   @Get('reverse-geocode')
   @HttpCode(HttpStatus.OK)
+  @ApiOperation({
+    summary: 'Reverse geocode coordinates',
+    description: 'Retrieve location information (e.g., city, country) for given latitude and longitude coordinates.',
+  })
   reverseGeocode(@Query() dto: MapReverseGeocodeDto): Promise<MapReverseGeocodeResponseDto[]> {
     return this.service.reverseGeocode(dto);
   }
diff --git a/server/src/controllers/memory.controller.ts b/server/src/controllers/memory.controller.ts
index 3b5ad2bb4e..d433ae88ed 100644
--- a/server/src/controllers/memory.controller.ts
+++ b/server/src/controllers/memory.controller.ts
@@ -1,5 +1,5 @@
 import { Body, Controller, Delete, Get, HttpCode, HttpStatus, Param, Post, Put, Query } from '@nestjs/common';
-import { ApiTags } from '@nestjs/swagger';
+import { ApiOperation, ApiTags } from '@nestjs/swagger';
 import { BulkIdResponseDto, BulkIdsDto } from 'src/dtos/asset-ids.response.dto';
 import { AuthDto } from 'src/dtos/auth.dto';
 import {
@@ -9,42 +9,64 @@ import {
   MemoryStatisticsResponseDto,
   MemoryUpdateDto,
 } from 'src/dtos/memory.dto';
-import { Permission } from 'src/enum';
+import { ApiTag, Permission } from 'src/enum';
 import { Auth, Authenticated } from 'src/middleware/auth.guard';
 import { MemoryService } from 'src/services/memory.service';
 import { UUIDParamDto } from 'src/validation';
 
-@ApiTags('Memories')
+@ApiTags(ApiTag.Memories)
 @Controller('memories')
 export class MemoryController {
   constructor(private service: MemoryService) {}
 
   @Get()
   @Authenticated({ permission: Permission.MemoryRead })
+  @ApiOperation({
+    summary: 'Retrieve memories',
+    description:
+      'Retrieve a list of memories. Memories are sorted descending by creation date by default, although they can also be sorted in ascending order, or randomly.',
+  })
   searchMemories(@Auth() auth: AuthDto, @Query() dto: MemorySearchDto): Promise<MemoryResponseDto[]> {
     return this.service.search(auth, dto);
   }
 
   @Post()
   @Authenticated({ permission: Permission.MemoryCreate })
+  @ApiOperation({
+    summary: 'Create a memory',
+    description:
+      'Create a new memory by providing a name, description, and a list of asset IDs to include in the memory.',
+  })
   createMemory(@Auth() auth: AuthDto, @Body() dto: MemoryCreateDto): Promise<MemoryResponseDto> {
     return this.service.create(auth, dto);
   }
 
   @Get('statistics')
   @Authenticated({ permission: Permission.MemoryStatistics })
+  @ApiOperation({
+    summary: 'Retrieve memories statistics',
+    description: 'Retrieve statistics about memories, such as total count and other relevant metrics.',
+  })
   memoriesStatistics(@Auth() auth: AuthDto, @Query() dto: MemorySearchDto): Promise<MemoryStatisticsResponseDto> {
     return this.service.statistics(auth, dto);
   }
 
   @Get(':id')
   @Authenticated({ permission: Permission.MemoryRead })
+  @ApiOperation({
+    summary: 'Retrieve a memory',
+    description: 'Retrieve a specific memory by its ID.',
+  })
   getMemory(@Auth() auth: AuthDto, @Param() { id }: UUIDParamDto): Promise<MemoryResponseDto> {
     return this.service.get(auth, id);
   }
 
   @Put(':id')
   @Authenticated({ permission: Permission.MemoryUpdate })
+  @ApiOperation({
+    summary: 'Update a memory',
+    description: 'Update an existing memory by its ID.',
+  })
   updateMemory(
     @Auth() auth: AuthDto,
     @Param() { id }: UUIDParamDto,
@@ -56,12 +78,20 @@ export class MemoryController {
   @Delete(':id')
   @Authenticated({ permission: Permission.MemoryDelete })
   @HttpCode(HttpStatus.NO_CONTENT)
+  @ApiOperation({
+    summary: 'Delete a memory',
+    description: 'Delete a specific memory by its ID.',
+  })
   deleteMemory(@Auth() auth: AuthDto, @Param() { id }: UUIDParamDto): Promise<void> {
     return this.service.remove(auth, id);
   }
 
   @Put(':id/assets')
   @Authenticated({ permission: Permission.MemoryAssetCreate })
+  @ApiOperation({
+    summary: 'Add assets to a memory',
+    description: 'Add a list of asset IDs to a specific memory.',
+  })
   addMemoryAssets(
     @Auth() auth: AuthDto,
     @Param() { id }: UUIDParamDto,
@@ -73,6 +103,10 @@ export class MemoryController {
   @Delete(':id/assets')
   @Authenticated({ permission: Permission.MemoryAssetDelete })
   @HttpCode(HttpStatus.OK)
+  @ApiOperation({
+    summary: 'Remove assets from a memory',
+    description: 'Remove a list of asset IDs from a specific memory.',
+  })
   removeMemoryAssets(
     @Auth() auth: AuthDto,
     @Body() dto: BulkIdsDto,
diff --git a/server/src/controllers/notification-admin.controller.ts b/server/src/controllers/notification-admin.controller.ts
index 28ca7bfd30..fe7d9d1e49 100644
--- a/server/src/controllers/notification-admin.controller.ts
+++ b/server/src/controllers/notification-admin.controller.ts
@@ -1,5 +1,5 @@
 import { Body, Controller, HttpCode, HttpStatus, Param, Post } from '@nestjs/common';
-import { ApiTags } from '@nestjs/swagger';
+import { ApiOperation, ApiTags } from '@nestjs/swagger';
 import { AuthDto } from 'src/dtos/auth.dto';
 import {
   NotificationCreateDto,
@@ -9,17 +9,22 @@ import {
   TestEmailResponseDto,
 } from 'src/dtos/notification.dto';
 import { SystemConfigSmtpDto } from 'src/dtos/system-config.dto';
+import { ApiTag } from 'src/enum';
 import { Auth, Authenticated } from 'src/middleware/auth.guard';
 import { EmailTemplate } from 'src/repositories/email.repository';
 import { NotificationAdminService } from 'src/services/notification-admin.service';
 
-@ApiTags('Notifications (Admin)')
+@ApiTags(ApiTag.NotificationsAdmin)
 @Controller('admin/notifications')
 export class NotificationAdminController {
   constructor(private service: NotificationAdminService) {}
 
   @Post()
   @Authenticated({ admin: true })
+  @ApiOperation({
+    summary: 'Create a notification',
+    description: 'Create a new notification for a specific user.',
+  })
   createNotification(@Auth() auth: AuthDto, @Body() dto: NotificationCreateDto): Promise<NotificationDto> {
     return this.service.create(auth, dto);
   }
@@ -27,6 +32,10 @@ export class NotificationAdminController {
   @Post('test-email')
   @Authenticated({ admin: true })
   @HttpCode(HttpStatus.OK)
+  @ApiOperation({
+    summary: 'Send test email',
+    description: 'Send a test email using the provided SMTP configuration.',
+  })
   sendTestEmailAdmin(@Auth() auth: AuthDto, @Body() dto: SystemConfigSmtpDto): Promise<TestEmailResponseDto> {
     return this.service.sendTestEmail(auth.user.id, dto);
   }
@@ -34,6 +43,10 @@ export class NotificationAdminController {
   @Post('templates/:name')
   @Authenticated({ admin: true })
   @HttpCode(HttpStatus.OK)
+  @ApiOperation({
+    summary: 'Render email template',
+    description: 'Retrieve a preview of the provided email template.',
+  })
   getNotificationTemplateAdmin(
     @Auth() auth: AuthDto,
     @Param('name') name: EmailTemplate,
diff --git a/server/src/controllers/notification.controller.ts b/server/src/controllers/notification.controller.ts
index 8ce183c5d0..7d4840dd0b 100644
--- a/server/src/controllers/notification.controller.ts
+++ b/server/src/controllers/notification.controller.ts
@@ -1,5 +1,5 @@
 import { Body, Controller, Delete, Get, HttpCode, HttpStatus, Param, Put, Query } from '@nestjs/common';
-import { ApiTags } from '@nestjs/swagger';
+import { ApiOperation, ApiTags } from '@nestjs/swagger';
 import { AuthDto } from 'src/dtos/auth.dto';
 import {
   NotificationDeleteAllDto,
@@ -8,18 +8,22 @@ import {
   NotificationUpdateAllDto,
   NotificationUpdateDto,
 } from 'src/dtos/notification.dto';
-import { Permission } from 'src/enum';
+import { ApiTag, Permission } from 'src/enum';
 import { Auth, Authenticated } from 'src/middleware/auth.guard';
 import { NotificationService } from 'src/services/notification.service';
 import { UUIDParamDto } from 'src/validation';
 
-@ApiTags('Notifications')
+@ApiTags(ApiTag.Notifications)
 @Controller('notifications')
 export class NotificationController {
   constructor(private service: NotificationService) {}
 
   @Get()
   @Authenticated({ permission: Permission.NotificationRead })
+  @ApiOperation({
+    summary: 'Retrieve notifications',
+    description: 'Retrieve a list of notifications.',
+  })
   getNotifications(@Auth() auth: AuthDto, @Query() dto: NotificationSearchDto): Promise<NotificationDto[]> {
     return this.service.search(auth, dto);
   }
@@ -27,6 +31,10 @@ export class NotificationController {
   @Put()
   @Authenticated({ permission: Permission.NotificationUpdate })
   @HttpCode(HttpStatus.NO_CONTENT)
+  @ApiOperation({
+    summary: 'Update notifications',
+    description: 'Update a list of notifications. Allows to bulk-set the read status of notifications.',
+  })
   updateNotifications(@Auth() auth: AuthDto, @Body() dto: NotificationUpdateAllDto): Promise<void> {
     return this.service.updateAll(auth, dto);
   }
@@ -34,18 +42,30 @@ export class NotificationController {
   @Delete()
   @Authenticated({ permission: Permission.NotificationDelete })
   @HttpCode(HttpStatus.NO_CONTENT)
+  @ApiOperation({
+    summary: 'Delete notifications',
+    description: 'Delete a list of notifications at once.',
+  })
   deleteNotifications(@Auth() auth: AuthDto, @Body() dto: NotificationDeleteAllDto): Promise<void> {
     return this.service.deleteAll(auth, dto);
   }
 
   @Get(':id')
   @Authenticated({ permission: Permission.NotificationRead })
+  @ApiOperation({
+    summary: 'Get a notification',
+    description: 'Retrieve a specific notification identified by id.',
+  })
   getNotification(@Auth() auth: AuthDto, @Param() { id }: UUIDParamDto): Promise<NotificationDto> {
     return this.service.get(auth, id);
   }
 
   @Put(':id')
   @Authenticated({ permission: Permission.NotificationUpdate })
+  @ApiOperation({
+    summary: 'Update a notification',
+    description: 'Update a specific notification to set its read status.',
+  })
   updateNotification(
     @Auth() auth: AuthDto,
     @Param() { id }: UUIDParamDto,
@@ -57,6 +77,10 @@ export class NotificationController {
   @Delete(':id')
   @Authenticated({ permission: Permission.NotificationDelete })
   @HttpCode(HttpStatus.NO_CONTENT)
+  @ApiOperation({
+    summary: 'Delete a notification',
+    description: 'Delete a specific notification.',
+  })
   deleteNotification(@Auth() auth: AuthDto, @Param() { id }: UUIDParamDto): Promise<void> {
     return this.service.delete(auth, id);
   }
diff --git a/server/src/controllers/oauth.controller.ts b/server/src/controllers/oauth.controller.ts
index f81a184557..cd15486d56 100644
--- a/server/src/controllers/oauth.controller.ts
+++ b/server/src/controllers/oauth.controller.ts
@@ -1,5 +1,5 @@
 import { Body, Controller, Get, HttpCode, HttpStatus, Post, Redirect, Req, Res } from '@nestjs/common';
-import { ApiTags } from '@nestjs/swagger';
+import { ApiOperation, ApiTags } from '@nestjs/swagger';
 import { Request, Response } from 'express';
 import {
   AuthDto,
@@ -9,18 +9,23 @@ import {
   OAuthConfigDto,
 } from 'src/dtos/auth.dto';
 import { UserAdminResponseDto } from 'src/dtos/user.dto';
-import { AuthType, ImmichCookie } from 'src/enum';
+import { ApiTag, AuthType, ImmichCookie } from 'src/enum';
 import { Auth, Authenticated, GetLoginDetails } from 'src/middleware/auth.guard';
 import { AuthService, LoginDetails } from 'src/services/auth.service';
 import { respondWithCookie } from 'src/utils/response';
 
-@ApiTags('OAuth')
+@ApiTags(ApiTag.Authentication)
 @Controller('oauth')
 export class OAuthController {
   constructor(private service: AuthService) {}
 
   @Get('mobile-redirect')
   @Redirect()
+  @ApiOperation({
+    summary: 'Redirect OAuth to mobile',
+    description:
+      'Requests to this URL are automatically forwarded to the mobile app, and is used in some cases for OAuth redirecting.',
+  })
   redirectOAuthToMobile(@Req() request: Request) {
     return {
       url: this.service.getMobileRedirect(request.url),
@@ -29,6 +34,10 @@ export class OAuthController {
   }
 
   @Post('authorize')
+  @ApiOperation({
+    summary: 'Start OAuth',
+    description: 'Initiate the OAuth authorization process.',
+  })
   async startOAuth(
     @Body() dto: OAuthConfigDto,
     @Res({ passthrough: true }) res: Response,
@@ -49,6 +58,10 @@ export class OAuthController {
   }
 
   @Post('callback')
+  @ApiOperation({
+    summary: 'Finish OAuth',
+    description: 'Complete the OAuth authorization process by exchanging the authorization code for a session token.',
+  })
   async finishOAuth(
     @Req() request: Request,
     @Res({ passthrough: true }) res: Response,
@@ -71,6 +84,10 @@ export class OAuthController {
   @Post('link')
   @Authenticated()
   @HttpCode(HttpStatus.OK)
+  @ApiOperation({
+    summary: 'Link OAuth account',
+    description: 'Link an OAuth account to the authenticated user.',
+  })
   linkOAuthAccount(
     @Req() request: Request,
     @Auth() auth: AuthDto,
@@ -82,6 +99,10 @@ export class OAuthController {
   @Post('unlink')
   @Authenticated()
   @HttpCode(HttpStatus.OK)
+  @ApiOperation({
+    summary: 'Unlink OAuth account',
+    description: 'Unlink the OAuth account from the authenticated user.',
+  })
   unlinkOAuthAccount(@Auth() auth: AuthDto): Promise<UserAdminResponseDto> {
     return this.service.unlink(auth);
   }
diff --git a/server/src/controllers/partner.controller.ts b/server/src/controllers/partner.controller.ts
index 7cb5c1c274..63ad84002f 100644
--- a/server/src/controllers/partner.controller.ts
+++ b/server/src/controllers/partner.controller.ts
@@ -1,32 +1,44 @@
 import { Body, Controller, Delete, Get, HttpCode, HttpStatus, Param, Post, Put, Query } from '@nestjs/common';
-import { ApiTags } from '@nestjs/swagger';
+import { ApiOperation, ApiTags } from '@nestjs/swagger';
 import { EndpointLifecycle } from 'src/decorators';
 import { AuthDto } from 'src/dtos/auth.dto';
 import { PartnerCreateDto, PartnerResponseDto, PartnerSearchDto, PartnerUpdateDto } from 'src/dtos/partner.dto';
-import { Permission } from 'src/enum';
+import { ApiTag, Permission } from 'src/enum';
 import { Auth, Authenticated } from 'src/middleware/auth.guard';
 import { PartnerService } from 'src/services/partner.service';
 import { UUIDParamDto } from 'src/validation';
 
-@ApiTags('Partners')
+@ApiTags(ApiTag.Partners)
 @Controller('partners')
 export class PartnerController {
   constructor(private service: PartnerService) {}
 
   @Get()
   @Authenticated({ permission: Permission.PartnerRead })
+  @ApiOperation({
+    summary: 'Retrieve partners',
+    description: 'Retrieve a list of partners with whom assets are shared.',
+  })
   getPartners(@Auth() auth: AuthDto, @Query() dto: PartnerSearchDto): Promise<PartnerResponseDto[]> {
     return this.service.search(auth, dto);
   }
 
   @Post()
   @Authenticated({ permission: Permission.PartnerCreate })
+  @ApiOperation({
+    summary: 'Create a partner',
+    description: 'Create a new partner to share assets with.',
+  })
   createPartner(@Auth() auth: AuthDto, @Body() dto: PartnerCreateDto): Promise<PartnerResponseDto> {
     return this.service.create(auth, dto);
   }
 
   @Post(':id')
-  @EndpointLifecycle({ deprecatedAt: 'v1.141.0' })
+  @EndpointLifecycle({
+    deprecatedAt: 'v1.141.0',
+    summary: 'Create a partner',
+    description: 'Create a new partner to share assets with.',
+  })
   @Authenticated({ permission: Permission.PartnerCreate })
   createPartnerDeprecated(@Auth() auth: AuthDto, @Param() { id }: UUIDParamDto): Promise<PartnerResponseDto> {
     return this.service.create(auth, { sharedWithId: id });
@@ -34,6 +46,10 @@ export class PartnerController {
 
   @Put(':id')
   @Authenticated({ permission: Permission.PartnerUpdate })
+  @ApiOperation({
+    summary: 'Update a partner',
+    description: "Specify whether a partner's assets should appear in the user's timeline.",
+  })
   updatePartner(
     @Auth() auth: AuthDto,
     @Param() { id }: UUIDParamDto,
@@ -45,6 +61,10 @@ export class PartnerController {
   @Delete(':id')
   @Authenticated({ permission: Permission.PartnerDelete })
   @HttpCode(HttpStatus.NO_CONTENT)
+  @ApiOperation({
+    summary: 'Remove a partner',
+    description: 'Stop sharing assets with a partner.',
+  })
   removePartner(@Auth() auth: AuthDto, @Param() { id }: UUIDParamDto): Promise<void> {
     return this.service.remove(auth, id);
   }
diff --git a/server/src/controllers/person.controller.ts b/server/src/controllers/person.controller.ts
index 84bb864cd3..6acb958444 100644
--- a/server/src/controllers/person.controller.ts
+++ b/server/src/controllers/person.controller.ts
@@ -12,7 +12,7 @@ import {
   Query,
   Res,
 } from '@nestjs/common';
-import { ApiTags } from '@nestjs/swagger';
+import { ApiOperation, ApiTags } from '@nestjs/swagger';
 import { NextFunction, Response } from 'express';
 import { BulkIdResponseDto, BulkIdsDto } from 'src/dtos/asset-ids.response.dto';
 import { AuthDto } from 'src/dtos/auth.dto';
@@ -27,14 +27,14 @@ import {
   PersonStatisticsResponseDto,
   PersonUpdateDto,
 } from 'src/dtos/person.dto';
-import { Permission } from 'src/enum';
+import { ApiTag, Permission } from 'src/enum';
 import { Auth, Authenticated, FileResponse } from 'src/middleware/auth.guard';
 import { LoggingRepository } from 'src/repositories/logging.repository';
 import { PersonService } from 'src/services/person.service';
 import { sendFile } from 'src/utils/file';
 import { UUIDParamDto } from 'src/validation';
 
-@ApiTags('People')
+@ApiTags(ApiTag.People)
 @Controller('people')
 export class PersonController {
   constructor(
@@ -46,18 +46,24 @@ export class PersonController {
 
   @Get()
   @Authenticated({ permission: Permission.PersonRead })
+  @ApiOperation({ summary: 'Get all people', description: 'Retrieve a list of all people.' })
   getAllPeople(@Auth() auth: AuthDto, @Query() options: PersonSearchDto): Promise<PeopleResponseDto> {
     return this.service.getAll(auth, options);
   }
 
   @Post()
   @Authenticated({ permission: Permission.PersonCreate })
+  @ApiOperation({
+    summary: 'Create a person',
+    description: 'Create a new person that can have multiple faces assigned to them.',
+  })
   createPerson(@Auth() auth: AuthDto, @Body() dto: PersonCreateDto): Promise<PersonResponseDto> {
     return this.service.create(auth, dto);
   }
 
   @Put()
   @Authenticated({ permission: Permission.PersonUpdate })
+  @ApiOperation({ summary: 'Update people', description: 'Bulk update multiple people at once.' })
   updatePeople(@Auth() auth: AuthDto, @Body() dto: PeopleUpdateDto): Promise<BulkIdResponseDto[]> {
     return this.service.updateAll(auth, dto);
   }
@@ -65,18 +71,21 @@ export class PersonController {
   @Delete()
   @Authenticated({ permission: Permission.PersonDelete })
   @HttpCode(HttpStatus.NO_CONTENT)
+  @ApiOperation({ summary: 'Delete people', description: 'Bulk delete a list of people at once.' })
   deletePeople(@Auth() auth: AuthDto, @Body() dto: BulkIdsDto): Promise<void> {
     return this.service.deleteAll(auth, dto);
   }
 
   @Get(':id')
   @Authenticated({ permission: Permission.PersonRead })
+  @ApiOperation({ summary: 'Get a person', description: 'Retrieve a person by id.' })
   getPerson(@Auth() auth: AuthDto, @Param() { id }: UUIDParamDto): Promise<PersonResponseDto> {
     return this.service.getById(auth, id);
   }
 
   @Put(':id')
   @Authenticated({ permission: Permission.PersonUpdate })
+  @ApiOperation({ summary: 'Update person', description: 'Update an individual person.' })
   updatePerson(
     @Auth() auth: AuthDto,
     @Param() { id }: UUIDParamDto,
@@ -88,12 +97,14 @@ export class PersonController {
   @Delete(':id')
   @Authenticated({ permission: Permission.PersonDelete })
   @HttpCode(HttpStatus.NO_CONTENT)
+  @ApiOperation({ summary: 'Delete person', description: 'Delete an individual person.' })
   deletePerson(@Auth() auth: AuthDto, @Param() { id }: UUIDParamDto): Promise<void> {
     return this.service.delete(auth, id);
   }
 
   @Get(':id/statistics')
   @Authenticated({ permission: Permission.PersonStatistics })
+  @ApiOperation({ summary: 'Get person statistics', description: 'Retrieve statistics about a specific person.' })
   getPersonStatistics(@Auth() auth: AuthDto, @Param() { id }: UUIDParamDto): Promise<PersonStatisticsResponseDto> {
     return this.service.getStatistics(auth, id);
   }
@@ -101,6 +112,7 @@ export class PersonController {
   @Get(':id/thumbnail')
   @FileResponse()
   @Authenticated({ permission: Permission.PersonRead })
+  @ApiOperation({ summary: 'Get person thumbnail', description: 'Retrieve the thumbnail file for a person.' })
   async getPersonThumbnail(
     @Res() res: Response,
     @Next() next: NextFunction,
@@ -112,6 +124,7 @@ export class PersonController {
 
   @Put(':id/reassign')
   @Authenticated({ permission: Permission.PersonReassign })
+  @ApiOperation({ summary: 'Reassign faces', description: 'Bulk reassign a list of faces to a different person.' })
   reassignFaces(
     @Auth() auth: AuthDto,
     @Param() { id }: UUIDParamDto,
@@ -123,6 +136,10 @@ export class PersonController {
   @Post(':id/merge')
   @Authenticated({ permission: Permission.PersonMerge })
   @HttpCode(HttpStatus.OK)
+  @ApiOperation({
+    summary: 'Merge people',
+    description: 'Merge a list of people into the person specified in the path parameter.',
+  })
   mergePerson(
     @Auth() auth: AuthDto,
     @Param() { id }: UUIDParamDto,
diff --git a/server/src/controllers/search.controller.ts b/server/src/controllers/search.controller.ts
index f9aa6bce81..e04fbaa3f6 100644
--- a/server/src/controllers/search.controller.ts
+++ b/server/src/controllers/search.controller.ts
@@ -1,5 +1,5 @@
 import { Body, Controller, Get, HttpCode, HttpStatus, Post, Query } from '@nestjs/common';
-import { ApiTags } from '@nestjs/swagger';
+import { ApiOperation, ApiTags } from '@nestjs/swagger';
 import { AssetResponseDto } from 'src/dtos/asset-response.dto';
 import { AuthDto } from 'src/dtos/auth.dto';
 import { PersonResponseDto } from 'src/dtos/person.dto';
@@ -17,11 +17,11 @@ import {
   SmartSearchDto,
   StatisticsSearchDto,
 } from 'src/dtos/search.dto';
-import { Permission } from 'src/enum';
+import { ApiTag, Permission } from 'src/enum';
 import { Auth, Authenticated } from 'src/middleware/auth.guard';
 import { SearchService } from 'src/services/search.service';
 
-@ApiTags('Search')
+@ApiTags(ApiTag.Search)
 @Controller('search')
 export class SearchController {
   constructor(private service: SearchService) {}
@@ -29,6 +29,10 @@ export class SearchController {
   @Post('metadata')
   @Authenticated({ permission: Permission.AssetRead })
   @HttpCode(HttpStatus.OK)
+  @ApiOperation({
+    summary: 'Search assets by metadata',
+    description: 'Search for assets based on various metadata criteria.',
+  })
   searchAssets(@Auth() auth: AuthDto, @Body() dto: MetadataSearchDto): Promise<SearchResponseDto> {
     return this.service.searchMetadata(auth, dto);
   }
@@ -36,6 +40,10 @@ export class SearchController {
   @Post('statistics')
   @Authenticated({ permission: Permission.AssetStatistics })
   @HttpCode(HttpStatus.OK)
+  @ApiOperation({
+    summary: 'Search asset statistics',
+    description: 'Retrieve statistical data about assets based on search criteria, such as the total matching count.',
+  })
   searchAssetStatistics(@Auth() auth: AuthDto, @Body() dto: StatisticsSearchDto): Promise<SearchStatisticsResponseDto> {
     return this.service.searchStatistics(auth, dto);
   }
@@ -43,6 +51,10 @@ export class SearchController {
   @Post('random')
   @Authenticated({ permission: Permission.AssetRead })
   @HttpCode(HttpStatus.OK)
+  @ApiOperation({
+    summary: 'Search random assets',
+    description: 'Retrieve a random selection of assets based on the provided criteria.',
+  })
   searchRandom(@Auth() auth: AuthDto, @Body() dto: RandomSearchDto): Promise<AssetResponseDto[]> {
     return this.service.searchRandom(auth, dto);
   }
@@ -50,6 +62,10 @@ export class SearchController {
   @Post('large-assets')
   @Authenticated({ permission: Permission.AssetRead })
   @HttpCode(HttpStatus.OK)
+  @ApiOperation({
+    summary: 'Search large assets',
+    description: 'Search for assets that are considered large based on specified criteria.',
+  })
   searchLargeAssets(@Auth() auth: AuthDto, @Query() dto: LargeAssetSearchDto): Promise<AssetResponseDto[]> {
     return this.service.searchLargeAssets(auth, dto);
   }
@@ -57,36 +73,62 @@ export class SearchController {
   @Post('smart')
   @Authenticated({ permission: Permission.AssetRead })
   @HttpCode(HttpStatus.OK)
+  @ApiOperation({
+    summary: 'Smart asset search',
+    description: 'Perform a smart search for assets by using machine learning vectors to determine relevance.',
+  })
   searchSmart(@Auth() auth: AuthDto, @Body() dto: SmartSearchDto): Promise<SearchResponseDto> {
     return this.service.searchSmart(auth, dto);
   }
 
   @Get('explore')
   @Authenticated({ permission: Permission.AssetRead })
+  @ApiOperation({
+    summary: 'Retrieve explore data',
+    description: 'Retrieve data for the explore section, such as popular people and places.',
+  })
   getExploreData(@Auth() auth: AuthDto): Promise<SearchExploreResponseDto[]> {
     return this.service.getExploreData(auth);
   }
 
   @Get('person')
   @Authenticated({ permission: Permission.PersonRead })
+  @ApiOperation({
+    summary: 'Search people',
+    description: 'Search for people by name.',
+  })
   searchPerson(@Auth() auth: AuthDto, @Query() dto: SearchPeopleDto): Promise<PersonResponseDto[]> {
     return this.service.searchPerson(auth, dto);
   }
 
   @Get('places')
   @Authenticated({ permission: Permission.AssetRead })
+  @ApiOperation({
+    summary: 'Search places',
+    description: 'Search for places by name.',
+  })
   searchPlaces(@Query() dto: SearchPlacesDto): Promise<PlacesResponseDto[]> {
     return this.service.searchPlaces(dto);
   }
 
   @Get('cities')
   @Authenticated({ permission: Permission.AssetRead })
+  @ApiOperation({
+    summary: 'Retrieve assets by city',
+    description:
+      'Retrieve a list of assets with each asset belonging to a different city. This endpoint is used on the places pages to show a single thumbnail for each city the user has assets in.',
+  })
   getAssetsByCity(@Auth() auth: AuthDto): Promise<AssetResponseDto[]> {
     return this.service.getAssetsByCity(auth);
   }
 
   @Get('suggestions')
   @Authenticated({ permission: Permission.AssetRead })
+  @ApiOperation({
+    summary: 'Retrieve search suggestions',
+    description:
+      'Retrieve search suggestions based on partial input. This endpoint is used for typeahead search features.',
+  })
   getSearchSuggestions(@Auth() auth: AuthDto, @Query() dto: SearchSuggestionRequestDto): Promise<string[]> {
     // TODO fix open api generation to indicate that results can be nullable
     return this.service.getSearchSuggestions(auth, dto) as Promise<string[]>;
diff --git a/server/src/controllers/server.controller.ts b/server/src/controllers/server.controller.ts
index f9a340eb31..c9c8539bb3 100644
--- a/server/src/controllers/server.controller.ts
+++ b/server/src/controllers/server.controller.ts
@@ -1,5 +1,5 @@
 import { Body, Controller, Delete, Get, HttpCode, HttpStatus, Put } from '@nestjs/common';
-import { ApiNotFoundResponse, ApiTags } from '@nestjs/swagger';
+import { ApiNotFoundResponse, ApiOperation, ApiTags } from '@nestjs/swagger';
 import { LicenseKeyDto, LicenseResponseDto } from 'src/dtos/license.dto';
 import {
   ServerAboutResponseDto,
@@ -15,13 +15,13 @@ import {
   ServerVersionResponseDto,
 } from 'src/dtos/server.dto';
 import { VersionCheckStateResponseDto } from 'src/dtos/system-metadata.dto';
-import { Permission } from 'src/enum';
+import { ApiTag, Permission } from 'src/enum';
 import { Authenticated } from 'src/middleware/auth.guard';
 import { ServerService } from 'src/services/server.service';
 import { SystemMetadataService } from 'src/services/system-metadata.service';
 import { VersionService } from 'src/services/version.service';
 
-@ApiTags('Server')
+@ApiTags(ApiTag.Server)
 @Controller('server')
 export class ServerController {
   constructor(
@@ -32,59 +32,85 @@ export class ServerController {
 
   @Get('about')
   @Authenticated({ permission: Permission.ServerAbout })
+  @ApiOperation({ summary: 'Get server information', description: 'Retrieve a list of information about the server.' })
   getAboutInfo(): Promise<ServerAboutResponseDto> {
     return this.service.getAboutInfo();
   }
 
   @Get('apk-links')
   @Authenticated({ permission: Permission.ServerApkLinks })
+  @ApiOperation({ summary: 'Get APK links', description: 'Retrieve links to the APKs for the current server version.' })
   getApkLinks(): ServerApkLinksDto {
     return this.service.getApkLinks();
   }
 
   @Get('storage')
   @Authenticated({ permission: Permission.ServerStorage })
+  @ApiOperation({
+    summary: 'Get storage',
+    description: 'Retrieve the current storage utilization information of the server.',
+  })
   getStorage(): Promise<ServerStorageResponseDto> {
     return this.service.getStorage();
   }
 
   @Get('ping')
+  @ApiOperation({ summary: 'Ping', description: 'Pong' })
   pingServer(): ServerPingResponse {
     return this.service.ping();
   }
 
   @Get('version')
+  @ApiOperation({
+    summary: 'Get server version',
+    description: 'Retrieve the current server version in semantic versioning (semver) format.',
+  })
   getServerVersion(): ServerVersionResponseDto {
     return this.versionService.getVersion();
   }
 
   @Get('version-history')
+  @ApiOperation({
+    summary: 'Get version history',
+    description: 'Retrieve a list of past versions the server has been on.',
+  })
   getVersionHistory(): Promise<ServerVersionHistoryResponseDto[]> {
     return this.versionService.getVersionHistory();
   }
 
   @Get('features')
+  @ApiOperation({ summary: 'Get features', description: 'Retrieve available features supported by this server.' })
   getServerFeatures(): Promise<ServerFeaturesDto> {
     return this.service.getFeatures();
   }
 
   @Get('theme')
+  @ApiOperation({ summary: 'Get theme', description: 'Retrieve the custom CSS, if existent.' })
   getTheme(): Promise<ServerThemeDto> {
     return this.service.getTheme();
   }
 
   @Get('config')
+  @ApiOperation({ summary: 'Get config', description: 'Retrieve the current server configuration.' })
   getServerConfig(): Promise<ServerConfigDto> {
     return this.service.getSystemConfig();
   }
 
   @Get('statistics')
   @Authenticated({ permission: Permission.ServerStatistics, admin: true })
+  @ApiOperation({
+    summary: 'Get statistics',
+    description: 'Retrieve statistics about the entire Immich instance such as asset counts.',
+  })
   getServerStatistics(): Promise<ServerStatsResponseDto> {
     return this.service.getStatistics();
   }
 
   @Get('media-types')
+  @ApiOperation({
+    summary: 'Get supported media types',
+    description: 'Retrieve all media types supported by the server.',
+  })
   getSupportedMediaTypes(): ServerMediaTypesResponseDto {
     return this.service.getSupportedMediaTypes();
   }
@@ -92,12 +118,20 @@ export class ServerController {
   @Get('license')
   @Authenticated({ permission: Permission.ServerLicenseRead, admin: true })
   @ApiNotFoundResponse()
+  @ApiOperation({
+    summary: 'Get product key',
+    description: 'Retrieve information about whether the server currently has a product key registered.',
+  })
   getServerLicense(): Promise<LicenseResponseDto> {
     return this.service.getLicense();
   }
 
   @Put('license')
   @Authenticated({ permission: Permission.ServerLicenseUpdate, admin: true })
+  @ApiOperation({
+    summary: 'Set server product key',
+    description: 'Validate and set the server product key if successful.',
+  })
   setServerLicense(@Body() license: LicenseKeyDto): Promise<LicenseResponseDto> {
     return this.service.setLicense(license);
   }
@@ -105,12 +139,17 @@ export class ServerController {
   @Delete('license')
   @Authenticated({ permission: Permission.ServerLicenseDelete, admin: true })
   @HttpCode(HttpStatus.NO_CONTENT)
+  @ApiOperation({ summary: 'Delete server product key', description: 'Delete the currently set server product key.' })
   deleteServerLicense(): Promise<void> {
     return this.service.deleteLicense();
   }
 
   @Get('version-check')
   @Authenticated({ permission: Permission.ServerVersionCheck })
+  @ApiOperation({
+    summary: 'Get version check status',
+    description: 'Retrieve information about the last time the version check ran.',
+  })
   getVersionCheck(): Promise<VersionCheckStateResponseDto> {
     return this.systemMetadataService.getVersionCheckState();
   }
diff --git a/server/src/controllers/session.controller.ts b/server/src/controllers/session.controller.ts
index cbe8158fee..47cd7a6f19 100644
--- a/server/src/controllers/session.controller.ts
+++ b/server/src/controllers/session.controller.ts
@@ -1,25 +1,33 @@
 import { Body, Controller, Delete, Get, HttpCode, HttpStatus, Param, Post, Put } from '@nestjs/common';
-import { ApiTags } from '@nestjs/swagger';
+import { ApiOperation, ApiTags } from '@nestjs/swagger';
 import { AuthDto } from 'src/dtos/auth.dto';
 import { SessionCreateDto, SessionCreateResponseDto, SessionResponseDto, SessionUpdateDto } from 'src/dtos/session.dto';
-import { Permission } from 'src/enum';
+import { ApiTag, Permission } from 'src/enum';
 import { Auth, Authenticated } from 'src/middleware/auth.guard';
 import { SessionService } from 'src/services/session.service';
 import { UUIDParamDto } from 'src/validation';
 
-@ApiTags('Sessions')
+@ApiTags(ApiTag.Sessions)
 @Controller('sessions')
 export class SessionController {
   constructor(private service: SessionService) {}
 
   @Post()
   @Authenticated({ permission: Permission.SessionCreate })
+  @ApiOperation({
+    summary: 'Create a session',
+    description: 'Create a session as a child to the current session. This endpoint is used for casting.',
+  })
   createSession(@Auth() auth: AuthDto, @Body() dto: SessionCreateDto): Promise<SessionCreateResponseDto> {
     return this.service.create(auth, dto);
   }
 
   @Get()
   @Authenticated({ permission: Permission.SessionRead })
+  @ApiOperation({
+    summary: 'Retrieve sessions',
+    description: 'Retrieve a list of sessions for the user.',
+  })
   getSessions(@Auth() auth: AuthDto): Promise<SessionResponseDto[]> {
     return this.service.getAll(auth);
   }
@@ -27,12 +35,20 @@ export class SessionController {
   @Delete()
   @Authenticated({ permission: Permission.SessionDelete })
   @HttpCode(HttpStatus.NO_CONTENT)
+  @ApiOperation({
+    summary: 'Delete all sessions',
+    description: 'Delete all sessions for the user. This will not delete the current session.',
+  })
   deleteAllSessions(@Auth() auth: AuthDto): Promise<void> {
     return this.service.deleteAll(auth);
   }
 
   @Put(':id')
   @Authenticated({ permission: Permission.SessionUpdate })
+  @ApiOperation({
+    summary: 'Update a session',
+    description: 'Update a specific session identified by id.',
+  })
   updateSession(
     @Auth() auth: AuthDto,
     @Param() { id }: UUIDParamDto,
@@ -44,6 +60,10 @@ export class SessionController {
   @Delete(':id')
   @Authenticated({ permission: Permission.SessionDelete })
   @HttpCode(HttpStatus.NO_CONTENT)
+  @ApiOperation({
+    summary: 'Delete a session',
+    description: 'Delete a specific session by id.',
+  })
   deleteSession(@Auth() auth: AuthDto, @Param() { id }: UUIDParamDto): Promise<void> {
     return this.service.delete(auth, id);
   }
@@ -51,6 +71,10 @@ export class SessionController {
   @Post(':id/lock')
   @Authenticated({ permission: Permission.SessionLock })
   @HttpCode(HttpStatus.NO_CONTENT)
+  @ApiOperation({
+    summary: 'Lock a session',
+    description: 'Lock a specific session by id.',
+  })
   lockSession(@Auth() auth: AuthDto, @Param() { id }: UUIDParamDto): Promise<void> {
     return this.service.lock(auth, id);
   }
diff --git a/server/src/controllers/shared-link.controller.ts b/server/src/controllers/shared-link.controller.ts
index ef0a93e012..e3e55f2941 100644
--- a/server/src/controllers/shared-link.controller.ts
+++ b/server/src/controllers/shared-link.controller.ts
@@ -13,7 +13,7 @@ import {
   Req,
   Res,
 } from '@nestjs/common';
-import { ApiTags } from '@nestjs/swagger';
+import { ApiOperation, ApiTags } from '@nestjs/swagger';
 import { Request, Response } from 'express';
 import { AssetIdsResponseDto } from 'src/dtos/asset-ids.response.dto';
 import { AssetIdsDto } from 'src/dtos/asset.dto';
@@ -25,26 +25,34 @@ import {
   SharedLinkResponseDto,
   SharedLinkSearchDto,
 } from 'src/dtos/shared-link.dto';
-import { ImmichCookie, Permission } from 'src/enum';
+import { ApiTag, ImmichCookie, Permission } from 'src/enum';
 import { Auth, Authenticated, GetLoginDetails } from 'src/middleware/auth.guard';
 import { LoginDetails } from 'src/services/auth.service';
 import { SharedLinkService } from 'src/services/shared-link.service';
 import { respondWithCookie } from 'src/utils/response';
 import { UUIDParamDto } from 'src/validation';
 
-@ApiTags('Shared Links')
+@ApiTags(ApiTag.SharedLinks)
 @Controller('shared-links')
 export class SharedLinkController {
   constructor(private service: SharedLinkService) {}
 
   @Get()
   @Authenticated({ permission: Permission.SharedLinkRead })
+  @ApiOperation({
+    summary: 'Retrieve all shared links',
+    description: 'Retrieve a list of all shared links.',
+  })
   getAllSharedLinks(@Auth() auth: AuthDto, @Query() dto: SharedLinkSearchDto): Promise<SharedLinkResponseDto[]> {
     return this.service.getAll(auth, dto);
   }
 
   @Get('me')
   @Authenticated({ sharedLink: true })
+  @ApiOperation({
+    summary: 'Retrieve current shared link',
+    description: 'Retrieve the current shared link associated with authentication method.',
+  })
   async getMySharedLink(
     @Auth() auth: AuthDto,
     @Query() dto: SharedLinkPasswordDto,
@@ -65,18 +73,30 @@ export class SharedLinkController {
 
   @Get(':id')
   @Authenticated({ permission: Permission.SharedLinkRead })
+  @ApiOperation({
+    summary: 'Retrieve a shared link',
+    description: 'Retrieve a specific shared link by its ID.',
+  })
   getSharedLinkById(@Auth() auth: AuthDto, @Param() { id }: UUIDParamDto): Promise<SharedLinkResponseDto> {
     return this.service.get(auth, id);
   }
 
   @Post()
   @Authenticated({ permission: Permission.SharedLinkCreate })
+  @ApiOperation({
+    summary: 'Create a shared link',
+    description: 'Create a new shared link.',
+  })
   createSharedLink(@Auth() auth: AuthDto, @Body() dto: SharedLinkCreateDto) {
     return this.service.create(auth, dto);
   }
 
   @Patch(':id')
   @Authenticated({ permission: Permission.SharedLinkUpdate })
+  @ApiOperation({
+    summary: 'Update a shared link',
+    description: 'Update an existing shared link by its ID.',
+  })
   updateSharedLink(
     @Auth() auth: AuthDto,
     @Param() { id }: UUIDParamDto,
@@ -88,12 +108,21 @@ export class SharedLinkController {
   @Delete(':id')
   @Authenticated({ permission: Permission.SharedLinkDelete })
   @HttpCode(HttpStatus.NO_CONTENT)
+  @ApiOperation({
+    summary: 'Delete a shared link',
+    description: 'Delete a specific shared link by its ID.',
+  })
   removeSharedLink(@Auth() auth: AuthDto, @Param() { id }: UUIDParamDto): Promise<void> {
     return this.service.remove(auth, id);
   }
 
   @Put(':id/assets')
   @Authenticated({ sharedLink: true })
+  @ApiOperation({
+    summary: 'Add assets to a shared link',
+    description:
+      'Add assets to a specific shared link by its ID. This endpoint is only relevant for shared link of type individual.',
+  })
   addSharedLinkAssets(
     @Auth() auth: AuthDto,
     @Param() { id }: UUIDParamDto,
@@ -104,6 +133,11 @@ export class SharedLinkController {
 
   @Delete(':id/assets')
   @Authenticated({ sharedLink: true })
+  @ApiOperation({
+    summary: 'Remove assets from a shared link',
+    description:
+      'Remove assets from a specific shared link by its ID. This endpoint is only relevant for shared link of type individual.',
+  })
   removeSharedLinkAssets(
     @Auth() auth: AuthDto,
     @Param() { id }: UUIDParamDto,
diff --git a/server/src/controllers/stack.controller.ts b/server/src/controllers/stack.controller.ts
index 6acd4abc24..def3900c71 100644
--- a/server/src/controllers/stack.controller.ts
+++ b/server/src/controllers/stack.controller.ts
@@ -1,26 +1,35 @@
 import { Body, Controller, Delete, Get, HttpCode, HttpStatus, Param, Post, Put, Query } from '@nestjs/common';
-import { ApiTags } from '@nestjs/swagger';
+import { ApiOperation, ApiTags } from '@nestjs/swagger';
 import { BulkIdsDto } from 'src/dtos/asset-ids.response.dto';
 import { AuthDto } from 'src/dtos/auth.dto';
 import { StackCreateDto, StackResponseDto, StackSearchDto, StackUpdateDto } from 'src/dtos/stack.dto';
-import { Permission } from 'src/enum';
+import { ApiTag, Permission } from 'src/enum';
 import { Auth, Authenticated } from 'src/middleware/auth.guard';
 import { StackService } from 'src/services/stack.service';
 import { UUIDAssetIDParamDto, UUIDParamDto } from 'src/validation';
 
-@ApiTags('Stacks')
+@ApiTags(ApiTag.Stacks)
 @Controller('stacks')
 export class StackController {
   constructor(private service: StackService) {}
 
   @Get()
   @Authenticated({ permission: Permission.StackRead })
+  @ApiOperation({
+    summary: 'Retrieve stacks',
+    description: 'Retrieve a list of stacks.',
+  })
   searchStacks(@Auth() auth: AuthDto, @Query() query: StackSearchDto): Promise<StackResponseDto[]> {
     return this.service.search(auth, query);
   }
 
   @Post()
   @Authenticated({ permission: Permission.StackCreate })
+  @ApiOperation({
+    summary: 'Create a stack',
+    description:
+      'Create a new stack by providing a name and a list of asset IDs to include in the stack. If any of the provided asset IDs are primary assets of an existing stack, the existing stack will be merged into the newly created stack.',
+  })
   createStack(@Auth() auth: AuthDto, @Body() dto: StackCreateDto): Promise<StackResponseDto> {
     return this.service.create(auth, dto);
   }
@@ -28,18 +37,30 @@ export class StackController {
   @Delete()
   @Authenticated({ permission: Permission.StackDelete })
   @HttpCode(HttpStatus.NO_CONTENT)
+  @ApiOperation({
+    summary: 'Delete stacks',
+    description: 'Delete multiple stacks by providing a list of stack IDs.',
+  })
   deleteStacks(@Auth() auth: AuthDto, @Body() dto: BulkIdsDto): Promise<void> {
     return this.service.deleteAll(auth, dto);
   }
 
   @Get(':id')
   @Authenticated({ permission: Permission.StackRead })
+  @ApiOperation({
+    summary: 'Retrieve a stack',
+    description: 'Retrieve a specific stack by its ID.',
+  })
   getStack(@Auth() auth: AuthDto, @Param() { id }: UUIDParamDto): Promise<StackResponseDto> {
     return this.service.get(auth, id);
   }
 
   @Put(':id')
   @Authenticated({ permission: Permission.StackUpdate })
+  @ApiOperation({
+    summary: 'Update a stack',
+    description: 'Update an existing stack by its ID.',
+  })
   updateStack(
     @Auth() auth: AuthDto,
     @Param() { id }: UUIDParamDto,
@@ -51,6 +72,10 @@ export class StackController {
   @Delete(':id')
   @Authenticated({ permission: Permission.StackDelete })
   @HttpCode(HttpStatus.NO_CONTENT)
+  @ApiOperation({
+    summary: 'Delete a stack',
+    description: 'Delete a specific stack by its ID.',
+  })
   deleteStack(@Auth() auth: AuthDto, @Param() { id }: UUIDParamDto): Promise<void> {
     return this.service.delete(auth, id);
   }
@@ -58,6 +83,10 @@ export class StackController {
   @Delete(':id/assets/:assetId')
   @Authenticated({ permission: Permission.StackUpdate })
   @HttpCode(HttpStatus.NO_CONTENT)
+  @ApiOperation({
+    summary: 'Remove an asset from a stack',
+    description: 'Remove a specific asset from a stack by providing the stack ID and asset ID.',
+  })
   removeAssetFromStack(@Auth() auth: AuthDto, @Param() dto: UUIDAssetIDParamDto): Promise<void> {
     return this.service.removeAsset(auth, dto);
   }
diff --git a/server/src/controllers/sync.controller.ts b/server/src/controllers/sync.controller.ts
index 61432e43e3..1f105e6b25 100644
--- a/server/src/controllers/sync.controller.ts
+++ b/server/src/controllers/sync.controller.ts
@@ -1,6 +1,7 @@
 import { Body, Controller, Delete, Get, Header, HttpCode, HttpStatus, Post, Res } from '@nestjs/common';
-import { ApiTags } from '@nestjs/swagger';
+import { ApiOperation, ApiTags } from '@nestjs/swagger';
 import { Response } from 'express';
+import { EndpointLifecycle } from 'src/decorators';
 import { AssetResponseDto } from 'src/dtos/asset-response.dto';
 import { AuthDto } from 'src/dtos/auth.dto';
 import {
@@ -12,12 +13,12 @@ import {
   SyncAckSetDto,
   SyncStreamDto,
 } from 'src/dtos/sync.dto';
-import { Permission } from 'src/enum';
+import { ApiTag, Permission } from 'src/enum';
 import { Auth, Authenticated } from 'src/middleware/auth.guard';
 import { GlobalExceptionFilter } from 'src/middleware/global-exception.filter';
 import { SyncService } from 'src/services/sync.service';
 
-@ApiTags('Sync')
+@ApiTags(ApiTag.Sync)
 @Controller('sync')
 export class SyncController {
   constructor(
@@ -28,6 +29,11 @@ export class SyncController {
   @Post('full-sync')
   @Authenticated()
   @HttpCode(HttpStatus.OK)
+  @EndpointLifecycle({
+    deprecatedAt: 'v2.0.0',
+    summary: 'Get full sync for user',
+    description: 'Retrieve all assets for a full synchronization for the authenticated user.',
+  })
   getFullSyncForUser(@Auth() auth: AuthDto, @Body() dto: AssetFullSyncDto): Promise<AssetResponseDto[]> {
     return this.service.getFullSync(auth, dto);
   }
@@ -35,6 +41,11 @@ export class SyncController {
   @Post('delta-sync')
   @Authenticated()
   @HttpCode(HttpStatus.OK)
+  @EndpointLifecycle({
+    deprecatedAt: 'v2.0.0',
+    summary: 'Get delta sync for user',
+    description: 'Retrieve changed assets since the last sync for the authenticated user.',
+  })
   getDeltaSync(@Auth() auth: AuthDto, @Body() dto: AssetDeltaSyncDto): Promise<AssetDeltaSyncResponseDto> {
     return this.service.getDeltaSync(auth, dto);
   }
@@ -43,6 +54,11 @@ export class SyncController {
   @Authenticated({ permission: Permission.SyncStream })
   @Header('Content-Type', 'application/jsonlines+json')
   @HttpCode(HttpStatus.OK)
+  @ApiOperation({
+    summary: 'Stream sync changes',
+    description:
+      'Retrieve a JSON lines streamed response of changes for synchronization. This endpoint is used by the mobile app to efficiently stay up to date with changes.',
+  })
   async getSyncStream(@Auth() auth: AuthDto, @Res() res: Response, @Body() dto: SyncStreamDto) {
     try {
       await this.service.stream(auth, res, dto);
@@ -54,6 +70,10 @@ export class SyncController {
 
   @Get('ack')
   @Authenticated({ permission: Permission.SyncCheckpointRead })
+  @ApiOperation({
+    summary: 'Retrieve acknowledgements',
+    description: 'Retrieve the synchronization acknowledgments for the current session.',
+  })
   getSyncAck(@Auth() auth: AuthDto): Promise<SyncAckDto[]> {
     return this.service.getAcks(auth);
   }
@@ -61,6 +81,11 @@ export class SyncController {
   @Post('ack')
   @Authenticated({ permission: Permission.SyncCheckpointUpdate })
   @HttpCode(HttpStatus.NO_CONTENT)
+  @ApiOperation({
+    summary: 'Acknowledge changes',
+    description:
+      'Send a list of synchronization acknowledgements to confirm that the latest changes have been received.',
+  })
   sendSyncAck(@Auth() auth: AuthDto, @Body() dto: SyncAckSetDto) {
     return this.service.setAcks(auth, dto);
   }
@@ -68,6 +93,10 @@ export class SyncController {
   @Delete('ack')
   @Authenticated({ permission: Permission.SyncCheckpointDelete })
   @HttpCode(HttpStatus.NO_CONTENT)
+  @ApiOperation({
+    summary: 'Delete acknowledgements',
+    description: 'Delete specific synchronization acknowledgments.',
+  })
   deleteSyncAck(@Auth() auth: AuthDto, @Body() dto: SyncAckDeleteDto): Promise<void> {
     return this.service.deleteAcks(auth, dto);
   }
diff --git a/server/src/controllers/system-config.controller.ts b/server/src/controllers/system-config.controller.ts
index 69117f4d45..66d62135b7 100644
--- a/server/src/controllers/system-config.controller.ts
+++ b/server/src/controllers/system-config.controller.ts
@@ -1,12 +1,12 @@
 import { Body, Controller, Get, Put } from '@nestjs/common';
-import { ApiTags } from '@nestjs/swagger';
+import { ApiOperation, ApiTags } from '@nestjs/swagger';
 import { SystemConfigDto, SystemConfigTemplateStorageOptionDto } from 'src/dtos/system-config.dto';
-import { Permission } from 'src/enum';
+import { ApiTag, Permission } from 'src/enum';
 import { Authenticated } from 'src/middleware/auth.guard';
 import { StorageTemplateService } from 'src/services/storage-template.service';
 import { SystemConfigService } from 'src/services/system-config.service';
 
-@ApiTags('System Config')
+@ApiTags(ApiTag.SystemConfig)
 @Controller('system-config')
 export class SystemConfigController {
   constructor(
@@ -16,24 +16,37 @@ export class SystemConfigController {
 
   @Get()
   @Authenticated({ permission: Permission.SystemConfigRead, admin: true })
+  @ApiOperation({ summary: 'Get system configuration', description: 'Retrieve the current system configuration.' })
   getConfig(): Promise<SystemConfigDto> {
     return this.service.getSystemConfig();
   }
 
   @Get('defaults')
   @Authenticated({ permission: Permission.SystemConfigRead, admin: true })
+  @ApiOperation({
+    summary: 'Get system configuration defaults',
+    description: 'Retrieve the default values for the system configuration.',
+  })
   getConfigDefaults(): SystemConfigDto {
     return this.service.getDefaults();
   }
 
   @Put()
   @Authenticated({ permission: Permission.SystemConfigUpdate, admin: true })
+  @ApiOperation({
+    summary: 'Update system configuration',
+    description: 'Update the system configuration with a new system configuration.',
+  })
   updateConfig(@Body() dto: SystemConfigDto): Promise<SystemConfigDto> {
     return this.service.updateSystemConfig(dto);
   }
 
   @Get('storage-template-options')
   @Authenticated({ permission: Permission.SystemConfigRead, admin: true })
+  @ApiOperation({
+    summary: 'Get storage template options',
+    description: 'Retrieve exemplary storage template options.',
+  })
   getStorageTemplateOptions(): SystemConfigTemplateStorageOptionDto {
     return this.storageTemplateService.getStorageTemplateOptions();
   }
diff --git a/server/src/controllers/system-metadata.controller.ts b/server/src/controllers/system-metadata.controller.ts
index d6634e9444..f97eb3877c 100644
--- a/server/src/controllers/system-metadata.controller.ts
+++ b/server/src/controllers/system-metadata.controller.ts
@@ -1,21 +1,25 @@
 import { Body, Controller, Get, HttpCode, HttpStatus, Post } from '@nestjs/common';
-import { ApiTags } from '@nestjs/swagger';
+import { ApiOperation, ApiTags } from '@nestjs/swagger';
 import {
   AdminOnboardingUpdateDto,
   ReverseGeocodingStateResponseDto,
   VersionCheckStateResponseDto,
 } from 'src/dtos/system-metadata.dto';
-import { Permission } from 'src/enum';
+import { ApiTag, Permission } from 'src/enum';
 import { Authenticated } from 'src/middleware/auth.guard';
 import { SystemMetadataService } from 'src/services/system-metadata.service';
 
-@ApiTags('System Metadata')
+@ApiTags(ApiTag.SystemMetadata)
 @Controller('system-metadata')
 export class SystemMetadataController {
   constructor(private service: SystemMetadataService) {}
 
   @Get('admin-onboarding')
   @Authenticated({ permission: Permission.SystemMetadataRead, admin: true })
+  @ApiOperation({
+    summary: 'Retrieve admin onboarding',
+    description: 'Retrieve the current admin onboarding status.',
+  })
   getAdminOnboarding(): Promise<AdminOnboardingUpdateDto> {
     return this.service.getAdminOnboarding();
   }
@@ -23,18 +27,30 @@ export class SystemMetadataController {
   @Post('admin-onboarding')
   @Authenticated({ permission: Permission.SystemMetadataUpdate, admin: true })
   @HttpCode(HttpStatus.NO_CONTENT)
+  @ApiOperation({
+    summary: 'Update admin onboarding',
+    description: 'Update the admin onboarding status.',
+  })
   updateAdminOnboarding(@Body() dto: AdminOnboardingUpdateDto): Promise<void> {
     return this.service.updateAdminOnboarding(dto);
   }
 
   @Get('reverse-geocoding-state')
   @Authenticated({ permission: Permission.SystemMetadataRead, admin: true })
+  @ApiOperation({
+    summary: 'Retrieve reverse geocoding state',
+    description: 'Retrieve the current state of the reverse geocoding import.',
+  })
   getReverseGeocodingState(): Promise<ReverseGeocodingStateResponseDto> {
     return this.service.getReverseGeocodingState();
   }
 
   @Get('version-check-state')
   @Authenticated({ permission: Permission.SystemMetadataRead, admin: true })
+  @ApiOperation({
+    summary: 'Retrieve version check state',
+    description: 'Retrieve the current state of the version check process.',
+  })
   getVersionCheckState(): Promise<VersionCheckStateResponseDto> {
     return this.service.getVersionCheckState();
   }
diff --git a/server/src/controllers/tag.controller.ts b/server/src/controllers/tag.controller.ts
index 59915ef2a4..514718f106 100644
--- a/server/src/controllers/tag.controller.ts
+++ b/server/src/controllers/tag.controller.ts
@@ -1,5 +1,5 @@
 import { Body, Controller, Delete, Get, HttpCode, HttpStatus, Param, Post, Put } from '@nestjs/common';
-import { ApiTags } from '@nestjs/swagger';
+import { ApiOperation, ApiTags } from '@nestjs/swagger';
 import { BulkIdResponseDto, BulkIdsDto } from 'src/dtos/asset-ids.response.dto';
 import { AuthDto } from 'src/dtos/auth.dto';
 import {
@@ -10,48 +10,72 @@ import {
   TagUpdateDto,
   TagUpsertDto,
 } from 'src/dtos/tag.dto';
-import { Permission } from 'src/enum';
+import { ApiTag, Permission } from 'src/enum';
 import { Auth, Authenticated } from 'src/middleware/auth.guard';
 import { TagService } from 'src/services/tag.service';
 import { UUIDParamDto } from 'src/validation';
 
-@ApiTags('Tags')
+@ApiTags(ApiTag.Tags)
 @Controller('tags')
 export class TagController {
   constructor(private service: TagService) {}
 
   @Post()
   @Authenticated({ permission: Permission.TagCreate })
+  @ApiOperation({
+    summary: 'Create a tag',
+    description: 'Create a new tag by providing a name and optional color.',
+  })
   createTag(@Auth() auth: AuthDto, @Body() dto: TagCreateDto): Promise<TagResponseDto> {
     return this.service.create(auth, dto);
   }
 
   @Get()
   @Authenticated({ permission: Permission.TagRead })
+  @ApiOperation({
+    summary: 'Retrieve tags',
+    description: 'Retrieve a list of all tags.',
+  })
   getAllTags(@Auth() auth: AuthDto): Promise<TagResponseDto[]> {
     return this.service.getAll(auth);
   }
 
   @Put()
   @Authenticated({ permission: Permission.TagCreate })
+  @ApiOperation({
+    summary: 'Upsert tags',
+    description: 'Create or update multiple tags in a single request.',
+  })
   upsertTags(@Auth() auth: AuthDto, @Body() dto: TagUpsertDto): Promise<TagResponseDto[]> {
     return this.service.upsert(auth, dto);
   }
 
   @Put('assets')
   @Authenticated({ permission: Permission.TagAsset })
+  @ApiOperation({
+    summary: 'Tag assets',
+    description: 'Add multiple tags to multiple assets in a single request.',
+  })
   bulkTagAssets(@Auth() auth: AuthDto, @Body() dto: TagBulkAssetsDto): Promise<TagBulkAssetsResponseDto> {
     return this.service.bulkTagAssets(auth, dto);
   }
 
   @Get(':id')
   @Authenticated({ permission: Permission.TagRead })
+  @ApiOperation({
+    summary: 'Retrieve a tag',
+    description: 'Retrieve a specific tag by its ID.',
+  })
   getTagById(@Auth() auth: AuthDto, @Param() { id }: UUIDParamDto): Promise<TagResponseDto> {
     return this.service.get(auth, id);
   }
 
   @Put(':id')
   @Authenticated({ permission: Permission.TagUpdate })
+  @ApiOperation({
+    summary: 'Update a tag',
+    description: 'Update an existing tag identified by its ID.',
+  })
   updateTag(@Auth() auth: AuthDto, @Param() { id }: UUIDParamDto, @Body() dto: TagUpdateDto): Promise<TagResponseDto> {
     return this.service.update(auth, id, dto);
   }
@@ -59,12 +83,20 @@ export class TagController {
   @Delete(':id')
   @Authenticated({ permission: Permission.TagDelete })
   @HttpCode(HttpStatus.NO_CONTENT)
+  @ApiOperation({
+    summary: 'Delete a tag',
+    description: 'Delete a specific tag by its ID.',
+  })
   deleteTag(@Auth() auth: AuthDto, @Param() { id }: UUIDParamDto): Promise<void> {
     return this.service.remove(auth, id);
   }
 
   @Put(':id/assets')
   @Authenticated({ permission: Permission.TagAsset })
+  @ApiOperation({
+    summary: 'Tag assets',
+    description: 'Add a tag to all the specified assets.',
+  })
   tagAssets(
     @Auth() auth: AuthDto,
     @Param() { id }: UUIDParamDto,
@@ -75,6 +107,10 @@ export class TagController {
 
   @Delete(':id/assets')
   @Authenticated({ permission: Permission.TagAsset })
+  @ApiOperation({
+    summary: 'Untag assets',
+    description: 'Remove a tag from all the specified assets.',
+  })
   untagAssets(
     @Auth() auth: AuthDto,
     @Body() dto: BulkIdsDto,
diff --git a/server/src/controllers/timeline.controller.ts b/server/src/controllers/timeline.controller.ts
index 8cab840ec8..c2d3284fd4 100644
--- a/server/src/controllers/timeline.controller.ts
+++ b/server/src/controllers/timeline.controller.ts
@@ -1,18 +1,19 @@
 import { Controller, Get, Header, Query } from '@nestjs/common';
-import { ApiOkResponse, ApiTags } from '@nestjs/swagger';
+import { ApiOkResponse, ApiOperation, ApiTags } from '@nestjs/swagger';
 import { AuthDto } from 'src/dtos/auth.dto';
 import { TimeBucketAssetDto, TimeBucketAssetResponseDto, TimeBucketDto } from 'src/dtos/time-bucket.dto';
-import { Permission } from 'src/enum';
+import { ApiTag, Permission } from 'src/enum';
 import { Auth, Authenticated } from 'src/middleware/auth.guard';
 import { TimelineService } from 'src/services/timeline.service';
 
-@ApiTags('Timeline')
+@ApiTags(ApiTag.Timeline)
 @Controller('timeline')
 export class TimelineController {
   constructor(private service: TimelineService) {}
 
   @Get('buckets')
   @Authenticated({ permission: Permission.AssetRead, sharedLink: true })
+  @ApiOperation({ summary: 'Get time buckets', description: 'Retrieve a list of all minimal time buckets.' })
   getTimeBuckets(@Auth() auth: AuthDto, @Query() dto: TimeBucketDto) {
     return this.service.getTimeBuckets(auth, dto);
   }
@@ -21,6 +22,10 @@ export class TimelineController {
   @Authenticated({ permission: Permission.AssetRead, sharedLink: true })
   @ApiOkResponse({ type: TimeBucketAssetResponseDto })
   @Header('Content-Type', 'application/json')
+  @ApiOperation({
+    summary: 'Get time bucket',
+    description: 'Retrieve a string of all asset ids in a given time bucket.',
+  })
   getTimeBucket(@Auth() auth: AuthDto, @Query() dto: TimeBucketAssetDto) {
     return this.service.getTimeBucket(auth, dto);
   }
diff --git a/server/src/controllers/trash.controller.ts b/server/src/controllers/trash.controller.ts
index eaf489f104..1b7ab6a39e 100644
--- a/server/src/controllers/trash.controller.ts
+++ b/server/src/controllers/trash.controller.ts
@@ -1,13 +1,13 @@
 import { Body, Controller, HttpCode, HttpStatus, Post } from '@nestjs/common';
-import { ApiTags } from '@nestjs/swagger';
+import { ApiOperation, ApiTags } from '@nestjs/swagger';
 import { BulkIdsDto } from 'src/dtos/asset-ids.response.dto';
 import { AuthDto } from 'src/dtos/auth.dto';
 import { TrashResponseDto } from 'src/dtos/trash.dto';
-import { Permission } from 'src/enum';
+import { ApiTag, Permission } from 'src/enum';
 import { Auth, Authenticated } from 'src/middleware/auth.guard';
 import { TrashService } from 'src/services/trash.service';
 
-@ApiTags('Trash')
+@ApiTags(ApiTag.Trash)
 @Controller('trash')
 export class TrashController {
   constructor(private service: TrashService) {}
@@ -15,6 +15,10 @@ export class TrashController {
   @Post('empty')
   @Authenticated({ permission: Permission.AssetDelete })
   @HttpCode(HttpStatus.OK)
+  @ApiOperation({
+    summary: 'Empty trash',
+    description: 'Permanently delete all items in the trash.',
+  })
   emptyTrash(@Auth() auth: AuthDto): Promise<TrashResponseDto> {
     return this.service.empty(auth);
   }
@@ -22,6 +26,10 @@ export class TrashController {
   @Post('restore')
   @Authenticated({ permission: Permission.AssetDelete })
   @HttpCode(HttpStatus.OK)
+  @ApiOperation({
+    summary: 'Restore trash',
+    description: 'Restore all items in the trash.',
+  })
   restoreTrash(@Auth() auth: AuthDto): Promise<TrashResponseDto> {
     return this.service.restore(auth);
   }
@@ -29,6 +37,10 @@ export class TrashController {
   @Post('restore/assets')
   @Authenticated({ permission: Permission.AssetDelete })
   @HttpCode(HttpStatus.OK)
+  @ApiOperation({
+    summary: 'Restore assets',
+    description: 'Restore specific assets from the trash.',
+  })
   restoreAssets(@Auth() auth: AuthDto, @Body() dto: BulkIdsDto): Promise<TrashResponseDto> {
     return this.service.restoreAssets(auth, dto);
   }
diff --git a/server/src/controllers/user-admin.controller.ts b/server/src/controllers/user-admin.controller.ts
index 25a4691b75..466cbb6f10 100644
--- a/server/src/controllers/user-admin.controller.ts
+++ b/server/src/controllers/user-admin.controller.ts
@@ -1,5 +1,5 @@
 import { Body, Controller, Delete, Get, HttpCode, HttpStatus, Param, Post, Put, Query } from '@nestjs/common';
-import { ApiTags } from '@nestjs/swagger';
+import { ApiOperation, ApiTags } from '@nestjs/swagger';
 import { AssetStatsDto, AssetStatsResponseDto } from 'src/dtos/asset.dto';
 import { AuthDto } from 'src/dtos/auth.dto';
 import { SessionResponseDto } from 'src/dtos/session.dto';
@@ -11,36 +11,52 @@ import {
   UserAdminSearchDto,
   UserAdminUpdateDto,
 } from 'src/dtos/user.dto';
-import { Permission } from 'src/enum';
+import { ApiTag, Permission } from 'src/enum';
 import { Auth, Authenticated } from 'src/middleware/auth.guard';
 import { UserAdminService } from 'src/services/user-admin.service';
 import { UUIDParamDto } from 'src/validation';
 
-@ApiTags('Users (admin)')
+@ApiTags(ApiTag.UsersAdmin)
 @Controller('admin/users')
 export class UserAdminController {
   constructor(private service: UserAdminService) {}
 
   @Get()
   @Authenticated({ permission: Permission.AdminUserRead, admin: true })
+  @ApiOperation({
+    summary: 'Search users',
+    description: 'Search for users.',
+  })
   searchUsersAdmin(@Auth() auth: AuthDto, @Query() dto: UserAdminSearchDto): Promise<UserAdminResponseDto[]> {
     return this.service.search(auth, dto);
   }
 
   @Post()
   @Authenticated({ permission: Permission.AdminUserCreate, admin: true })
+  @ApiOperation({
+    summary: 'Create a user',
+    description: 'Create a new user.',
+  })
   createUserAdmin(@Body() createUserDto: UserAdminCreateDto): Promise<UserAdminResponseDto> {
     return this.service.create(createUserDto);
   }
 
   @Get(':id')
   @Authenticated({ permission: Permission.AdminUserRead, admin: true })
+  @ApiOperation({
+    summary: 'Retrieve a user',
+    description: 'Retrieve  a specific user by their ID.',
+  })
   getUserAdmin(@Auth() auth: AuthDto, @Param() { id }: UUIDParamDto): Promise<UserAdminResponseDto> {
     return this.service.get(auth, id);
   }
 
   @Put(':id')
   @Authenticated({ permission: Permission.AdminUserUpdate, admin: true })
+  @ApiOperation({
+    summary: 'Update a user',
+    description: 'Update an existing user.',
+  })
   updateUserAdmin(
     @Auth() auth: AuthDto,
     @Param() { id }: UUIDParamDto,
@@ -51,6 +67,10 @@ export class UserAdminController {
 
   @Delete(':id')
   @Authenticated({ permission: Permission.AdminUserDelete, admin: true })
+  @ApiOperation({
+    summary: 'Delete a user',
+    description: 'Delete a user.',
+  })
   deleteUserAdmin(
     @Auth() auth: AuthDto,
     @Param() { id }: UUIDParamDto,
@@ -61,12 +81,20 @@ export class UserAdminController {
 
   @Get(':id/sessions')
   @Authenticated({ permission: Permission.AdminSessionRead, admin: true })
+  @ApiOperation({
+    summary: 'Retrieve user sessions',
+    description: 'Retrieve all sessions for a specific user.',
+  })
   getUserSessionsAdmin(@Auth() auth: AuthDto, @Param() { id }: UUIDParamDto): Promise<SessionResponseDto[]> {
     return this.service.getSessions(auth, id);
   }
 
   @Get(':id/statistics')
   @Authenticated({ permission: Permission.AdminUserRead, admin: true })
+  @ApiOperation({
+    summary: 'Retrieve user statistics',
+    description: 'Retrieve asset statistics for a specific user.',
+  })
   getUserStatisticsAdmin(
     @Auth() auth: AuthDto,
     @Param() { id }: UUIDParamDto,
@@ -77,12 +105,20 @@ export class UserAdminController {
 
   @Get(':id/preferences')
   @Authenticated({ permission: Permission.AdminUserRead, admin: true })
+  @ApiOperation({
+    summary: 'Retrieve user preferences',
+    description: 'Retrieve the preferences of a specific user.',
+  })
   getUserPreferencesAdmin(@Auth() auth: AuthDto, @Param() { id }: UUIDParamDto): Promise<UserPreferencesResponseDto> {
     return this.service.getPreferences(auth, id);
   }
 
   @Put(':id/preferences')
   @Authenticated({ permission: Permission.AdminUserUpdate, admin: true })
+  @ApiOperation({
+    summary: 'Update user preferences',
+    description: 'Update the preferences of a specific user.',
+  })
   updateUserPreferencesAdmin(
     @Auth() auth: AuthDto,
     @Param() { id }: UUIDParamDto,
@@ -94,6 +130,10 @@ export class UserAdminController {
   @Post(':id/restore')
   @Authenticated({ permission: Permission.AdminUserDelete, admin: true })
   @HttpCode(HttpStatus.OK)
+  @ApiOperation({
+    summary: 'Restore a deleted user',
+    description: 'Restore a previously deleted user.',
+  })
   restoreUserAdmin(@Auth() auth: AuthDto, @Param() { id }: UUIDParamDto): Promise<UserAdminResponseDto> {
     return this.service.restore(auth, id);
   }
diff --git a/server/src/controllers/user.controller.ts b/server/src/controllers/user.controller.ts
index d72b088c54..d76daaa0d5 100644
--- a/server/src/controllers/user.controller.ts
+++ b/server/src/controllers/user.controller.ts
@@ -13,7 +13,7 @@ import {
   UploadedFile,
   UseInterceptors,
 } from '@nestjs/common';
-import { ApiBody, ApiConsumes, ApiTags } from '@nestjs/swagger';
+import { ApiBody, ApiConsumes, ApiOperation, ApiTags } from '@nestjs/swagger';
 import { NextFunction, Response } from 'express';
 import { AuthDto } from 'src/dtos/auth.dto';
 import { LicenseKeyDto, LicenseResponseDto } from 'src/dtos/license.dto';
@@ -21,7 +21,7 @@ import { OnboardingDto, OnboardingResponseDto } from 'src/dtos/onboarding.dto';
 import { UserPreferencesResponseDto, UserPreferencesUpdateDto } from 'src/dtos/user-preferences.dto';
 import { CreateProfileImageDto, CreateProfileImageResponseDto } from 'src/dtos/user-profile.dto';
 import { UserAdminResponseDto, UserResponseDto, UserUpdateMeDto } from 'src/dtos/user.dto';
-import { Permission, RouteKey } from 'src/enum';
+import { ApiTag, Permission, RouteKey } from 'src/enum';
 import { Auth, Authenticated, FileResponse } from 'src/middleware/auth.guard';
 import { FileUploadInterceptor } from 'src/middleware/file-upload.interceptor';
 import { LoggingRepository } from 'src/repositories/logging.repository';
@@ -29,7 +29,7 @@ import { UserService } from 'src/services/user.service';
 import { sendFile } from 'src/utils/file';
 import { UUIDParamDto } from 'src/validation';
 
-@ApiTags('Users')
+@ApiTags(ApiTag.Users)
 @Controller(RouteKey.User)
 export class UserController {
   constructor(
@@ -39,30 +39,38 @@ export class UserController {
 
   @Get()
   @Authenticated({ permission: Permission.UserRead })
+  @ApiOperation({ summary: 'Get all users', description: 'Retrieve a list of all users on the server.' })
   searchUsers(@Auth() auth: AuthDto): Promise<UserResponseDto[]> {
     return this.service.search(auth);
   }
 
   @Get('me')
   @Authenticated({ permission: Permission.UserRead })
+  @ApiOperation({
+    summary: 'Get current user',
+    description: 'Retrieve information about the user making the API request.',
+  })
   getMyUser(@Auth() auth: AuthDto): Promise<UserAdminResponseDto> {
     return this.service.getMe(auth);
   }
 
   @Put('me')
   @Authenticated({ permission: Permission.UserUpdate })
+  @ApiOperation({ summary: 'Update current user', description: 'Update the current user making teh API request.' })
   updateMyUser(@Auth() auth: AuthDto, @Body() dto: UserUpdateMeDto): Promise<UserAdminResponseDto> {
     return this.service.updateMe(auth, dto);
   }
 
   @Get('me/preferences')
   @Authenticated({ permission: Permission.UserPreferenceRead })
+  @ApiOperation({ summary: 'Get my preferences', description: 'Retrieve the preferences for the current user.' })
   getMyPreferences(@Auth() auth: AuthDto): Promise<UserPreferencesResponseDto> {
     return this.service.getMyPreferences(auth);
   }
 
   @Put('me/preferences')
   @Authenticated({ permission: Permission.UserPreferenceUpdate })
+  @ApiOperation({ summary: 'Update my preferences', description: 'Update the preferences of the current user.' })
   updateMyPreferences(
     @Auth() auth: AuthDto,
     @Body() dto: UserPreferencesUpdateDto,
@@ -72,12 +80,20 @@ export class UserController {
 
   @Get('me/license')
   @Authenticated({ permission: Permission.UserLicenseRead })
+  @ApiOperation({
+    summary: 'Retrieve user product key',
+    description: 'Retrieve information about whether the current user has a registered product key.',
+  })
   getUserLicense(@Auth() auth: AuthDto): Promise<LicenseResponseDto> {
     return this.service.getLicense(auth);
   }
 
   @Put('me/license')
   @Authenticated({ permission: Permission.UserLicenseUpdate })
+  @ApiOperation({
+    summary: 'Set user product key',
+    description: 'Register a product key for the current user.',
+  })
   async setUserLicense(@Auth() auth: AuthDto, @Body() license: LicenseKeyDto): Promise<LicenseResponseDto> {
     return this.service.setLicense(auth, license);
   }
@@ -85,18 +101,30 @@ export class UserController {
   @Delete('me/license')
   @Authenticated({ permission: Permission.UserLicenseDelete })
   @HttpCode(HttpStatus.NO_CONTENT)
+  @ApiOperation({
+    summary: 'Delete user product key',
+    description: 'Delete the registered product key for the current user.',
+  })
   async deleteUserLicense(@Auth() auth: AuthDto): Promise<void> {
     await this.service.deleteLicense(auth);
   }
 
   @Get('me/onboarding')
   @Authenticated({ permission: Permission.UserOnboardingRead })
+  @ApiOperation({
+    summary: 'Retrieve user onboarding',
+    description: 'Retrieve the onboarding status of the current user.',
+  })
   getUserOnboarding(@Auth() auth: AuthDto): Promise<OnboardingResponseDto> {
     return this.service.getOnboarding(auth);
   }
 
   @Put('me/onboarding')
   @Authenticated({ permission: Permission.UserOnboardingUpdate })
+  @ApiOperation({
+    summary: 'Update user onboarding',
+    description: 'Update the onboarding status of the current user.',
+  })
   async setUserOnboarding(@Auth() auth: AuthDto, @Body() Onboarding: OnboardingDto): Promise<OnboardingResponseDto> {
     return this.service.setOnboarding(auth, Onboarding);
   }
@@ -104,12 +132,20 @@ export class UserController {
   @Delete('me/onboarding')
   @Authenticated({ permission: Permission.UserOnboardingDelete })
   @HttpCode(HttpStatus.NO_CONTENT)
+  @ApiOperation({
+    summary: 'Delete user onboarding',
+    description: 'Delete the onboarding status of the current user.',
+  })
   async deleteUserOnboarding(@Auth() auth: AuthDto): Promise<void> {
     await this.service.deleteOnboarding(auth);
   }
 
   @Get(':id')
   @Authenticated({ permission: Permission.UserRead })
+  @ApiOperation({
+    summary: 'Retrieve a user',
+    description: 'Retrieve a specific user by their ID.',
+  })
   getUser(@Param() { id }: UUIDParamDto): Promise<UserResponseDto> {
     return this.service.get(id);
   }
@@ -119,6 +155,10 @@ export class UserController {
   @UseInterceptors(FileUploadInterceptor)
   @ApiConsumes('multipart/form-data')
   @ApiBody({ description: 'A new avatar for the user', type: CreateProfileImageDto })
+  @ApiOperation({
+    summary: 'Create user profile image',
+    description: 'Upload and set a new profile image for the current user.',
+  })
   createProfileImage(
     @Auth() auth: AuthDto,
     @UploadedFile() fileInfo: Express.Multer.File,
@@ -129,6 +169,10 @@ export class UserController {
   @Delete('profile-image')
   @Authenticated({ permission: Permission.UserProfileImageDelete })
   @HttpCode(HttpStatus.NO_CONTENT)
+  @ApiOperation({
+    summary: 'Delete user profile image',
+    description: 'Delete the profile image of the current user.',
+  })
   deleteProfileImage(@Auth() auth: AuthDto): Promise<void> {
     return this.service.deleteProfileImage(auth);
   }
@@ -136,6 +180,10 @@ export class UserController {
   @Get(':id/profile-image')
   @FileResponse()
   @Authenticated({ permission: Permission.UserProfileImageRead })
+  @ApiOperation({
+    summary: 'Retrieve user profile image',
+    description: 'Retrieve the profile image file for a user.',
+  })
   async getProfileImage(@Res() res: Response, @Next() next: NextFunction, @Param() { id }: UUIDParamDto) {
     await sendFile(res, next, () => this.service.getProfileImage(id), this.logger);
   }
diff --git a/server/src/controllers/view.controller.ts b/server/src/controllers/view.controller.ts
index b5e281e093..8d0cbb0d96 100644
--- a/server/src/controllers/view.controller.ts
+++ b/server/src/controllers/view.controller.ts
@@ -1,23 +1,32 @@
 import { Controller, Get, Query } from '@nestjs/common';
-import { ApiTags } from '@nestjs/swagger';
+import { ApiOperation, ApiTags } from '@nestjs/swagger';
 import { AssetResponseDto } from 'src/dtos/asset-response.dto';
 import { AuthDto } from 'src/dtos/auth.dto';
+import { ApiTag } from 'src/enum';
 import { Auth, Authenticated } from 'src/middleware/auth.guard';
 import { ViewService } from 'src/services/view.service';
 
-@ApiTags('View')
+@ApiTags(ApiTag.Views)
 @Controller('view')
 export class ViewController {
   constructor(private service: ViewService) {}
 
   @Get('folder/unique-paths')
   @Authenticated()
+  @ApiOperation({
+    summary: 'Retrieve unique paths',
+    description: 'Retrieve a list of unique folder paths from asset original paths.',
+  })
   getUniqueOriginalPaths(@Auth() auth: AuthDto): Promise<string[]> {
     return this.service.getUniqueOriginalPaths(auth);
   }
 
   @Get('folder')
   @Authenticated()
+  @ApiOperation({
+    summary: 'Retrieve assets by original path',
+    description: 'Retrieve assets that are children of a specific folder.',
+  })
   getAssetsByOriginalPath(@Auth() auth: AuthDto, @Query('path') path: string): Promise<AssetResponseDto[]> {
     return this.service.getAssetsByOriginalPath(auth, path);
   }
diff --git a/server/src/decorators.ts b/server/src/decorators.ts
index 8a8e23d880..e9f27fa9ec 100644
--- a/server/src/decorators.ts
+++ b/server/src/decorators.ts
@@ -2,7 +2,7 @@ import { SetMetadata, applyDecorators } from '@nestjs/common';
 import { ApiExtension, ApiOperation, ApiOperationOptions, ApiProperty, ApiTags } from '@nestjs/swagger';
 import _ from 'lodash';
 import { ADDED_IN_PREFIX, DEPRECATED_IN_PREFIX, LIFECYCLE_EXTENSION } from 'src/constants';
-import { ImmichWorker, JobName, MetadataKey, QueueName } from 'src/enum';
+import { ApiTag, ImmichWorker, JobName, MetadataKey, QueueName } from 'src/enum';
 import { EmitEvent } from 'src/repositories/event.repository';
 import { immich_uuid_v7, updated_at } from 'src/schema/functions';
 import { BeforeUpdateTrigger, Column, ColumnOptions } from 'src/sql-tools';
@@ -168,7 +168,7 @@ export const EndpointLifecycle = ({
   const decorators: MethodDecorator[] = [ApiExtension(LIFECYCLE_EXTENSION, { addedAt, deprecatedAt })];
   if (deprecatedAt) {
     decorators.push(
-      ApiTags('Deprecated'),
+      ApiTags(ApiTag.Deprecated),
       ApiOperation({
         deprecated: true,
         description: DEPRECATED_IN_PREFIX + deprecatedAt + (description ? `. ${description}` : ''),
diff --git a/server/src/enum.ts b/server/src/enum.ts
index a98fee0117..24f307f07a 100644
--- a/server/src/enum.ts
+++ b/server/src/enum.ts
@@ -771,3 +771,38 @@ export enum CronJob {
   LibraryScan = 'LibraryScan',
   NightlyJobs = 'NightlyJobs',
 }
+
+export enum ApiTag {
+  Activities = 'Activities',
+  Albums = 'Albums',
+  ApiKeys = 'API keys',
+  Authentication = 'Authentication',
+  AuthenticationAdmin = 'Authentication (admin)',
+  Assets = 'Assets',
+  Deprecated = 'Deprecated',
+  Download = 'Download',
+  Duplicates = 'Duplicates',
+  Faces = 'Faces',
+  Jobs = 'Jobs',
+  Libraries = 'Libraries',
+  Map = 'Map',
+  Memories = 'Memories',
+  Notifications = 'Notifications',
+  NotificationsAdmin = 'Notifications (admin)',
+  Partners = 'Partners',
+  People = 'People',
+  Search = 'Search',
+  Server = 'Server',
+  Sessions = 'Sessions',
+  SharedLinks = 'Shared links',
+  Stacks = 'Stacks',
+  Sync = 'Sync',
+  SystemConfig = 'System config',
+  SystemMetadata = 'System metadata',
+  Tags = 'Tags',
+  Timeline = 'Timeline',
+  Trash = 'Trash',
+  UsersAdmin = 'Users (admin)',
+  Users = 'Users',
+  Views = 'Views',
+}
diff --git a/server/src/utils/misc.ts b/server/src/utils/misc.ts
index b9741c3b44..eb548eab74 100644
--- a/server/src/utils/misc.ts
+++ b/server/src/utils/misc.ts
@@ -17,7 +17,7 @@ import path from 'node:path';
 import picomatch from 'picomatch';
 import parse from 'picomatch/lib/parse';
 import { SystemConfig } from 'src/config';
-import { CLIP_MODEL_INFO, serverVersion } from 'src/constants';
+import { CLIP_MODEL_INFO, endpointTags, serverVersion } from 'src/constants';
 import { extraSyncModels } from 'src/dtos/sync.dto';
 import { ApiCustomExtension, ImmichCookie, ImmichHeader, MetadataKey } from 'src/enum';
 import { LoggingRepository } from 'src/repositories/logging.repository';
@@ -218,25 +218,16 @@ const patchOpenAPI = (document: OpenAPIObject) => {
         delete operation.summary;
       }
 
+      if (operation.description === '') {
+        delete operation.description;
+      }
+
       if (operation.operationId) {
         // console.log(`${routeToErrorMessage(operation.operationId).padEnd(40)} (${operation.operationId})`);
       }
 
-      const adminOnly = operation[ApiCustomExtension.AdminOnly] ?? false;
-      const permission = operation[ApiCustomExtension.Permission];
-      if (permission) {
-        let description = (operation.description || '').trim();
-        if (description && !description.endsWith('.')) {
-          description += '. ';
-        }
-
-        operation.description =
-          description +
-          `This endpoint ${adminOnly ? 'is an admin-only route, and ' : ''}requires the \`${permission}\` permission.`;
-
-        if (operation.parameters) {
-          operation.parameters = _.orderBy(operation.parameters, 'name');
-        }
+      if (operation.parameters) {
+        operation.parameters = _.orderBy(operation.parameters, 'name');
       }
     }
   }
@@ -245,7 +236,7 @@ const patchOpenAPI = (document: OpenAPIObject) => {
 };
 
 export const useSwagger = (app: INestApplication, { write }: { write: boolean }) => {
-  const config = new DocumentBuilder()
+  const builder = new DocumentBuilder()
     .setTitle('Immich')
     .setDescription('Immich API')
     .setVersion(serverVersion.toString())
@@ -263,8 +254,12 @@ export const useSwagger = (app: INestApplication, { write }: { write: boolean })
       },
       MetadataKey.ApiKeySecurity,
     )
-    .addServer('/api')
-    .build();
+    .addServer('/api');
+
+  for (const [tag, description] of Object.entries(endpointTags)) {
+    builder.addTag(tag, description);
+  }
+  const config = builder.build();
 
   const options: SwaggerDocumentOptions = {
     operationIdFactory: (controllerKey: string, methodKey: string) => methodKey,